OPENSSL_NO_xxx cleanup: SHA

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

diff --git a/crypto/x509v3/v3_prn.c b/crypto/x509v3/v3_prn.c
index aeaf6170fe44ee1cdeb9af7a7f7964c34ad676ac..a760794f9f5c6f2dd4a9a7854de01f108bfbef58 100644 (file)
--- a/crypto/x509v3/v3_prn.c
+++ b/crypto/x509v3/v3_prn.c
@@ -1,6 +1,7 @@
 /* v3_prn.c */
 /* v3_prn.c */

-/* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
- * project 1999.
+/*
+ * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL project
+ * 1999.

  */
 /* ====================================================================
  * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
  */
 /* ====================================================================
  * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.


@@ -10,7 +11,7 @@
  * are met:
  *
  * 1. Redistributions of source code must retain the above copyright
  * are met:
  *
  * 1. Redistributions of source code must retain the above copyright

- *    notice, this list of conditions and the following disclaimer. 
+ *    notice, this list of conditions and the following disclaimer.

  *
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in
  *
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in


@@ -64,170 +65,195 @@
 
 /* Extension printing routines */
 
 
 /* Extension printing routines */
 

-static int unknown_ext_print(BIO *out, X509_EXTENSION *ext, unsigned long flag, int indent, int supported);
+static int unknown_ext_print(BIO *out, X509_EXTENSION *ext,
+                             unsigned long flag, int indent, int supported);

 
 /* Print out a name+value stack */
 
 
 /* Print out a name+value stack */
 

-void X509V3_EXT_val_prn(BIO *out, STACK_OF(CONF_VALUE) *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 || !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);
+    int i;
+    CONF_VALUE *nval;
+    if (!val)
+        return;
+    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);

 #ifndef CHARSET_EBCDIC
 #ifndef CHARSET_EBCDIC

-               else BIO_printf(out, "%s:%s", nval->name, nval->value);
+        else
+            BIO_printf(out, "%s:%s", nval->name, nval->value);

 #else
 #else

-               else {
-                       int len;
-                       char *tmp;
-                       len = strlen(nval->value)+1;
-                       tmp = OPENSSL_malloc(len);
-                       if (tmp)
-                       {
-                               ascii2ebcdic(tmp, nval->value, len);
-                               BIO_printf(out, "%s:%s", nval->name, tmp);
-                               OPENSSL_free(tmp);
-                       }
-               }
+        else {
+            int len;
+            char *tmp;
+            len = strlen(nval->value) + 1;
+            tmp = OPENSSL_malloc(len);
+            if (tmp) {
+                ascii2ebcdic(tmp, nval->value, len);
+                BIO_printf(out, "%s:%s", nval->name, tmp);
+                OPENSSL_free(tmp);
+            }
+        }

 #endif
 #endif

-               if(ml) BIO_puts(out, "\n");
-       }
+        if (ml)
+            BIO_puts(out, "\n");
+    }

 }
 
 /* Main routine: print out a general extension */
 
 }
 
 /* Main routine: print out a general extension */
 

-int X509V3_EXT_print(BIO *out, X509_EXTENSION *ext, unsigned long flag, int indent)
+int X509V3_EXT_print(BIO *out, X509_EXTENSION *ext, unsigned long flag,
+                     int indent)

 {
 {

-       void *ext_str = NULL;
-       char *value = NULL;
-       unsigned char *p;
-       X509V3_EXT_METHOD *method;      
-       STACK_OF(CONF_VALUE) *nval = NULL;
-       int ok = 1;
-       if(!(method = X509V3_EXT_get(ext)))
-               return unknown_ext_print(out, ext, flag, indent, 0);
-       p = ext->value->data;
-       if(method->it) ext_str = ASN1_item_d2i(NULL, &p, ext->value->length, ASN1_ITEM_ptr(method->it));
-       else ext_str = method->d2i(NULL, &p, ext->value->length);
-
-       if(!ext_str) return unknown_ext_print(out, ext, flag, indent, 1);
-
-       if(method->i2s) {
-               if(!(value = method->i2s(method, ext_str))) {
-                       ok = 0;
-                       goto err;
-               }
+    void *ext_str = NULL;
+    char *value = NULL;
+    const unsigned char *p;
+    const X509V3_EXT_METHOD *method;
+    STACK_OF(CONF_VALUE) *nval = NULL;
+    int ok = 1;
+
+    if (!(method = X509V3_EXT_get(ext)))
+        return unknown_ext_print(out, ext, flag, indent, 0);
+    p = ext->value->data;
+    if (method->it)
+        ext_str =
+            ASN1_item_d2i(NULL, &p, ext->value->length,
+                          ASN1_ITEM_ptr(method->it));
+    else
+        ext_str = method->d2i(NULL, &p, ext->value->length);
+
+    if (!ext_str)
+        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
 #ifndef CHARSET_EBCDIC

-               BIO_printf(out, "%*s%s", indent, "", value);
+        BIO_printf(out, "%*s%s", indent, "", value);

 #else
 #else

-               {
-                       int len;
-                       char *tmp;
-                       len = strlen(value)+1;
-                       tmp = OPENSSL_malloc(len);
-                       if (tmp)
-                       {
-                               ascii2ebcdic(tmp, value, len);
-                               BIO_printf(out, "%*s%s", indent, "", tmp);
-                               OPENSSL_free(tmp);
-                       }
-               }
+        {
+            int len;
+            char *tmp;
+            len = strlen(value) + 1;
+            tmp = OPENSSL_malloc(len);
+            if (tmp) {
+                ascii2ebcdic(tmp, value, len);
+                BIO_printf(out, "%*s%s", indent, "", tmp);
+                OPENSSL_free(tmp);
+            }
+        }

 #endif
 #endif

-       } else if(method->i2v) {
-               if(!(nval = method->i2v(method, ext_str, NULL))) {
-                       ok = 0;
-                       goto err;
-               }
-               X509V3_EXT_val_prn(out, nval, indent,
-                                method->ext_flags & X509V3_EXT_MULTILINE);
-       } else if(method->i2r) {
-               if(!method->i2r(method, ext_str, out, indent)) ok = 0;
-       } else ok = 0;
-
-       err:
-               sk_CONF_VALUE_pop_free(nval, X509V3_conf_free);
-               if(value) OPENSSL_free(value);
-               if(method->it) ASN1_item_free(ext_str, ASN1_ITEM_ptr(method->it));
-               else method->ext_free(ext_str);
-               return ok;
+    } else if (method->i2v) {
+        if (!(nval = method->i2v(method, ext_str, NULL))) {
+            ok = 0;
+            goto err;
+        }
+        X509V3_EXT_val_prn(out, nval, indent,
+                           method->ext_flags & X509V3_EXT_MULTILINE);
+    } else if (method->i2r) {
+        if (!method->i2r(method, ext_str, out, indent))
+            ok = 0;
+    } else
+        ok = 0;
+
+ err:
+    sk_CONF_VALUE_pop_free(nval, X509V3_conf_free);
+    if (value)
+        OPENSSL_free(value);
+    if (method->it)
+        ASN1_item_free(ext_str, ASN1_ITEM_ptr(method->it));
+    else
+        method->ext_free(ext_str);
+    return ok;

 }
 
 }
 

