nhyatt/osslsigncode
1
0
Fork 0
mirror of https://github.com/mtrojnar/osslsigncode.git synced 2025-04-20 06:38:04 -05:00
Code Issues Projects Releases Wiki Activity

Read the password from stdin if desired

Browse Source 
Use the common convention: "-" means to use stdin

Signed-off-by: Steve McIntyre <steve.mcintyre@pexip.com>
This commit is contained in:
Steve McIntyre 2024-03-21 14:24:50 +00:00 committed by Michał Trojnara
parent 4776f43f04
commit 6ad2679f17
1 changed files with 31 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
osslsigncode.c
View File

@ -3086,6 +3086,7 @@ static void usage(const char *argv0, const char *cmd)
printf("%1s [ -askpass ]", ""); printf("%1s [ -askpass ]", "");
#endif /* PROVIDE_ASKPASS */ #endif /* PROVIDE_ASKPASS */
printf("%1s[ -readpass <file> ]\n", ""); printf("%1s[ -readpass <file> ]\n", "");
printf("%12s(use \"-\" with readpass to read from stdin)\n", "");
printf("%12s[ -ac <crosscertfile> ]\n", ""); printf("%12s[ -ac <crosscertfile> ]\n", "");
printf("%12s[ -h {md5,sha1,sha2(56),sha384,sha512} ]\n", ""); printf("%12s[ -h {md5,sha1,sha2(56),sha384,sha512} ]\n", "");
printf("%12s[ -n <desc> ] [ -i <url> ] [ -jp <level> ] [ -comm ]\n", ""); printf("%12s[ -n <desc> ] [ -i <url> ] [ -jp <level> ] [ -comm ]\n", "");
@ -3425,39 +3426,43 @@ static char *getpassword(const char *prompt)
*/ */
static int read_password(GLOBAL_OPTIONS *options) static int read_password(GLOBAL_OPTIONS *options)
{ {
char passbuf[4096]; char passbuf[4096] = {0};
int passlen; int passlen;
const u_char utf8_bom[] = {0xef, 0xbb, 0xbf}; const u_char utf8_bom[] = {0xef, 0xbb, 0xbf};
if (options->readpass) { if (options->readpass) {
if (!strcmp(options->readpass, "-")) {
passlen = read(fileno(stdin), passbuf, sizeof(passbuf)-1);
} else {
#ifdef WIN32 #ifdef WIN32
HANDLE fhandle, fmap; HANDLE fhandle, fmap;
LPVOID faddress; LPVOID faddress;
fhandle = CreateFile(options->readpass, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); fhandle = CreateFile(options->readpass, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL);
if (fhandle == INVALID_HANDLE_VALUE) { if (fhandle == INVALID_HANDLE_VALUE) {
return 0; /* FAILED */ return 0; /* FAILED */
} }
fmap = CreateFileMapping(fhandle, NULL, PAGE_READONLY, 0, 0, NULL); fmap = CreateFileMapping(fhandle, NULL, PAGE_READONLY, 0, 0, NULL);
if (fmap == NULL) { if (fmap == NULL) {
return 0; /* FAILED */ return 0; /* FAILED */
} }
faddress = MapViewOfFile(fmap, FILE_MAP_READ, 0, 0, 0); faddress = MapViewOfFile(fmap, FILE_MAP_READ, 0, 0, 0);
CloseHandle(fmap); CloseHandle(fmap);
if (faddress == NULL) { if (faddress == NULL) {
return 0; /* FAILED */ return 0; /* FAILED */
} }
passlen = (int)GetFileSize(fhandle, NULL); passlen = (int)GetFileSize(fhandle, NULL);
memcpy(passbuf, faddress, passlen); memcpy(passbuf, faddress, passlen);
UnmapViewOfFile(faddress); UnmapViewOfFile(faddress);
CloseHandle(fhandle); CloseHandle(fhandle);
#else /* WIN32 */ #else /* WIN32 */
int passfd = open(options->readpass, O_RDONLY); int passfd = open(options->readpass, O_RDONLY);
if (passfd < 0) { if (passfd < 0) {
return 0; /* FAILED */ return 0; /* FAILED */
} }
passlen = (int)read(passfd, passbuf, sizeof passbuf - 1); passlen = (int)read(passfd, passbuf, sizeof passbuf - 1);
close(passfd); close(passfd);
#endif /* WIN32 */ #endif /* WIN32 */
}
if (passlen <= 0) { if (passlen <= 0) {
return 0; /* FAILED */ return 0; /* FAILED */
} }