Commit 95d334f2 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files 

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

CHANGES

+4 −0
Original line number Diff line number Diff line
@@ -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]

crypto/x509v3/v3_alt.c

+1 −1
Original line number Diff line number Diff line
@@ -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())) {