From: Ben Laurie <ben@openssl.org>
Date: Thu, 7 Jan 1999 00:10:32 +0000 (+0000)
Subject: Fix numeric -newkey args.
X-Git-Tag: OpenSSL_0_9_2b~271
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=bc4deee07a53228db7a8962519f05e904eb4b670;p=oweals%2Fopenssl.git

Fix numeric -newkey args.
Contributed by: Bodo Moeller <3moeller@informatik.uni-hamburg.de>
---

diff --git a/CHANGES b/CHANGES
index 430603ad6b..c7c24ed9e5 100644
--- a/CHANGES
+++ b/CHANGES
@@ -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>]
 
diff --git a/apps/req.c b/apps/req.c
index 1c07c3cdc0..f37616feff 100644
--- a/apps/req.c
+++ b/apps/req.c
@@ -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