OPENSSL_NO_xxx cleanup: RFC3779

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

diff --git a/crypto/x509v3/v3prin.c b/crypto/x509v3/v3prin.c
index 6475fb97b1e95106b00a9cdf47212823fc272904..cbc357079de746755761a5214bd928da948c69d5 100644 (file)
--- a/crypto/x509v3/v3prin.c
+++ b/crypto/x509v3/v3prin.c
@@ -1,6 +1,7 @@
 /* v3prin.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
@@ -55,43 +56,44 @@
  * Hudson (tjh@cryptsoft.com).
  *
  */
-#include <pem.h>
-#include <objects.h>
-#include <conf.h>
-#include <err.h>
-#include "x509v3.h"
 
-int main(argc, argv)
-int argc;
-char **argv;
+#include <stdio.h>
+#include <openssl/asn1.h>
+#include <openssl/conf.h>
+#include <openssl/x509.h>
+#include <openssl/x509v3.h>
+
+int main(int argc, char **argv)
 {
-       X509 *cert;
-       FILE *inf;
-       int i, count;
-       X509_EXTENSION *ext;
-       X509V3_add_standard_extensions();
-       if(!argv[1]) {
-               fprintf(stderr, "Usage v3prin cert.pem\n");
-               exit(1);
-       }
-       if(!(inf = fopen(argv[1], "r"))) {
-               fprintf(stderr, "Can't open %s\n", argv[1]);
-               exit(1);
-       }
-       if(!(cert = PEM_read_X509(inf, NULL, NULL))) {
-               fprintf(stderr, "Can't read certificate %s\n", argv[1]);
-               ERR_print_errors_fp(stderr);
-               exit(1);
-       }
-       fclose(inf);
-       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\n", OBJ_nid2ln(OBJ_obj2nid(ext->object)));
-               X509V3_EXT_print_fp(stdout, ext, 0);
-               printf("\n");
-               
-       }
-       return 0;
+    X509 *cert;
+    FILE *inf;
+    int i, count;
+    X509_EXTENSION *ext;
+    X509V3_add_standard_extensions();
+    ERR_load_crypto_strings();
+    if (!argv[1]) {
+        fprintf(stderr, "Usage v3prin cert.pem\n");
+        exit(1);
+    }
+    if (!(inf = fopen(argv[1], "r"))) {
+        fprintf(stderr, "Can't open %s\n", argv[1]);
+        exit(1);
+    }
+    if (!(cert = PEM_read_X509(inf, NULL, NULL))) {
+        fprintf(stderr, "Can't read certificate %s\n", argv[1]);
+        ERR_print_errors_fp(stderr);
+        exit(1);
+    }
+    fclose(inf);
+    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\n", OBJ_nid2ln(OBJ_obj2nid(ext->object)));
+        if (!X509V3_EXT_print_fp(stdout, ext, 0, 0))
+            ERR_print_errors_fp(stderr);
+        printf("\n");
+
+    }
+    return 0;
 }