Various clarifications to extension docs: change the name of literal

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

diff --git a/crypto/x509v3/v3_prn.c b/crypto/x509v3/v3_prn.c
index d81f4088e0af57a21fd541f0218c5ca44d28efd9..08e6e2cc6efa73ddd3c7e287ddd6b9677efefc09 100644 (file)
--- a/crypto/x509v3/v3_prn.c
+++ b/crypto/x509v3/v3_prn.c
@@ -59,8 +59,8 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "conf.h"
-#include "x509v3.h"
+#include <openssl/conf.h>
+#include <openssl/x509v3.h>
 
 /* Extension printing routines */
 
@@ -71,13 +71,16 @@ void X509V3_EXT_val_prn(BIO *out, STACK *val, int indent, int ml)
        int i;
        CONF_VALUE *nval;
        if(!val) return;
-       if(!ml) BIO_printf(out, "%*s", indent, "");
+       if(!ml || !sk_num(val)) {
+               BIO_printf(out, "%*s", indent, "");
+               if(!sk_num(val)) BIO_puts(out, "<EMPTY>\n");
+       }
        for(i = 0; i < sk_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);
+               if(!nval->name) BIO_puts(out, nval->value);
+               else if(!nval->value) BIO_puts(out, nval->name);
                else BIO_printf(out, "%s:%s", nval->name, nval->value);
                if(ml) BIO_puts(out, "\n");
        }
@@ -87,7 +90,8 @@ void X509V3_EXT_val_prn(BIO *out, STACK *val, int indent, int ml)
 
 int X509V3_EXT_print(BIO *out, X509_EXTENSION *ext, int flag, int indent)
 {
-       char *ext_str = NULL, *p, *value = NULL;
+       char *ext_str = NULL, *value = NULL;
+       unsigned char *p;
        X509V3_EXT_METHOD *method;      
        STACK *nval = NULL;
        int ok = 1;