projects / openssl.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Fix AES code.
[openssl.git] / crypto / pkcs12 / p12_attr.c
diff --git a/crypto/pkcs12/p12_attr.c b/crypto/pkcs12/p12_attr.c
index 49b9a88db46c581e0fccfb9a0ea7424f6c214d3d..2d4d04292a630433c396a1d802df3d9c98945b30 100644 (file)
--- a/crypto/pkcs12/p12_attr.c
+++ b/crypto/pkcs12/p12_attr.c
@@ -58,14 +58,12 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "pkcs12.h"
+#include <openssl/pkcs12.h>
 
 /* Add a local keyid to a safebag */
 
-int PKCS12_add_localkeyid (bag, name, namelen)
-PKCS12_SAFEBAG *bag;
-unsigned char *name;
-int namelen;
+int PKCS12_add_localkeyid (PKCS12_SAFEBAG *bag, unsigned char *name,
+            int namelen)
 {
        X509_ATTRIBUTE *attrib;
        ASN1_BMPSTRING *oct;
@@ -75,11 +73,11 @@ int namelen;
                return 0;
        }
        keyid->type = V_ASN1_OCTET_STRING;
-       if (!(oct = ASN1_OCTET_STRING_new())) {
+       if (!(oct = M_ASN1_OCTET_STRING_new())) {
                PKCS12err(PKCS12_F_PKCS12_ADD_LOCALKEYID, ERR_R_MALLOC_FAILURE);
                return 0;
        }
-       if (!ASN1_OCTET_STRING_set(oct, name, namelen)) {
+       if (!M_ASN1_OCTET_STRING_set(oct, name, namelen)) {
                PKCS12err(PKCS12_F_PKCS12_ADD_LOCALKEYID, ERR_R_MALLOC_FAILURE);
                return 0;
        }
@@ -88,26 +86,24 @@ int namelen;
                PKCS12err(PKCS12_F_PKCS12_ADD_LOCALKEYID, ERR_R_MALLOC_FAILURE);
                return 0;
        }
-       M_ASN1_OBJECT_set(attrib->object, NID_localKeyID);
-       if (!(attrib->value.set = sk_new(NULL))) {
+       attrib->object = OBJ_nid2obj(NID_localKeyID);
+       if (!(attrib->value.set = sk_ASN1_TYPE_new_null())) {
                PKCS12err(PKCS12_F_PKCS12_ADD_LOCALKEYID, ERR_R_MALLOC_FAILURE);
                return 0;
        }
-       sk_push (attrib->value.set, (char *)keyid);
-       attrib->set = 1;
-       if (!bag->attrib && !(bag->attrib = sk_new (NULL))) {
+       sk_ASN1_TYPE_push (attrib->value.set,keyid);
+       attrib->single = 0;
+       if (!bag->attrib && !(bag->attrib = sk_X509_ATTRIBUTE_new_null ())) {
                PKCS12err(PKCS12_F_PKCS12_ADD_LOCALKEYID, ERR_R_MALLOC_FAILURE);
                return 0;
        }
-       sk_push (bag->attrib, (char *)attrib);
+       sk_X509_ATTRIBUTE_push (bag->attrib, attrib);
        return 1;
 }
 
 /* Add key usage to PKCS#8 structure */
 
-int PKCS8_add_keyusage (p8, usage)
-PKCS8_PRIV_KEY_INFO *p8;
-int usage;
+int PKCS8_add_keyusage (PKCS8_PRIV_KEY_INFO *p8, int usage)
 {
        X509_ATTRIBUTE *attrib;
        ASN1_BIT_STRING *bstr;
@@ -119,11 +115,11 @@ int usage;
                return 0;
        }
        keyid->type = V_ASN1_BIT_STRING;
-       if (!(bstr = ASN1_BIT_STRING_new())) {
+       if (!(bstr = M_ASN1_BIT_STRING_new())) {
                PKCS12err(PKCS12_F_PKCS8_ADD_KEYUSAGE, ERR_R_MALLOC_FAILURE);
                return 0;
        }
-       if (!ASN1_BIT_STRING_set(bstr, &us_val, 1)) {
+       if (!M_ASN1_BIT_STRING_set(bstr, &us_val, 1)) {
                PKCS12err(PKCS12_F_PKCS8_ADD_KEYUSAGE, ERR_R_MALLOC_FAILURE);
                return 0;
        }
@@ -132,44 +128,42 @@ int usage;
                PKCS12err(PKCS12_F_PKCS8_ADD_KEYUSAGE, ERR_R_MALLOC_FAILURE);
                return 0;
        }
-       M_ASN1_OBJECT_set(attrib->object, NID_key_usage);
-       if (!(attrib->value.set = sk_new(NULL))) {
+       attrib->object = OBJ_nid2obj(NID_key_usage);
+       if (!(attrib->value.set = sk_ASN1_TYPE_new_null())) {
                PKCS12err(PKCS12_F_PKCS8_ADD_KEYUSAGE, ERR_R_MALLOC_FAILURE);
                return 0;
        }
-       sk_push (attrib->value.set, (char *)keyid);
-       attrib->set = 1;
-       if (!p8->attributes && !(p8->attributes = sk_new (NULL))) {
+       sk_ASN1_TYPE_push (attrib->value.set,keyid);
+       attrib->single = 0;
+       if (!p8->attributes
+           && !(p8->attributes = sk_X509_ATTRIBUTE_new_null ())) {
                PKCS12err(PKCS12_F_PKCS8_ADD_KEYUSAGE, ERR_R_MALLOC_FAILURE);
                return 0;
        }
-       sk_push (p8->attributes, (char *)attrib);
+       sk_X509_ATTRIBUTE_push (p8->attributes, attrib);
        return 1;
 }
 
 /* Add a friendlyname to a safebag */
 
-int PKCS12_add_friendlyname_asc (bag, name, namelen)
-PKCS12_SAFEBAG *bag;
-unsigned char *name;
-int namelen;
+int PKCS12_add_friendlyname_asc (PKCS12_SAFEBAG *bag, const char *name,
+                                int namelen)
 {
        unsigned char *uniname;
        int ret, unilen;
-       if (!asc2uni(name, &uniname, &unilen)) {
-               PKCS12err(PKCS12_F_ADD_FRIENDLYNAME_ASC,ERR_R_MALLOC_FAILURE);
+       if (!asc2uni(name, namelen, &uniname, &unilen)) {
+               PKCS12err(PKCS12_F_PKCS12_ADD_FRIENDLYNAME_ASC,
+                                                       ERR_R_MALLOC_FAILURE);
                return 0;
        }
        ret = PKCS12_add_friendlyname_uni (bag, uniname, unilen);
-       Free(uniname);
+       OPENSSL_free(uniname);
        return ret;
 }
        
 
-int PKCS12_add_friendlyname_uni (bag, name, namelen)
-PKCS12_SAFEBAG *bag;
-unsigned char *name;
-int namelen;
+int PKCS12_add_friendlyname_uni (PKCS12_SAFEBAG *bag,
+                                const unsigned char *name, int namelen)
 {
        X509_ATTRIBUTE *attrib;
        ASN1_BMPSTRING *bmp;
@@ -177,61 +171,63 @@ int namelen;
        /* Zap ending double null if included */
        if(!name[namelen - 1] && !name[namelen - 2]) namelen -= 2;
        if (!(fname = ASN1_TYPE_new ())) {
-               PKCS12err(PKCS12_F_ADD_FRIENDLYNAME_UNI,ERR_R_MALLOC_FAILURE);
+               PKCS12err(PKCS12_F_PKCS12_ADD_FRIENDLYNAME_UNI,
+                                                       ERR_R_MALLOC_FAILURE);
                return 0;
        }
        fname->type = V_ASN1_BMPSTRING;
-       if (!(bmp = ASN1_BMPSTRING_new())) {
-               PKCS12err(PKCS12_F_ADD_FRIENDLYNAME_UNI,ERR_R_MALLOC_FAILURE);
+       if (!(bmp = M_ASN1_BMPSTRING_new())) {
+               PKCS12err(PKCS12_F_PKCS12_ADD_FRIENDLYNAME_UNI,
+                                                       ERR_R_MALLOC_FAILURE);
                return 0;
        }
-       if (!(bmp->data = Malloc (namelen))) {
-               PKCS12err(PKCS12_F_ADD_FRIENDLYNAME_UNI,ERR_R_MALLOC_FAILURE);
+       if (!(bmp->data = OPENSSL_malloc (namelen))) {
+               PKCS12err(PKCS12_F_PKCS12_ADD_FRIENDLYNAME_UNI,
+                                                       ERR_R_MALLOC_FAILURE);
                return 0;
        }
        memcpy (bmp->data, name, namelen);
        bmp->length = namelen;
        fname->value.bmpstring = bmp;
        if (!(attrib = X509_ATTRIBUTE_new ())) {
-               PKCS12err(PKCS12_F_ADD_FRIENDLYNAME_UNI,ERR_R_MALLOC_FAILURE);
+               PKCS12err(PKCS12_F_PKCS12_ADD_FRIENDLYNAME_UNI,
+                                                       ERR_R_MALLOC_FAILURE);
                return 0;
        }
-       M_ASN1_OBJECT_set(attrib->object, NID_friendlyName);
-       if (!(attrib->value.set = sk_new(NULL))) {
-               PKCS12err(PKCS12_F_ADD_FRIENDLYNAME,ERR_R_MALLOC_FAILURE);
+       attrib->object = OBJ_nid2obj(NID_friendlyName);
+       if (!(attrib->value.set = sk_ASN1_TYPE_new_null())) {
+               PKCS12err(PKCS12_F_PKCS12_ADD_FRIENDLYNAME,
+                                                       ERR_R_MALLOC_FAILURE);
                return 0;
        }
-       sk_push (attrib->value.set, (char *)fname);
-       attrib->set = 1;
-       if (!bag->attrib && !(bag->attrib = sk_new (NULL))) {
-               PKCS12err(PKCS12_F_ADD_FRIENDLYNAME_UNI, ERR_R_MALLOC_FAILURE);
+       sk_ASN1_TYPE_push (attrib->value.set,fname);
+       attrib->single = 0;
+       if (!bag->attrib && !(bag->attrib = sk_X509_ATTRIBUTE_new_null ())) {
+               PKCS12err(PKCS12_F_PKCS12_ADD_FRIENDLYNAME_UNI,
+                                                       ERR_R_MALLOC_FAILURE);
                return 0;
        }
-       sk_push (bag->attrib, (char *)attrib);
+       sk_X509_ATTRIBUTE_push (bag->attrib, attrib);
        return PKCS12_OK;
 }
 
-ASN1_TYPE *PKCS12_get_attr_gen (attrs, attr_nid)
-STACK *attrs;
-int attr_nid;
+ASN1_TYPE *PKCS12_get_attr_gen (STACK_OF(X509_ATTRIBUTE) *attrs, int attr_nid)
 {
        X509_ATTRIBUTE *attrib;
        int i;
        if (!attrs) return NULL;
-       for (i = 0; i < sk_num (attrs); i++) {
-               attrib = (X509_ATTRIBUTE *) sk_value (attrs, i);
+       for (i = 0; i < sk_X509_ATTRIBUTE_num (attrs); i++) {
+               attrib = sk_X509_ATTRIBUTE_value (attrs, i);
                if (OBJ_obj2nid (attrib->object) == attr_nid) {
-                       if (sk_num (attrib->value.set))
-                               return (ASN1_TYPE *)
-                                        sk_value (attrib->value.set, 0);
+                       if (sk_ASN1_TYPE_num (attrib->value.set))
+                           return sk_ASN1_TYPE_value(attrib->value.set, 0);
                        else return NULL;
                }
        }
        return NULL;
 }
 
-char *PKCS12_get_friendlyname(bag)
-PKCS12_SAFEBAG *bag;
+char *PKCS12_get_friendlyname(PKCS12_SAFEBAG *bag)
 {
        ASN1_TYPE *atype;
        if (!(atype = PKCS12_get_attr(bag, NID_friendlyName))) return NULL;
Unnamed repository; edit this file 'description' to name the repository.