Include e_os.h correctly.

[openssl.git] / crypto / x509 / x509name.c

diff --git a/crypto/x509/x509name.c b/crypto/x509/x509name.c
index b4ceb65851cc25f68b7ce30792e238ebcb957e07..4c20e03eced3a6f3565ff8da26aa53ba62e3bce5 100644 (file)
--- a/crypto/x509/x509name.c
+++ b/crypto/x509/x509name.c
@@ -283,6 +283,7 @@ X509_NAME_ENTRY *X509_NAME_ENTRY_create_by_txt(X509_NAME_ENTRY **ne,
                {
                X509err(X509_F_X509_NAME_ENTRY_CREATE_BY_TXT,
                                                X509_R_INVALID_FIELD_NAME);
+               ERR_add_error_data(2, "name=", field);
                return(NULL);
                }
        nentry = X509_NAME_ENTRY_create_by_OBJ(ne,obj,type,bytes,len);
@@ -351,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;