PR: 2411

[oweals/openssl.git] / crypto / x509v3 / v3_prn.c

diff --git a/crypto/x509v3/v3_prn.c b/crypto/x509v3/v3_prn.c
index c5e29fb825d70697afe49ae254ca33fbfbee16df..c1bb17f105a10ed1823d3958d86a9f5928ea6549 100644 (file)
--- a/crypto/x509v3/v3_prn.c
+++ b/crypto/x509v3/v3_prn.c
@@ -1,5 +1,5 @@
 /* v3_prn.c */
-/* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
+/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999.
  */
 /* ====================================================================
@@ -109,14 +109,15 @@ int X509V3_EXT_print(BIO *out, X509_EXTENSION *ext, unsigned long flag, int inde
 {
        void *ext_str = NULL;
        char *value = NULL;
-       unsigned char *p;
+       const unsigned char *p;
        X509V3_EXT_METHOD *method;      
        STACK_OF(CONF_VALUE) *nval = NULL;
        int ok = 1;
+
        if(!(method = X509V3_EXT_get(ext)))
                return unknown_ext_print(out, ext, flag, indent, 0);
        p = ext->value->data;
-       if(method->it) ext_str = ASN1_item_d2i(NULL, &p, ext->value->length, method->it);
+       if(method->it) ext_str = ASN1_item_d2i(NULL, &p, ext->value->length, ASN1_ITEM_ptr(method->it));
        else ext_str = method->d2i(NULL, &p, ext->value->length);
 
        if(!ext_str) return unknown_ext_print(out, ext, flag, indent, 1);
@@ -156,7 +157,7 @@ int X509V3_EXT_print(BIO *out, X509_EXTENSION *ext, unsigned long flag, int inde
        err:
                sk_CONF_VALUE_pop_free(nval, X509V3_conf_free);
                if(value) OPENSSL_free(value);
-               if(method->it) ASN1_item_free(ext_str, method->it);
+               if(method->it) ASN1_item_free(ext_str, ASN1_ITEM_ptr(method->it));
                else method->ext_free(ext_str);
                return ok;
 }
@@ -178,13 +179,13 @@ int X509V3_extensions_print(BIO *bp, char *title, STACK_OF(X509_EXTENSION) *exts
                ASN1_OBJECT *obj;
                X509_EXTENSION *ex;
                ex=sk_X509_EXTENSION_value(exts, i);
-               if (BIO_printf(bp,"%*s",indent, "") <= 0) return 0;
+               if (indent && BIO_printf(bp,"%*s",indent, "") <= 0) return 0;
                obj=X509_EXTENSION_get_object(ex);
                i2a_ASN1_OBJECT(bp,obj);
                j=X509_EXTENSION_get_critical(ex);
-               if (BIO_printf(bp,": %s\n",j?"critical":"","") <= 0)
+               if (BIO_printf(bp,": %s\n",j?"critical":"") <= 0)
                        return 0;
-               if(!X509V3_EXT_print(bp, ex, flag, 12))
+               if(!X509V3_EXT_print(bp, ex, flag, indent + 4))
                        {
                        BIO_printf(bp, "%*s", indent + 4, "");
                        M_ASN1_OCTET_STRING_print(bp,ex->value);