FIPS merge "crypto" functions.

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

diff --git a/crypto/x509v3/v3_prn.c b/crypto/x509v3/v3_prn.c
index aeaf6170fe44ee1cdeb9af7a7f7964c34ad676ac..20bd9bda190a65688c8c649c3ce82bce24ec9026 100644 (file)
--- a/crypto/x509v3/v3_prn.c
+++ b/crypto/x509v3/v3_prn.c
@@ -109,10 +109,11 @@ 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;
@@ -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);