From: Dr. Stephen Henson <steve@openssl.org>
Date: Wed, 24 Feb 1999 00:14:21 +0000 (+0000)
Subject: Remove debugging fprintf from req.c and fix the code so it properly skips over
X-Git-Tag: OpenSSL_0_9_2b~117
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=6b313a7365defc2334430284455e535adbb8e9f4;p=oweals%2Fopenssl.git

Remove debugging fprintf from req.c and fix the code so it properly skips over
the first leading XXX. in the DN.
---

diff --git a/apps/req.c b/apps/req.c
index 8535a1e6db..dad1a50c46 100644
--- a/apps/req.c
+++ b/apps/req.c
@@ -890,9 +890,12 @@ start:		for (;;)
 			 * multiple instances 
 			 */
 			for(p = v->name; *p ; p++) 
-				if ((*p != ':') || (*p != ',') ||
-							 (*p != '.')) break;
-			if (*p) type=(char *)p;
+				if ((*p == ':') || (*p == ',') ||
+							 (*p == '.')) {
+					p++;
+					if(*p) type = p;
+					break;
+				}
 			/* If OBJ not recognised ignore it */
 			if ((nid=OBJ_txt2nid(type)) == NID_undef) goto start;
 			sprintf(buf,"%s_default",v->name);
@@ -1189,9 +1192,6 @@ char *end;
 	slen = strlen(str);
 	if(elen > slen) return 1;
 	tmp = str + slen - elen;
-#ifdef DEBUG
-	fprintf(stderr, "Matching %s, %s %s\n", str, end, tmp);
-#endif
 	return strcmp(tmp, end);
 }