Another stack.

[openssl.git] / crypto / pkcs12 / p12_attr.c

diff --git a/crypto/pkcs12/p12_attr.c b/crypto/pkcs12/p12_attr.c
index 6247fdb76651a88de8265630cfdf9e53ba871770..0dcf553e2a14d5ddca4ac7c89881d4b8436e43fb 100644 (file)
--- a/crypto/pkcs12/p12_attr.c
+++ b/crypto/pkcs12/p12_attr.c
@@ -58,7 +58,7 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "pkcs12.h"
+#include <openssl/pkcs12.h>
 
 /* Add a local keyid to a safebag */
 
@@ -87,11 +87,11 @@ int PKCS12_add_localkeyid (PKCS12_SAFEBAG *bag, unsigned char *name,
                return 0;
        }
        attrib->object = OBJ_nid2obj(NID_localKeyID);
-       if (!(attrib->value.set = sk_new(NULL))) {
+       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);
+       sk_ASN1_TYPE_push (attrib->value.set,keyid);
        attrib->set = 1;
        if (!bag->attrib && !(bag->attrib = sk_new (NULL))) {
                PKCS12err(PKCS12_F_PKCS12_ADD_LOCALKEYID, ERR_R_MALLOC_FAILURE);
@@ -129,29 +129,31 @@ int PKCS8_add_keyusage (PKCS8_PRIV_KEY_INFO *p8, int usage)
                return 0;
        }
        attrib->object = OBJ_nid2obj(NID_key_usage);
-       if (!(attrib->value.set = sk_new(NULL))) {
+       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);
+       sk_ASN1_TYPE_push (attrib->value.set,keyid);
        attrib->set = 1;
-       if (!p8->attributes && !(p8->attributes = sk_new (NULL))) {
+       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 (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);
+               PKCS12err(PKCS12_F_PKCS12_ADD_FRIENDLYNAME_ASC,
+                                                       ERR_R_MALLOC_FAILURE);
                return 0;
        }
        ret = PKCS12_add_friendlyname_uni (bag, uniname, unilen);
@@ -160,8 +162,8 @@ int PKCS12_add_friendlyname_asc (PKCS12_SAFEBAG *bag, unsigned char *name,
 }
        
 
-int PKCS12_add_friendlyname_uni (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;
@@ -169,34 +171,40 @@ int PKCS12_add_friendlyname_uni (PKCS12_SAFEBAG *bag, unsigned char *name,
        /* 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);
+               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);
+               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;
        }
        attrib->object = OBJ_nid2obj(NID_friendlyName);
-       if (!(attrib->value.set = sk_new(NULL))) {
-               PKCS12err(PKCS12_F_ADD_FRIENDLYNAME,ERR_R_MALLOC_FAILURE);
+       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);
+       sk_ASN1_TYPE_push (attrib->value.set,fname);
        attrib->set = 1;
        if (!bag->attrib && !(bag->attrib = sk_new (NULL))) {
-               PKCS12err(PKCS12_F_ADD_FRIENDLYNAME_UNI, ERR_R_MALLOC_FAILURE);
+               PKCS12err(PKCS12_F_PKCS12_ADD_FRIENDLYNAME_UNI,
+                                                       ERR_R_MALLOC_FAILURE);
                return 0;
        }
        sk_push (bag->attrib, (char *)attrib);
@@ -211,9 +219,8 @@ ASN1_TYPE *PKCS12_get_attr_gen (STACK *attrs, int attr_nid)
        for (i = 0; i < sk_num (attrs); i++) {
                attrib = (X509_ATTRIBUTE *) sk_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;
                }
        }