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 7da7056293b45e2a8c7f6c983ba52f08b571a489..08e6e2cc6efa73ddd3c7e287ddd6b9677efefc09 100644 (file)
--- a/crypto/x509v3/v3_prn.c
+++ b/crypto/x509v3/v3_prn.c
@@ -57,40 +57,41 @@
  */
 /* X509 v3 extension utilities */
 
-#include <stdlib.h>
-#include <pem.h>
-#include <conf.h>
-#include <err.h>
-#include "x509v3.h"
+#include <stdio.h>
+#include "cryptlib.h"
+#include <openssl/conf.h>
+#include <openssl/x509v3.h>
 
 /* Extension printing routines */
 
 /* Print out a name+value stack */
 
-void X509V3_EXT_val_prn(out, val)
-BIO *out;
-STACK *val;
+void X509V3_EXT_val_prn(BIO *out, STACK *val, int indent, int ml)
 {
        int i;
        CONF_VALUE *nval;
        if(!val) return;
+       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(i > 0) BIO_printf(out, ", ");
+               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");
        }
 }
 
 /* Main routine: print out a general extension */
 
-int X509V3_EXT_print(out, ext, flag)
-BIO *out;
-X509_EXTENSION *ext;
-int flag;
+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;
@@ -102,15 +103,16 @@ int flag;
                        ok = 0;
                        goto err;
                }
-               BIO_printf(out, value);
+               BIO_printf(out, "%*s%s", indent, "", value);
        } else if(method->i2v) {
                if(!(nval = method->i2v(method, ext_str, NULL))) {
                        ok = 0;
                        goto err;
                }
-               X509V3_EXT_val_prn(out, nval);
+               X509V3_EXT_val_prn(out, nval, indent,
+                                method->ext_flags & X509V3_EXT_MULTILINE);
        } else if(method->i2r) {
-               if(!method->i2r(method, ext_str, out)) ok = 0;
+               if(!method->i2r(method, ext_str, out, indent)) ok = 0;
        } else ok = 0;
 
        err:
@@ -120,15 +122,12 @@ int flag;
                return ok;
 }
 
-int X509V3_EXT_print_fp(fp, ext, flag)
-FILE *fp;
-X509_EXTENSION *ext;
-int flag;
+int X509V3_EXT_print_fp(FILE *fp, X509_EXTENSION *ext, int flag, int indent)
 {
        BIO *bio_tmp;
        int ret;
        if(!(bio_tmp = BIO_new_fp(fp, BIO_NOCLOSE))) return 0;
-       ret = X509V3_EXT_print(bio_tmp, ext, flag);
+       ret = X509V3_EXT_print(bio_tmp, ext, flag, indent);
        BIO_free(bio_tmp);
        return ret;
 }