Correct a lot of printing calls. Remove extra arguments...

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

diff --git a/crypto/x509v3/v3_prn.c b/crypto/x509v3/v3_prn.c
index 475c48098c0b56ce56c1b42774714afaa46659ba..9be6c95a637d301a2f775783515533e4765c33ae 100644 (file)
--- a/crypto/x509v3/v3_prn.c
+++ b/crypto/x509v3/v3_prn.c
@@ -87,9 +87,16 @@ void X509V3_EXT_val_prn(BIO *out, STACK_OF(CONF_VALUE) *val, int indent, int ml)
                else BIO_printf(out, "%s:%s", nval->name, nval->value);
 #else
                else {
-                       char tmp[10240]; /* 10k is BIO_printf's limit anyway */
-                       ascii2ebcdic(tmp, nval->value, strlen(nval->value)+1);
-                       BIO_printf(out, "%s:%s", nval->name, tmp);
+                       int len;
+                       char *tmp;
+                       len = strlen(nval->value)+1;
+                       tmp = OPENSSL_malloc(len);
+                       if (tmp)
+                       {
+                               ascii2ebcdic(tmp, nval->value, len);
+                               BIO_printf(out, "%s:%s", nval->name, tmp);
+                               OPENSSL_free(tmp);
+                       }
                }
 #endif
                if(ml) BIO_puts(out, "\n");
@@ -109,10 +116,10 @@ int X509V3_EXT_print(BIO *out, X509_EXTENSION *ext, unsigned long flag, int inde
        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) unknown_ext_print(out, ext, flag, indent, 1);
+       if(!ext_str) return unknown_ext_print(out, ext, flag, indent, 1);
 
        if(method->i2s) {
                if(!(value = method->i2s(method, ext_str))) {
@@ -123,9 +130,16 @@ int X509V3_EXT_print(BIO *out, X509_EXTENSION *ext, unsigned long flag, int inde
                BIO_printf(out, "%*s%s", indent, "", value);
 #else
                {
-                       char tmp[10240]; /* 10k is BIO_printf's limit anyway */
-                       ascii2ebcdic(tmp, value, strlen(value)+1);
-                       BIO_printf(out, "%*s%s", indent, "", tmp);
+                       int len;
+                       char *tmp;
+                       len = strlen(value)+1;
+                       tmp = OPENSSL_malloc(len);
+                       if (tmp)
+                       {
+                               ascii2ebcdic(tmp, value, len);
+                               BIO_printf(out, "%*s%s", indent, "", tmp);
+                               OPENSSL_free(tmp);
+                       }
                }
 #endif
        } else if(method->i2v) {
@@ -142,7 +156,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;
 }
@@ -164,11 +178,11 @@ 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))
                        {
@@ -206,7 +220,7 @@ static int unknown_ext_print(BIO *out, X509_EXTENSION *ext, unsigned long flag,
 }
        
 
-#ifndef NO_FP_API
+#ifndef OPENSSL_NO_FP_API
 int X509V3_EXT_print_fp(FILE *fp, X509_EXTENSION *ext, int flag, int indent)
 {
        BIO *bio_tmp;