1 files changed, 64 insertions, 2 deletions

diff --git a/src/lib/libcrypto/x509/x509name.c b/src/lib/libcrypto/x509/x509name.c
index 2a422be350..cf2382d42c 100644
--- a/src/lib/libcrypto/x509/x509name.c
+++ b/src/lib/libcrypto/x509/x509name.c
@@ -171,6 +171,42 @@ X509_NAME_ENTRY *X509_NAME_delete_entry(X509_NAME *name, int loc)
         return(ret);
         }
 
+int X509_NAME_add_entry_by_OBJ(X509_NAME *name, ASN1_OBJECT *obj, int type,
+                        unsigned char *bytes, int len, int loc, int set)
+{
+        X509_NAME_ENTRY *ne;
+        int ret;
+        ne = X509_NAME_ENTRY_create_by_OBJ(NULL, obj, type, bytes, len);
+        if(!ne) return 0;
+        ret = X509_NAME_add_entry(name, ne, loc, set);
+        X509_NAME_ENTRY_free(ne);
+        return ret;
+}
+
+int X509_NAME_add_entry_by_NID(X509_NAME *name, int nid, int type,
+                        unsigned char *bytes, int len, int loc, int set)
+{
+        X509_NAME_ENTRY *ne;
+        int ret;
+        ne = X509_NAME_ENTRY_create_by_NID(NULL, nid, type, bytes, len);
+        if(!ne) return 0;
+        ret = X509_NAME_add_entry(name, ne, loc, set);
+        X509_NAME_ENTRY_free(ne);
+        return ret;
+}
+
+int X509_NAME_add_entry_by_txt(X509_NAME *name, char *field, int type,
+                        unsigned char *bytes, int len, int loc, int set)
+{
+        X509_NAME_ENTRY *ne;
+        int ret;
+        ne = X509_NAME_ENTRY_create_by_txt(NULL, field, type, bytes, len);
+        if(!ne) return 0;
+        ret = X509_NAME_add_entry(name, ne, loc, set);
+        X509_NAME_ENTRY_free(ne);
+        return ret;
+}
+
 /* if set is -1, append to previous set, 0 'a new one', and 1,
  * prepend to the guy we are about to stomp on. */
 int X509_NAME_add_entry(X509_NAME *name, X509_NAME_ENTRY *ne, int loc,
@@ -236,10 +272,30 @@ err:
         return(0);
         }
 
+X509_NAME_ENTRY *X509_NAME_ENTRY_create_by_txt(X509_NAME_ENTRY **ne,
+                char *field, int type, unsigned char *bytes, int len)
+        {
+        ASN1_OBJECT *obj;
+        X509_NAME_ENTRY *nentry;
+
+        obj=OBJ_txt2obj(field, 0);
+        if (obj == NULL)
+                {
+                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);
+        ASN1_OBJECT_free(obj);
+        return nentry;
+        }
+
 X509_NAME_ENTRY *X509_NAME_ENTRY_create_by_NID(X509_NAME_ENTRY **ne, int nid,
              int type, unsigned char *bytes, int len)
         {
         ASN1_OBJECT *obj;
+        X509_NAME_ENTRY *nentry;
 
         obj=OBJ_nid2obj(nid);
         if (obj == NULL)
@@ -247,7 +303,9 @@ X509_NAME_ENTRY *X509_NAME_ENTRY_create_by_NID(X509_NAME_ENTRY **ne, int nid,
                 X509err(X509_F_X509_NAME_ENTRY_CREATE_BY_NID,X509_R_UNKNOWN_NID);
                 return(NULL);
                 }
-        return(X509_NAME_ENTRY_create_by_OBJ(ne,obj,type,bytes,len));
+        nentry = X509_NAME_ENTRY_create_by_OBJ(ne,obj,type,bytes,len);
+        ASN1_OBJECT_free(obj);
+        return nentry;
         }
 
 X509_NAME_ENTRY *X509_NAME_ENTRY_create_by_OBJ(X509_NAME_ENTRY **ne,
@@ -267,7 +325,7 @@ X509_NAME_ENTRY *X509_NAME_ENTRY_create_by_OBJ(X509_NAME_ENTRY **ne,
                 goto err;
         if (!X509_NAME_ENTRY_set_data(ret,type,bytes,len))
                 goto err;
-        
+
         if ((ne != NULL) && (*ne == NULL)) *ne=ret;
         return(ret);
 err:
@@ -294,6 +352,10 @@ 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) 
+                return ASN1_STRING_set_by_NID(&ne->value, bytes,
+                                                len, type,
+                                        OBJ_obj2nid(ne->object)) ? 1 : 0;
         if (len < 0) len=strlen((char *)bytes);
         i=ASN1_STRING_set(ne->value,bytes,len);
         if (!i) return(0);