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

Make V_ASN1_APP_CHOOSE work again.

parent 5d8118d2

CHANGES

+4 −0
Original line number Original line Diff line number Diff line
@@ -4,6 +4,10 @@ 




 Changes between 0.9.5 and 0.9.5a  [XX XXX 2000]

 Changes between 0.9.5 and 0.9.5a  [XX XXX 2000]





  *) Fix so V_ASN1_APP_CHOOSE works again: however its use is strongly

     discouraged.

     [Steve Henson, pointed out by Brian Korver <briank@cs.stanford.edu>]



  *) For easily testing in shell scripts whether some command

  *) For easily testing in shell scripts whether some command

     'openssl XXX' exists, the new pseudo-command 'openssl no-XXX'

     'openssl XXX' exists, the new pseudo-command 'openssl no-XXX'

     returns with exit code 0 iff no command of the given name is available.

     returns with exit code 0 iff no command of the given name is available.

crypto/x509/x509name.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -352,7 +352,7 @@ int X509_NAME_ENTRY_set_data(X509_NAME_ENTRY *ne, int type, 
	int i;

	int i;





	if ((ne == NULL) || ((bytes == NULL) && (len != 0))) return(0);

	if ((ne == NULL) || ((bytes == NULL) && (len != 0))) return(0);

	if(type & MBSTRING_FLAG) 

	if((type > 0) && (type & MBSTRING_FLAG)) 

		return ASN1_STRING_set_by_NID(&ne->value, bytes,

		return ASN1_STRING_set_by_NID(&ne->value, bytes,

						len, type,

						len, type,

					OBJ_obj2nid(ne->object)) ? 1 : 0;

					OBJ_obj2nid(ne->object)) ? 1 : 0;