admin/Aorimn-dislocker
1
0
Fork 0
mirror of https://github.com/Aorimn/dislocker synced 2026-06-08 10:24:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change offset short option from 'o' to 'O'

Browse Source 
This might break some configuration, but fstab passing arguments doesn't
give us much choice.
This commit is contained in:
Aorimn
2016-04-12 21:03:43 +02:00
parent 2c54222193
commit 7e940e21f1
5 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
man/darwin/dislocker-file.1
+2 -2
View File
@@ -4,7 +4,7 @@
.SH NAME
Dislocker file - Read BitLocker encrypted volumes under Linux, OSX and FreeBSD.
.SH SYNOPSIS
dislocker-file [-hqrsv] [-l \fILOG_FILE\fR] [-o \fIOFFSET\fR] [-V \fIVOLUME\fR \fIDECRYPTMETHOD\fR -F[\fIN\fR]] [--] \fINTFS_FILE\fR
dislocker-file [-hqrsv] [-l \fILOG_FILE\fR] [-O \fIOFFSET\fR] [-V \fIVOLUME\fR \fIDECRYPTMETHOD\fR -F[\fIN\fR]] [--] \fINTFS_FILE\fR
Where DECRYPTMETHOD = {-p[\fIRECOVERY_PASSWORD\fR] | -f \fIBEK_FILE\fR | -u[\fIUSER_PASSWORD\fR] | -k \fIFVEK_FILE\fR | -c}
.SH DESCRIPTION
@@ -45,4 +45,4 @@ Note that these are \fBexamples\fR and, as such, you may need to modify the give
.SH AUTHOR
This tool is developped by Romain Coltel on behalf of HSC (\fBhttp://www.hsc.fr/\fR)
.PP
Feel free to send bugs report to <dislocker __AT__ hsc __DOT__ fr>
Feel free to send bugs report to <dislocker __AT__ hsc __DOT__ fr>
man/darwin/dislocker-fuse.1
+3 -3
View File
@@ -4,7 +4,7 @@
.SH NAME
Dislocker fuse - Read/write BitLocker encrypted volumes under Linux, OSX and FreeBSD.
.SH SYNOPSIS
dislocker-fuse [-hqrsv] [-l \fILOG_FILE\fR] [-o \fIOFFSET\fR] [-V \fIVOLUME\fR \fIDECRYPTMETHOD\fR -F[\fIN\fR]] [-- \fIARGS\fR...]
dislocker-fuse [-hqrsv] [-l \fILOG_FILE\fR] [-O \fIOFFSET\fR] [-V \fIVOLUME\fR \fIDECRYPTMETHOD\fR -F[\fIN\fR]] [-- \fIARGS\fR...]
Where DECRYPTMETHOD = {-p[\fIRECOVERY_PASSWORD\fR] | -f \fIBEK_FILE\fR | -u[\fIUSER_PASSWORD\fR] | -k \fIFVEK_FILE\fR | -c}
.SH DESCRIPTION
@@ -36,7 +36,7 @@ See the FVEK FILE section below to understand what is to be put into this \fIFVE
.B -l, --logfile \fILOG_FILE\fR
put messages into this file (stdout by default)
.TP
.B -o, --offset \fIOFFSET\fR
.B -O, --offset \fIOFFSET\fR
BitLocker partition offset in base 10 (default is 0).
Protip: in your shell, you probably can pass \fB-o $((\fI0xdeadbeef\fB))\fR if you have a 16-based number and are too lazy to convert it in another way.
.TP
@@ -112,4 +112,4 @@ Note that these are \fBexamples\fR and, as such, may need to be modified. For in
.SH AUTHOR
This tool is developped by Romain Coltel on behalf of HSC (\fBhttp://www.hsc.fr/\fR)
.PP
Feel free to send bugs report to <dislocker __AT__ hsc __DOT__ fr>
Feel free to send bugs report to <dislocker __AT__ hsc __DOT__ fr>
man/linux/dislocker-file.1
+2 -2
View File
@@ -4,7 +4,7 @@
.SH NAME
Dislocker file - Read BitLocker encrypted volumes under Linux, OSX and FreeBSD.
.SH SYNOPSIS
dislocker-file [-hqrsv] [-l \fILOG_FILE\fR] [-o \fIOFFSET\fR] [-V \fIVOLUME\fR \fIDECRYPTMETHOD\fR -F[\fIN\fR]] [--] \fINTFS_FILE\fR
dislocker-file [-hqrsv] [-l \fILOG_FILE\fR] [-O \fIOFFSET\fR] [-V \fIVOLUME\fR \fIDECRYPTMETHOD\fR -F[\fIN\fR]] [--] \fINTFS_FILE\fR
Where DECRYPTMETHOD = {-p[\fIRECOVERY_PASSWORD\fR] | -f \fIBEK_FILE\fR | -u[\fIUSER_PASSWORD\fR] | -k \fIFVEK_FILE\fR | -c}
.SH DESCRIPTION
@@ -42,4 +42,4 @@ Note that these are \fBexamples\fR and, as such, you may need to modify the give
.SH AUTHOR
This tool is developped by Romain Coltel on behalf of HSC (\fBhttp://www.hsc.fr/\fR)
.PP
Feel free to send bugs report to <dislocker __AT__ hsc __DOT__ fr>
Feel free to send bugs report to <dislocker __AT__ hsc __DOT__ fr>
man/linux/dislocker-fuse.1
+3 -3
View File
@@ -4,7 +4,7 @@
.SH NAME
Dislocker fuse - Read/write BitLocker encrypted volumes under Linux, OSX and FreeBSD.
.SH SYNOPSIS
dislocker-fuse [-hqrsv] [-l \fILOG_FILE\fR] [-o \fIOFFSET\fR] [-V \fIVOLUME\fR \fIDECRYPTMETHOD\fR -F[\fIN\fR]] [-- \fIARGS\fR...]
dislocker-fuse [-hqrsv] [-l \fILOG_FILE\fR] [-O \fIOFFSET\fR] [-V \fIVOLUME\fR \fIDECRYPTMETHOD\fR -F[\fIN\fR]] [-- \fIARGS\fR...]
Where DECRYPTMETHOD = {-p[\fIRECOVERY_PASSWORD\fR] | -f \fIBEK_FILE\fR | -u[\fIUSER_PASSWORD\fR] | -k \fIFVEK_FILE\fR | -c}
.SH DESCRIPTION
@@ -36,7 +36,7 @@ See the FVEK FILE section below to understand what is to be put into this \fIFVE
.B -l, --logfile \fILOG_FILE\fR
put messages into this file (stdout by default)
.TP
.B -o, --offset \fIOFFSET\fR
.B -O, --offset \fIOFFSET\fR
BitLocker partition offset in base 10 (default is 0).
Protip: in your shell, you probably can pass \fB-o $((\fI0xdeadbeef\fB))\fR if you have a 16-based number and are too lazy to convert it in another way.
.TP
@@ -109,4 +109,4 @@ Note that these are \fBexamples\fR and, as such, may need to be modified. For in
.SH AUTHOR
This tool is developped by Romain Coltel on behalf of HSC (\fBhttp://www.hsc.fr/\fR)
.PP
Feel free to send bugs report to <dislocker __AT__ hsc __DOT__ fr>
Feel free to send bugs report to <dislocker __AT__ hsc __DOT__ fr>
src/config.c
+4 -4
View File
@@ -53,7 +53,7 @@ PROGNAME " by " AUTHOR ", v" VERSION " (compiled for " __OS "/" __ARCH ")\n"
" -k, --fvek FVEK_FILE decrypt volume using the FVEK directly\n"
" -l, --logfile LOG_FILE\n"
" put messages into this file (stdout by default)\n"
" -o, --offset OFFSET BitLocker partition offset (default is 0)\n"
" -O, --offset OFFSET BitLocker partition offset (default is 0)\n"
" -p, --recovery-password=[RECOVERY_PASSWORD]\n"
" decrypt volume using the recovery password method\n"
" -q, --quiet do NOT display anything\n"
@@ -117,7 +117,7 @@ int dis_getopts(dis_context_t dis_ctx, int argc, char** argv)
};
/* Options which could be passed as argument */
const char short_opts[] = "cf:F::hk:l:o:p::qrsu::vV:";
const char short_opts[] = "cf:F::hk:l:O:p::qrsu::vV:";
const struct option long_opts[] = {
{"clearkey", NO_OPT, NULL, 'c'},
{"bekfile", NEED_OPT, NULL, 'f'},
@@ -125,7 +125,7 @@ int dis_getopts(dis_context_t dis_ctx, int argc, char** argv)
{"help", NO_OPT, NULL, 'h'},
{"fvek", NEED_OPT, NULL, 'k'},
{"logfile", NEED_OPT, NULL, 'l'},
{"offset", NEED_OPT, NULL, 'o'},
{"offset", NEED_OPT, NULL, 'O'},
{"recovery-password", MAY_OPT, NULL, 'p'},
{"quiet", NO_OPT, NULL, 'q'},
{"readonly", NO_OPT, NULL, 'r'},
@@ -185,7 +185,7 @@ int dis_getopts(dis_context_t dis_ctx, int argc, char** argv)
dis_setopt(dis_ctx, DIS_OPT_LOG_FILE_PATH, optarg);
break;
}
case 'o':
case 'O':
{
off_t offset = (off_t) strtoll(optarg, NULL, 10);
dis_setopt(dis_ctx, DIS_OPT_VOLUME_OFFSET, &offset);