Revert "OPENSSL_NO_xxx cleanup: RFC3779"
[openssl.git] / crypto / x509v3 / v3conf.c
index 67ee14f..6d2cd6d 100644 (file)
@@ -1,6 +1,7 @@
 /* v3conf.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.
@@ -10,7 +11,7 @@
  * 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
@@ -56,9 +57,8 @@
  *
  */
 
-
 #include <stdio.h>
-#include "cryptlib.h"
+#include "internal/cryptlib.h"
 #include <openssl/asn1.h>
 #include <openssl/conf.h>
 #include <openssl/x509.h>
 
 int main(int argc, char **argv)
 {
-       LHASH *conf;
-       X509 *cert;
-       FILE *inf;
-       char *conf_file;
-       int i;
-       int count;
-       X509_EXTENSION *ext;
-       X509V3_add_standard_extensions();
-       ERR_load_crypto_strings();
-       if(!argv[1]) {
-               fprintf(stderr, "Usage: v3conf cert.pem [file.cnf]\n");
-               exit(1);
-       }
-       conf_file = argv[2];
-       if(!conf_file) conf_file = "test.cnf";
-       conf = CONF_load(NULL, "test.cnf", NULL);
-       if(!conf) {
-               fprintf(stderr, "Error opening Config file %s\n", conf_file);
-               ERR_print_errors_fp(stderr);
-               exit(1);
-       }
+    LHASH *conf;
+    X509 *cert;
+    FILE *inf;
+    char *conf_file;
+    int i;
+    int count;
+    X509_EXTENSION *ext;
+    X509V3_add_standard_extensions();
+    ERR_load_crypto_strings();
+    if (!argv[1]) {
+        fprintf(stderr, "Usage: v3conf cert.pem [file.cnf]\n");
+        exit(1);
+    }
+    conf_file = argv[2];
+    if (!conf_file)
+        conf_file = "test.cnf";
+    conf = CONF_load(NULL, "test.cnf", NULL);
+    if (!conf) {
+        fprintf(stderr, "Error opening Config file %s\n", conf_file);
+        ERR_print_errors_fp(stderr);
+        exit(1);
+    }
 
-       inf = fopen(argv[1], "r");
-       if(!inf) {
-               fprintf(stderr, "Can't open certificate file %s\n", argv[1]);
-               exit(1);
-       }
-       cert = PEM_read_X509(inf, NULL, NULL);
-       if(!cert) {
-               fprintf(stderr, "Error reading certificate file %s\n", argv[1]);
-               exit(1);
-       }
-       fclose(inf);
+    inf = fopen(argv[1], "r");
+    if (!inf) {
+        fprintf(stderr, "Can't open certificate file %s\n", argv[1]);
+        exit(1);
+    }
+    cert = PEM_read_X509(inf, NULL, NULL);
+    if (!cert) {
+        fprintf(stderr, "Error reading certificate file %s\n", argv[1]);
+        exit(1);
+    }
+    fclose(inf);
 
-       sk_pop_free(cert->cert_info->extensions, X509_EXTENSION_free);
-       cert->cert_info->extensions = NULL;
+    sk_pop_free(cert->cert_info->extensions, X509_EXTENSION_free);
+    cert->cert_info->extensions = NULL;
 
-       if(!X509V3_EXT_add_conf(conf, NULL, "test_section", cert)) {
-               fprintf(stderr, "Error adding extensions\n");
-               ERR_print_errors_fp(stderr);
-               exit(1);
-       }
+    if (!X509V3_EXT_add_conf(conf, NULL, "test_section", cert)) {
+        fprintf(stderr, "Error adding extensions\n");
+        ERR_print_errors_fp(stderr);
+        exit(1);
+    }
 
-       count = X509_get_ext_count(cert);
-       printf("%d extensions\n", count);
-       for(i = 0; i < count; i++) {
-               ext = X509_get_ext(cert, i);
-               printf("%s", OBJ_nid2ln(OBJ_obj2nid(ext->object)));
-               if(ext->critical) printf(",critical:\n");
-               else printf(":\n");
-               X509V3_EXT_print_fp(stdout, ext, 0);
-               printf("\n");
-               
-       }
-       return 0;
-}
+    count = X509_get_ext_count(cert);
+    printf("%d extensions\n", count);
+    for (i = 0; i < count; i++) {
+        ext = X509_get_ext(cert, i);
+        printf("%s", OBJ_nid2ln(OBJ_obj2nid(ext->object)));
+        if (ext->critical)
+            printf(",critical:\n");
+        else
+            printf(":\n");
+        X509V3_EXT_print_fp(stdout, ext, 0, 0);
+        printf("\n");
 
+    }
+    return 0;
+}