*/
/* 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_OF(CONF_VALUE) *val, int indent, int ml)
{
int i;
CONF_VALUE *nval;
if(!val) return;
- for(i = 0; i < sk_num(val); i++) {
- 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(!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 = sk_CONF_VALUE_value(val, i);
+ 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;
+ STACK_OF(CONF_VALUE) *nval = NULL;
int ok = 1;
if(!(method = X509V3_EXT_get(ext))) return 0;
p = ext->value->data;
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))) {
+ 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:
- sk_pop_free(nval, X509V3_conf_free);
+ sk_CONF_VALUE_pop_free(nval, X509V3_conf_free);
if(value) Free(value);
method->ext_free(ext_str);
return ok;
}
-int X509V3_EXT_print_fp(fp, ext, flag)
-FILE *fp;
-X509_EXTENSION *ext;
-int flag;
+#ifndef NO_FP_API
+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;
}
+#endif