generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Correctly handle case of bad arguments supplied to rsautl

Browse Source 
PR: 1659
This commit is contained in:
Lutz Jänicke 2008-04-17 13:36:13 +00:00
parent 4c1a6e004a
commit 6b6fe3d8e4
1 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
apps/rsautl.c
View File

@ -119,24 +119,36 @@ int MAIN(int argc, char **argv)
while(argc >= 1) while(argc >= 1)
{ {
if (!strcmp(*argv,"-in")) { if (!strcmp(*argv,"-in")) {
if (--argc < 1) badarg = 1; if (--argc < 1)
infile= *(++argv); badarg = 1;
else
infile= *(++argv);
} else if (!strcmp(*argv,"-out")) { } else if (!strcmp(*argv,"-out")) {
if (--argc < 1) badarg = 1; if (--argc < 1)
outfile= *(++argv); badarg = 1;
else
outfile= *(++argv);
} else if(!strcmp(*argv, "-inkey")) { } else if(!strcmp(*argv, "-inkey")) {
if (--argc < 1) badarg = 1; if (--argc < 1)
keyfile = *(++argv); badarg = 1;
else
keyfile = *(++argv);
} else if (!strcmp(*argv,"-passin")) { } else if (!strcmp(*argv,"-passin")) {
if (--argc < 1) badarg = 1; if (--argc < 1)
passargin= *(++argv); badarg = 1;
else
passargin= *(++argv);
} else if (strcmp(*argv,"-keyform") == 0) { } else if (strcmp(*argv,"-keyform") == 0) {
if (--argc < 1) badarg = 1; if (--argc < 1)
keyform=str2fmt(*(++argv)); badarg = 1;
else
keyform=str2fmt(*(++argv));
#ifndef OPENSSL_NO_ENGINE #ifndef OPENSSL_NO_ENGINE
} else if(!strcmp(*argv, "-engine")) { } else if(!strcmp(*argv, "-engine")) {
if (--argc < 1) badarg = 1; if (--argc < 1)
engine = *(++argv); badarg = 1;
else
engine = *(++argv);
#endif #endif
} else if(!strcmp(*argv, "-pubin")) { } else if(!strcmp(*argv, "-pubin")) {
key_type = KEY_PUBKEY; key_type = KEY_PUBKEY;