Some constification and stacks that slipped through the cracks (how?).

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

diff --git a/crypto/pkcs12/p12_attr.c b/crypto/pkcs12/p12_attr.c
index 0bd91e388c1cbb156edb8714e006cd87acaf2211..31c9782b77568e0148950eb639be284d7d3e08de 100644 (file)
--- a/crypto/pkcs12/p12_attr.c
+++ b/crypto/pkcs12/p12_attr.c
@@ -87,17 +87,17 @@ 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))) {
+       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;
 }
 
@@ -129,17 +129,18 @@ 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;
 }
 
@@ -194,33 +195,32 @@ int PKCS12_add_friendlyname_uni (PKCS12_SAFEBAG *bag,
                return 0;
        }
        attrib->object = OBJ_nid2obj(NID_friendlyName);
-       if (!(attrib->value.set = sk_new(NULL))) {
+       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))) {
+       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 (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;
                }
        }