-int X509V3_extensions_print(BIO *bp, char *title, STACK_OF(X509_EXTENSION) *exts, unsigned long flag, int indent)
+int X509V3_extensions_print(BIO *bp, char *title,
+                            STACK_OF(X509_EXTENSION) *exts,
+                            unsigned long flag, int indent)

 {
 {

-       int i, j;
-
-       if(sk_X509_EXTENSION_num(exts) <= 0) return 1;
-
-       if(title) 
-               {
-               BIO_printf(bp,"%*s%s:\n",indent, "", title);
-               indent += 4;
-               }
-
-       for (i=0; i<sk_X509_EXTENSION_num(exts); i++)
-               {
-               ASN1_OBJECT *obj;
-               X509_EXTENSION *ex;
-               ex=sk_X509_EXTENSION_value(exts, i);
-               if (BIO_printf(bp,"%*s",indent, "") <= 0) return 0;
-               obj=X509_EXTENSION_get_object(ex);
-               i2a_ASN1_OBJECT(bp,obj);
-               j=X509_EXTENSION_get_critical(ex);
-               if (BIO_printf(bp,": %s\n",j?"critical":"","") <= 0)
-                       return 0;
-               if(!X509V3_EXT_print(bp, ex, flag, 12))
-                       {
-                       BIO_printf(bp, "%*s", indent + 4, "");
-                       M_ASN1_OCTET_STRING_print(bp,ex->value);
-                       }
-               if (BIO_write(bp,"\n",1) <= 0) return 0;
-               }
-       return 1;
+    int i, j;
+
+    if (sk_X509_EXTENSION_num(exts) <= 0)
+        return 1;
+
+    if (title) {
+        BIO_printf(bp, "%*s%s:\n", indent, "", title);
+        indent += 4;
+    }
+
+    for (i = 0; i < sk_X509_EXTENSION_num(exts); i++) {
+        ASN1_OBJECT *obj;
+        X509_EXTENSION *ex;
+        ex = sk_X509_EXTENSION_value(exts, i);
+        if (indent && BIO_printf(bp, "%*s", indent, "") <= 0)
+            return 0;
+        obj = X509_EXTENSION_get_object(ex);
+        i2a_ASN1_OBJECT(bp, obj);
+        j = X509_EXTENSION_get_critical(ex);
+        if (BIO_printf(bp, ": %s\n", j ? "critical" : "") <= 0)
+            return 0;
+        if (!X509V3_EXT_print(bp, ex, flag, indent + 4)) {
+            BIO_printf(bp, "%*s", indent + 4, "");
+            M_ASN1_OCTET_STRING_print(bp, ex->value);
+        }
+        if (BIO_write(bp, "\n", 1) <= 0)
+            return 0;
+    }
+    return 1;

 }
 
 }
 

-static int unknown_ext_print(BIO *out, X509_EXTENSION *ext, unsigned long flag, int indent, int supported)
+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;
-       }
+    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 OPENSSL_NO_FP_API
+#ifndef OPENSSL_NO_STDIO

 int X509V3_EXT_print_fp(FILE *fp, X509_EXTENSION *ext, int flag, int indent)
 {
 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, indent);
-       BIO_free(bio_tmp);
-       return ret;
+    BIO *bio_tmp;
+    int ret;
+    if (!(bio_tmp = BIO_new_fp(fp, BIO_NOCLOSE)))
+        return 0;
+    ret = X509V3_EXT_print(bio_tmp, ext, flag, indent);
+    BIO_free(bio_tmp);
+    return ret;

 }
 #endif
 }
 #endif