Fix CRL printing to correctly show when there are no revoked certificates.

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

diff --git a/crypto/pkcs12/p12_attr.c b/crypto/pkcs12/p12_attr.c
index b370c9cf3f3f12cce52c24ebf950ca5b68c05548..2d4d04292a630433c396a1d802df3d9c98945b30 100644 (file)
--- a/crypto/pkcs12/p12_attr.c
+++ b/crypto/pkcs12/p12_attr.c
@@ -87,13 +87,13 @@ int PKCS12_add_localkeyid (PKCS12_SAFEBAG *bag, unsigned char *name,
                return 0;
        }
        attrib->object = OBJ_nid2obj(NID_localKeyID);
-       if (!(attrib->value.set = sk_ASN1_TYPE_new(NULL))) {
+       if (!(attrib->value.set = sk_ASN1_TYPE_new_null())) {
                PKCS12err(PKCS12_F_PKCS12_ADD_LOCALKEYID, ERR_R_MALLOC_FAILURE);
                return 0;
        }
        sk_ASN1_TYPE_push (attrib->value.set,keyid);
-       attrib->set = 1;
-       if (!bag->attrib && !(bag->attrib = sk_X509_ATTRIBUTE_new (NULL))) {
+       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;
        }
@@ -129,14 +129,14 @@ 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_ASN1_TYPE_new(NULL))) {
+       if (!(attrib->value.set = sk_ASN1_TYPE_new_null())) {
                PKCS12err(PKCS12_F_PKCS8_ADD_KEYUSAGE, ERR_R_MALLOC_FAILURE);
                return 0;
        }
        sk_ASN1_TYPE_push (attrib->value.set,keyid);
-       attrib->set = 1;
+       attrib->single = 0;
        if (!p8->attributes
-           && !(p8->attributes = sk_X509_ATTRIBUTE_new (NULL))) {
+           && !(p8->attributes = sk_X509_ATTRIBUTE_new_null ())) {
                PKCS12err(PKCS12_F_PKCS8_ADD_KEYUSAGE, ERR_R_MALLOC_FAILURE);
                return 0;
        }
@@ -151,7 +151,7 @@ int PKCS12_add_friendlyname_asc (PKCS12_SAFEBAG *bag, const char *name,
 {
        unsigned char *uniname;
        int ret, unilen;
-       if (!asc2uni(name, &uniname, &unilen)) {
+       if (!asc2uni(name, namelen, &uniname, &unilen)) {
                PKCS12err(PKCS12_F_PKCS12_ADD_FRIENDLYNAME_ASC,
                                                        ERR_R_MALLOC_FAILURE);
                return 0;
@@ -195,14 +195,14 @@ int PKCS12_add_friendlyname_uni (PKCS12_SAFEBAG *bag,
                return 0;
        }
        attrib->object = OBJ_nid2obj(NID_friendlyName);
-       if (!(attrib->value.set = sk_ASN1_TYPE_new(NULL))) {
+       if (!(attrib->value.set = sk_ASN1_TYPE_new_null())) {
                PKCS12err(PKCS12_F_PKCS12_ADD_FRIENDLYNAME,
                                                        ERR_R_MALLOC_FAILURE);
                return 0;
        }
        sk_ASN1_TYPE_push (attrib->value.set,fname);
-       attrib->set = 1;
-       if (!bag->attrib && !(bag->attrib = sk_X509_ATTRIBUTE_new (NULL))) {
+       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;