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

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

diff --git a/crypto/pkcs12/p12_utl.c b/crypto/pkcs12/p12_utl.c
index ae689c9b99d1dd5c255c3c9105efffd55d503276..4409e5c1a8a57609e03e7c49af30e914d2cec175 100644 (file)
--- a/crypto/pkcs12/p12_utl.c
+++ b/crypto/pkcs12/p12_utl.c
@@ -57,84 +57,90 @@
  */
 
 #include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <bio.h>
-#include <err.h>
-#include "pkcs12.h"
+#include "cryptlib.h"
+#include <openssl/pkcs12.h>
 
 /* Cheap and nasty Unicode stuff */
 
-unsigned char *asc2uni (asc, uni, unilen)
-unsigned char *asc, **uni;
-int *unilen;
+unsigned char *asc2uni(const char *asc, int asclen, unsigned char **uni, int *unilen)
 {
        int ulen, i;
        unsigned char *unitmp;
-       ulen = strlen(asc)*2  + 2;
-       if (!(unitmp = Malloc (ulen))) return NULL;
-       for (i = 0; i < ulen; i+=2) {
+       if (asclen == -1) asclen = strlen(asc);
+       ulen = asclen*2  + 2;
+       if (!(unitmp = OPENSSL_malloc(ulen))) return NULL;
+       for (i = 0; i < ulen - 2; i+=2) {
                unitmp[i] = 0;
                unitmp[i + 1] = asc[i>>1];
        }
+       /* Make result double null terminated */
+       unitmp[ulen - 2] = 0;
+       unitmp[ulen - 1] = 0;
        if (unilen) *unilen = ulen;
        if (uni) *uni = unitmp;
        return unitmp;
 }
 
-char *uni2asc (uni, unilen)
-unsigned char *uni;
-int unilen;
+char *uni2asc(unsigned char *uni, int unilen)
 {
        int asclen, i;
        char *asctmp;
        asclen = unilen / 2;
        /* If no terminating zero allow for one */
-       if (uni[unilen - 1]) asclen++;
+       if (!unilen || uni[unilen - 1]) asclen++;
        uni++;
-       if (!(asctmp = Malloc (asclen))) return NULL;
+       if (!(asctmp = OPENSSL_malloc(asclen))) return NULL;
        for (i = 0; i < unilen; i+=2) asctmp[i>>1] = uni[i];
        asctmp[asclen - 1] = 0;
        return asctmp;
 }
 
-/* Tag an object type onto an error code */
+int i2d_PKCS12_bio(BIO *bp, PKCS12 *p12)
+{
+       return ASN1_item_i2d_bio(&PKCS12_it, bp, p12);
+}
 
-void PKCS12_add_obj_error (obj)
-ASN1_OBJECT *obj;
+#ifndef NO_FP_API
+int i2d_PKCS12_fp(FILE *fp, PKCS12 *p12)
 {
-       char obj_tmp[80];
-       if (!obj) strcpy (obj_tmp, "NULL");
-       else i2t_ASN1_OBJECT(obj_tmp, 80, obj);
-       ERR_add_error_data(2, "TYPE=", obj_tmp);
+       return ASN1_item_i2d_fp(&PKCS12_it, fp, p12);
 }
+#endif
 
-int i2d_PKCS12_bio(bp, p12)
-BIO *bp;
-PKCS12 *p12;
+PKCS12 *d2i_PKCS12_bio(BIO *bp, PKCS12 **p12)
+{
+       return ASN1_item_d2i_bio(&PKCS12_it, bp, p12);
+}
+#ifndef NO_FP_API
+PKCS12 *d2i_PKCS12_fp(FILE *fp, PKCS12 **p12)
 {
-       return ASN1_i2d_bio((int(*)())i2d_PKCS12, bp, (unsigned char *)p12);
+        return ASN1_item_d2i_fp(&PKCS12_it, fp, p12);
 }
+#endif
 
-int i2d_PKCS12_fp(fp, p12)
-FILE *fp;
-PKCS12 *p12;
+PKCS12_SAFEBAG *PKCS12_x5092certbag(X509 *x509)
 {
-       return ASN1_i2d_fp((int(*)())i2d_PKCS12, fp, (unsigned char *)p12);
+       return PKCS12_item_pack_safebag(x509, &X509_it,
+                       NID_x509Certificate, NID_certBag);
 }
 
-PKCS12 *d2i_PKCS12_bio(bp, p12)
-BIO *bp;
-PKCS12 **p12;
+PKCS12_SAFEBAG *PKCS12_x509crl2certbag(X509_CRL *crl)
 {
-       return (PKCS12 *)ASN1_d2i_bio((char *(*)())PKCS12_new,
-         (char *(*)())d2i_PKCS12, bp, (unsigned char **)p12);
+       return PKCS12_item_pack_safebag(crl, &X509_CRL_it,
+                       NID_x509Crl, NID_crlBag);
 }
-PKCS12 *d2i_PKCS12_fp(fp, p12)
-FILE *fp;
-PKCS12 **p12;
+
+X509 *PKCS12_certbag2x509(PKCS12_SAFEBAG *bag)
 {
-        return (PKCS12 *)ASN1_d2i_fp((char *(*)())PKCS12_new, 
-         (char *(*)())d2i_PKCS12, fp, (unsigned char **)(p12));
+       if(M_PKCS12_bag_type(bag) != NID_certBag) return NULL;
+       if(M_PKCS12_cert_bag_type(bag) != NID_x509Certificate) return NULL;
+       return ASN1_item_unpack(bag->value.bag->value.octet, &X509_it);
 }
 
+X509_CRL *PKCS12_certbag2x509crl(PKCS12_SAFEBAG *bag)
+{
+       if(M_PKCS12_bag_type(bag) != NID_crlBag) return NULL;
+       if(M_PKCS12_cert_bag_type(bag) != NID_x509Crl) return NULL;
+       return ASN1_item_unpack(bag->value.bag->value.octet,
+                                                       &X509_CRL_it);
+}