More code for X509_print_ex() support.

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

diff --git a/crypto/x509v3/v3_prn.c b/crypto/x509v3/v3_prn.c
index 8ddc16b7cdf4b5c4f6f26672fe03c9c5910e8cf1..5416f662d3155cf0abbb362e4362b4d1d411e71d 100644 (file)
--- a/crypto/x509v3/v3_prn.c
+++ b/crypto/x509v3/v3_prn.c
@@ -59,48 +59,71 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "conf.h"
-#include "x509v3.h"
+#include <openssl/conf.h>
+#include <openssl/x509v3.h>
 
 /* Extension printing routines */
 
+static int unknown_ext_print(BIO *out, X509_EXTENSION *ext, unsigned long flag, int indent, int supported);
+
 /* Print out a name+value stack */
 
-void X509V3_EXT_val_prn(BIO *out, STACK *val, int indent, int ml)
+void X509V3_EXT_val_prn(BIO *out, STACK_OF(CONF_VALUE) *val, int indent, int ml)
 {
        int i;
        CONF_VALUE *nval;
        if(!val) return;
-       if(!ml) BIO_printf(out, "%*s", indent, "");
-       for(i = 0; i < sk_num(val); i++) {
+       if(!ml || !sk_CONF_VALUE_num(val)) {
+               BIO_printf(out, "%*s", indent, "");
+               if(!sk_CONF_VALUE_num(val)) BIO_puts(out, "<EMPTY>\n");
+       }
+       for(i = 0; i < sk_CONF_VALUE_num(val); i++) {
                if(ml) BIO_printf(out, "%*s", indent, "");
                else if(i > 0) BIO_printf(out, ", ");
-               nval = (CONF_VALUE *)sk_value(val, i);
-               if(!nval->name) BIO_printf(out, "%s", nval->value);
-               else if(!nval->value) BIO_printf(out, "%s", nval->name);
+               nval = sk_CONF_VALUE_value(val, i);
+               if(!nval->name) BIO_puts(out, nval->value);
+               else if(!nval->value) BIO_puts(out, nval->name);
+#ifndef CHARSET_EBCDIC
                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);
+               }
+#endif
                if(ml) BIO_puts(out, "\n");
        }
 }
 
 /* Main routine: print out a general extension */
 
-int X509V3_EXT_print(BIO *out, X509_EXTENSION *ext, int flag, int indent)
+int X509V3_EXT_print(BIO *out, X509_EXTENSION *ext, unsigned long flag, int indent)
 {
        char *ext_str = NULL, *value = NULL;
        unsigned char *p;
        X509V3_EXT_METHOD *method;      
-       STACK *nval = NULL;
+       STACK_OF(CONF_VALUE) *nval = NULL;
        int ok = 1;
-       if(!(method = X509V3_EXT_get(ext))) return 0;
+       if(!(method = X509V3_EXT_get(ext)))
+               return unknown_ext_print(out, ext, flag, indent, 0);
        p = ext->value->data;
-       if(!(ext_str = method->d2i(NULL, &p, ext->value->length))) return 0;
+       if(!(ext_str = method->d2i(NULL, &p, ext->value->length)))
+               return unknown_ext_print(out, ext, flag, indent, 1);
        if(method->i2s) {
                if(!(value = method->i2s(method, ext_str))) {
                        ok = 0;
                        goto err;
                }
+#ifndef CHARSET_EBCDIC
                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);
+               }
+#endif
        } else if(method->i2v) {
                if(!(nval = method->i2v(method, ext_str, NULL))) {
                        ok = 0;
@@ -113,12 +136,39 @@ int X509V3_EXT_print(BIO *out, X509_EXTENSION *ext, int flag, int indent)
        } else ok = 0;
 
        err:
-               sk_pop_free(nval, X509V3_conf_free);
-               if(value) Free(value);
+               sk_CONF_VALUE_pop_free(nval, X509V3_conf_free);
+               if(value) OPENSSL_free(value);
                method->ext_free(ext_str);
                return ok;
 }
 
+static int unknown_ext_print(BIO *out, X509_EXTENSION *ext, unsigned long flag, int indent, int supported)
+{
+       switch(flag & X509V3_EXT_UNKNOWN_MASK) {
+
+               case X509V3_EXT_DEFAULT:
+               return 0;
+
+               case X509V3_EXT_ERROR_UNKNOWN:
+               if(supported)
+                       BIO_printf(out, "%*s<Parse Error>", indent, "");
+               else
+                       BIO_printf(out, "%*s<Not Supported>", indent, "");
+               return 1;
+
+               case X509V3_EXT_PARSE_UNKNOWN:
+                       return ASN1_parse_dump(out,
+                               ext->value->data, ext->value->length, indent, -1);
+               case X509V3_EXT_DUMP_UNKNOWN:
+                       return BIO_dump_indent(out, (char *)ext->value->data, ext->value->length, indent);
+
+               default:
+               return 1;
+       }
+}
+       
+
+#ifndef NO_FP_API
 int X509V3_EXT_print_fp(FILE *fp, X509_EXTENSION *ext, int flag, int indent)
 {
        BIO *bio_tmp;
@@ -128,3 +178,4 @@ int X509V3_EXT_print_fp(FILE *fp, X509_EXTENSION *ext, int flag, int indent)
        BIO_free(bio_tmp);
        return ret;
 }
+#endif