X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=crypto%2Fx509v3%2Fv3_prn.c;h=08e6e2cc6efa73ddd3c7e287ddd6b9677efefc09;hb=703126f027b62b382379d276cd1cf8b174aa5d23;hp=f3cca7a8d640d39c632bbc1a262cd45995682669;hpb=e527ba09a66837cad0d8973409e660474db63f89;p=oweals%2Fopenssl.git

diff --git a/crypto/x509v3/v3_prn.c b/crypto/x509v3/v3_prn.c
index f3cca7a8d6..08e6e2cc6e 100644
--- a/crypto/x509v3/v3_prn.c
+++ b/crypto/x509v3/v3_prn.c
@@ -59,37 +59,39 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "conf.h"
-#include "x509v3.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;
@@ -101,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:
@@ -119,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;
 }