From: Dr. Stephen Henson <steve@openssl.org>
Date: Thu, 1 Mar 2001 13:33:53 +0000 (+0000)
Subject: Fix bug in copy_email() which would not
X-Git-Tag: OpenSSL_0_9_6a-beta1~18
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=95d334f2db25569be7817563fcec1af6cd665236;p=oweals%2Fopenssl.git

Fix bug in copy_email() which would not
find emailAddress at start of subject name.
---

diff --git a/CHANGES b/CHANGES
index 7707467d34..82a02295a4 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4,6 +4,10 @@
 
  Changes between 0.9.6 and 0.9.6a  [xx XXX 2001]
 
+  *) In copy_email() check for >= 0 as a return value for
+     X509_NAME_get_index_by_NID() since 0 is a valid index.
+     [Steve Henson reported by Massimiliano Pala <madwolf@opensca.org>]
+
   *) Use better test patterns in bntest.
      [Ulf Möller]
 
diff --git a/crypto/x509v3/v3_alt.c b/crypto/x509v3/v3_alt.c
index 733919f250..94bebcd448 100644
--- a/crypto/x509v3/v3_alt.c
+++ b/crypto/x509v3/v3_alt.c
@@ -270,7 +270,7 @@ static int copy_email(X509V3_CTX *ctx, STACK_OF(GENERAL_NAME) *gens)
 	/* Now add any email address(es) to STACK */
 	i = -1;
 	while((i = X509_NAME_get_index_by_NID(nm,
-					 NID_pkcs9_emailAddress, i)) > 0) {
+					 NID_pkcs9_emailAddress, i)) >= 0) {
 		ne = X509_NAME_get_entry(nm, i);
 		email = M_ASN1_IA5STRING_dup(X509_NAME_ENTRY_get_data(ne));
 		if(!email || !(gen = GENERAL_NAME_new())) {