Fix numeric -newkey args.

Contributed by: Bodo Moeller <3moeller@informatik.uni-hamburg.de>
This commit is contained in:
Ben Laurie 1999-01-07 00:10:32 +00:00
parent 5b00115ab0
commit bc4deee07a
2 changed files with 9 additions and 3 deletions

View File

@ -5,6 +5,9 @@
Changes between 0.9.1c and 0.9.2
*) Don't blow it for numeric -newkey arguments to apps/req.
[Bodo Moeller <3moeller@informatik.uni-hamburg.de>]
*) Temp key "for export" tests were wrong in s3_srvr.c.
[Anonymous <nobody@replay.com>]

View File

@ -221,13 +221,16 @@ char **argv;
}
else if (strcmp(*argv,"-newkey") == 0)
{
int is_numeric;
if (--argc < 1) goto bad;
p= *(++argv);
if ((strncmp("rsa:",p,4) == 0) ||
((p[0] >= '0') && (p[0] <= '9')))
is_numeric = p[0] >= '0' && p[0] <= '9';
if (strncmp("rsa:",p,4) == 0 || is_numeric)
{
pkey_type=TYPE_RSA;
p+=4;
if(!is_numeric)
p+=4;
newkey= atoi(p);
}
else