From: Dr. Stephen Henson Date: Tue, 14 Mar 2000 03:29:57 +0000 (+0000) Subject: Make V_ASN1_APP_CHOOSE work again. X-Git-Tag: OpenSSL_0_9_5a-beta1~42 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=80870566cf49263fab7b0fe06c79985be8270d68;p=oweals%2Fopenssl.git Make V_ASN1_APP_CHOOSE work again. --- diff --git a/CHANGES b/CHANGES index 803be2de46..a97d3e62e0 100644 --- a/CHANGES +++ b/CHANGES @@ -4,6 +4,10 @@ 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 ] + *) For easily testing in shell scripts whether some command 'openssl XXX' exists, the new pseudo-command 'openssl no-XXX' returns with exit code 0 iff no command of the given name is available. diff --git a/crypto/x509/x509name.c b/crypto/x509/x509name.c index cf2382d42c..4c20e03ece 100644 --- a/crypto/x509/x509name.c +++ b/crypto/x509/x509name.c @@ -352,7 +352,7 @@ int X509_NAME_ENTRY_set_data(X509_NAME_ENTRY *ne, int type, int i; 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, len, type, OBJ_obj2nid(ne->object)) ? 1 : 0;