Commit bc4deee0 authored by Ben Laurie's avatar Ben Laurie
Browse files

Fix numeric -newkey args.

Contributed by: Bodo Moeller <3moeller@informatik.uni-hamburg.de>
parent 5b00115a
Loading
Loading
Loading
Loading
+3 −0
Original line number Diff line number Diff line
@@ -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>]

+6 −3
Original line number Diff line number Diff line
@@ -221,12 +221,15 @@ 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;
				if(!is_numeric)
				    p+=4;
				newkey= atoi(p);
				}