| rev |
line source |
|
al@20516
|
1 Description: Fix a few typos on the manpages and source code.
|
|
al@20516
|
2 Author: Giovani Augusto Ferreira <giovani@debian.org>
|
|
al@20516
|
3 Last-Update: 2016-07-07
|
|
al@20516
|
4 Index: dislocker-0.7.1/man/linux/dislocker-file.1
|
|
al@20516
|
5 ===================================================================
|
|
al@20516
|
6 --- dislocker-0.7.1.orig/man/linux/dislocker-file.1
|
|
al@20516
|
7 +++ dislocker-0.7.1/man/linux/dislocker-file.1
|
|
al@20516
|
8 @@ -2,7 +2,7 @@
|
|
al@20516
|
9 .\"
|
|
al@20516
|
10 .TH DISLOCKER 1 2011-09-07 "Linux" "DISLOCKER"
|
|
al@20516
|
11 .SH NAME
|
|
al@20516
|
12 -Dislocker file - Read BitLocker encrypted volumes under Linux, OSX and FreeBSD.
|
|
al@20516
|
13 +Dislocker-file \- Read BitLocker encrypted volumes under Linux, OSX and FreeBSD.
|
|
al@20516
|
14 .SH SYNOPSIS
|
|
al@20516
|
15 dislocker-file [-hqrsv] [-l \fILOG_FILE\fR] [-O \fIOFFSET\fR] [-V \fIVOLUME\fR \fIDECRYPTMETHOD\fR -F[\fIN\fR]] [--] \fINTFS_FILE\fR
|
|
al@20516
|
16
|
|
al@20516
|
17 @@ -16,7 +16,7 @@ This NTFS file won't have any link with
|
|
al@20516
|
18 .SH OPTIONS
|
|
al@20516
|
19 For program's options description, see dislocker-fuse(1). The only change in the command line is the last argument, which in this case is the \fINTFS_FILE\fR argument:
|
|
al@20516
|
20 .PP
|
|
al@20516
|
21 -.TB
|
|
al@20516
|
22 +.TP
|
|
al@20516
|
23 .B NTFS_FILE
|
|
al@20516
|
24 the newly created file where NTFS data will be put to, once decrypted from the BitLocker encrypted volume.
|
|
al@20516
|
25 .SH EXAMPLES
|
|
al@20516
|
26 Index: dislocker-0.7.1/man/linux/dislocker-fuse.1
|
|
al@20516
|
27 ===================================================================
|
|
al@20516
|
28 --- dislocker-0.7.1.orig/man/linux/dislocker-fuse.1
|
|
al@20516
|
29 +++ dislocker-0.7.1/man/linux/dislocker-fuse.1
|
|
al@20516
|
30 @@ -2,7 +2,7 @@
|
|
al@20516
|
31 .\"
|
|
al@20516
|
32 .TH DISLOCKER-FUSE 1 2011-09-07 "Linux" "DISLOCKER-FUSE"
|
|
al@20516
|
33 .SH NAME
|
|
al@20516
|
34 -Dislocker fuse - Read/write BitLocker encrypted volumes under Linux, OSX and FreeBSD.
|
|
al@20516
|
35 +Dislocker-fuse \- Read/write BitLocker encrypted volumes under Linux, OSX and FreeBSD.
|
|
al@20516
|
36 .SH SYNOPSIS
|
|
al@20516
|
37 dislocker-fuse [-hqrsv] [-l \fILOG_FILE\fR] [-O \fIOFFSET\fR] [-V \fIVOLUME\fR \fIDECRYPTMETHOD\fR -F[\fIN\fR]] [-- \fIARGS\fR...]
|
|
al@20516
|
38
|
|
al@20516
|
39 @@ -49,7 +49,7 @@ do NOT display any information.
|
|
al@20516
|
40 This option has priority on any previous `\fB-v\fR'. One probably wants to check the return value of the program when using this option
|
|
al@20516
|
41 .TP
|
|
al@20516
|
42 .B -r, --readonly
|
|
al@20516
|
43 -do not allow to write on the BitLocker volume (read only mode)
|
|
al@20516
|
44 +do not allow one to write on the BitLocker volume (read only mode)
|
|
al@20516
|
45 .TP
|
|
al@20516
|
46 .B -s, --stateok
|
|
al@20516
|
47 do not check the volume's state, assume it's ok to mount it.
|
|
al@20516
|
48 Index: dislocker-0.7.1/src/metadata/datums.c
|
|
al@20516
|
49 ===================================================================
|
|
al@20516
|
50 --- dislocker-0.7.1.orig/src/metadata/datums.c
|
|
al@20516
|
51 +++ dislocker-0.7.1/src/metadata/datums.c
|
|
al@20516
|
52 @@ -326,7 +326,7 @@ void print_datum_key(DIS_LOGS level, voi
|
|
al@20516
|
53 datum_key_t* datum = (datum_key_t*) vdatum;
|
|
al@20516
|
54 char* cipher_str = cipherstr((cipher_t) datum->algo);
|
|
al@20516
|
55
|
|
al@20516
|
56 - dis_printf(level, "Unkown: \n");
|
|
al@20516
|
57 + dis_printf(level, "Unknown: \n");
|
|
al@20516
|
58 hexdump(level, (void*) &datum->padd, 2);
|
|
al@20516
|
59 dis_printf(level, "Algo: %s (%#hx)\n", cipher_str, datum->algo);
|
|
al@20516
|
60 dis_printf(level, "Key:\n");
|
|
al@20516
|
61 @@ -367,7 +367,7 @@ void print_datum_stretch_key(DIS_LOGS le
|
|
al@20516
|
62 {
|
|
al@20516
|
63 datum_stretch_key_t* datum = (datum_stretch_key_t*) vdatum;
|
|
al@20516
|
64
|
|
al@20516
|
65 - dis_printf(level, "Unkown: \n");
|
|
al@20516
|
66 + dis_printf(level, "Unknown: \n");
|
|
al@20516
|
67 hexdump(level, (void*) &datum->padd, 2);
|
|
al@20516
|
68 dis_printf(level, "Algo: %#x\n", datum->algo);
|
|
al@20516
|
69 dis_printf(level, "Salt: \n");
|
|
al@20516
|
70 Index: dislocker-0.7.1/src/metadata/metadata.c
|
|
al@20516
|
71 ===================================================================
|
|
al@20516
|
72 --- dislocker-0.7.1.orig/src/metadata/metadata.c
|
|
al@20516
|
73 +++ dislocker-0.7.1/src/metadata/metadata.c
|
|
al@20516
|
74 @@ -202,7 +202,7 @@ int dis_metadata_initialize(dis_metadata
|
|
al@20516
|
75 {
|
|
al@20516
|
76 dis_printf(
|
|
al@20516
|
77 L_CRITICAL,
|
|
al@20516
|
78 - "A problem occured during the retrieving of metadata. Abort.\n"
|
|
al@20516
|
79 + "A problem occurred during the retrieving of metadata. Abort.\n"
|
|
al@20516
|
80 );
|
|
al@20516
|
81 return DIS_RET_ERROR_METADATA_CHECK;
|
|
al@20516
|
82 }
|
|
al@20516
|
83 Index: dislocker-0.7.1/src/metadata/print_metadata.c
|
|
al@20516
|
84 ===================================================================
|
|
al@20516
|
85 --- dislocker-0.7.1.orig/src/metadata/print_metadata.c
|
|
al@20516
|
86 +++ dislocker-0.7.1/src/metadata/print_metadata.c
|
|
al@20516
|
87 @@ -59,7 +59,7 @@ void print_volume_header(DIS_LOGS level,
|
|
al@20516
|
88 format_guid(volume_header->guid, rec_id);
|
|
al@20516
|
89
|
|
al@20516
|
90
|
|
al@20516
|
91 - dis_printf(level, "=====[ Volume header informations ]=====\n");
|
|
al@20516
|
92 + dis_printf(level, "=====[ Volume header information ]=====\n");
|
|
al@20516
|
93 dis_printf(level, " Signature: '%.8s'\n", volume_header->signature);
|
|
al@20516
|
94 dis_printf(level, " Sector size: 0x%1$04x (%1$hu) bytes\n", volume_header->sector_size);
|
|
al@20516
|
95 dis_printf(level, " Sector per cluster: 0x%1$02x (%1$hhu) bytes\n", volume_header->sectors_per_cluster);
|
|
al@20516
|
96 @@ -122,7 +122,7 @@ void print_information(DIS_LOGS level, d
|
|
al@20516
|
97 dis_printf(level, " Current state: %s (%hu)\n", get_state_str(information->curr_state), information->curr_state);
|
|
al@20516
|
98 dis_printf(level, " Next state: %s (%hu)\n", get_state_str(information->next_state), information->next_state);
|
|
al@20516
|
99 dis_printf(level, " Encrypted volume size: %1$" PRIu64 " bytes (%1$#" PRIx64 "), ~%2$" PRIu64 " MB\n", information->encrypted_volume_size, information->encrypted_volume_size / (1024*1024));
|
|
al@20516
|
100 - dis_printf(level, " Size of convertion region: %1$#x (%1$u)\n", information->convert_size);
|
|
al@20516
|
101 + dis_printf(level, " Size of conversion region: %1$#x (%1$u)\n", information->convert_size);
|
|
al@20516
|
102 dis_printf(level, " Number of boot sectors backuped: %1$u sectors (%1$#x)\n", information->nb_backup_sectors);
|
|
al@20516
|
103 dis_printf(level, " First metadata header offset: %#" PRIx64 "\n", information->information_off[0]);
|
|
al@20516
|
104 dis_printf(level, " Second metadata header offset: %#" PRIx64 "\n", information->information_off[1]);
|
|
al@20516
|
105 @@ -187,7 +187,7 @@ void print_eow_infos(DIS_LOGS level, dis
|
|
al@20516
|
106
|
|
al@20516
|
107 bitlocker_eow_infos_t* eow_infos = dis_meta->eow_information;
|
|
al@20516
|
108
|
|
al@20516
|
109 - dis_printf(level, "=======================[ BitLocker EOW informations ]========================\n");
|
|
al@20516
|
110 + dis_printf(level, "=======================[ BitLocker EOW information ]========================\n");
|
|
al@20516
|
111 dis_printf(level, " Signature: '%.8s'\n", eow_infos->signature);
|
|
al@20516
|
112 dis_printf(level, " Structure size: 0x%1$04x (%1$hu)\n", eow_infos->header_size);
|
|
al@20516
|
113 dis_printf(level, " On-disk size: 0x%1$04x (%1$hu)\n", eow_infos->infos_size);
|
|
al@20516
|
114 @@ -243,7 +243,7 @@ void print_data(DIS_LOGS level, dis_meta
|
|
al@20516
|
115 break;
|
|
al@20516
|
116
|
|
al@20516
|
117 dis_printf(level, "\n");
|
|
al@20516
|
118 - dis_printf(level, "=======[ Datum n°%d informations ]=======\n", ++loop);
|
|
al@20516
|
119 + dis_printf(level, "=======[ Datum n°%d information ]=======\n", ++loop);
|
|
al@20516
|
120 print_one_datum(level, data);
|
|
al@20516
|
121 dis_printf(level, "=========================================\n");
|
|
al@20516
|
122
|
|
al@20516
|
123 Index: dislocker-0.7.1/src/config.c
|
|
al@20516
|
124 ===================================================================
|
|
al@20516
|
125 --- dislocker-0.7.1.orig/src/config.c
|
|
al@20516
|
126 +++ dislocker-0.7.1/src/config.c
|
|
al@20516
|
127 @@ -181,7 +181,7 @@ PROGNAME " by " AUTHOR ", v" VERSION " (
|
|
al@20516
|
128 " -p, --recovery-password=[RECOVERY_PASSWORD]\n"
|
|
al@20516
|
129 " decrypt volume using the recovery password method\n"
|
|
al@20516
|
130 " -q, --quiet do NOT display anything\n"
|
|
al@20516
|
131 -" -r, --readonly do not allow to write on the BitLocker volume\n"
|
|
al@20516
|
132 +" -r, --readonly do not allow one to write on the BitLocker volume\n"
|
|
al@20516
|
133 " -s, --stateok do not check the volume's state, assume it's ok to mount it\n"
|
|
al@20516
|
134 " -u, --user-password=[USER_PASSWORD]\n"
|
|
al@20516
|
135 " decrypt volume using the user password method\n"
|
|
al@20516
|
136 Index: dislocker-0.7.1/man/linux/dislocker-find.1
|
|
al@20516
|
137 ===================================================================
|
|
al@20516
|
138 --- dislocker-0.7.1.orig/man/linux/dislocker-find.1
|
|
al@20516
|
139 +++ dislocker-0.7.1/man/linux/dislocker-find.1
|
|
al@20516
|
140 @@ -2,7 +2,7 @@
|
|
al@20516
|
141 .\"
|
|
al@20516
|
142 .TH DISLOCKER-FIND 1 2011-09-07 "Linux" "DISLOCKER-FIND"
|
|
al@20516
|
143 .SH NAME
|
|
al@20516
|
144 -Dislocker find - Find BitLocker-encrypted volumes.
|
|
al@20516
|
145 +Dislocker-find \- Find BitLocker-encrypted volumes.
|
|
al@20516
|
146 .SH SYNOPSIS
|
|
al@20516
|
147 dislocker-find [-h] [files...]
|
|
al@20516
|
148 .SH DESCRIPTION
|