Remove NOPROTO definitions and error code comments.

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

diff --git a/crypto/x509v3/v3_conf.c b/crypto/x509v3/v3_conf.c
index 59a24ef87150737a27d5eab136fd91f242eb627f..d63db97340557a980b57ac16823d873d5075b54a 100644 (file)
--- a/crypto/x509v3/v3_conf.c
+++ b/crypto/x509v3/v3_conf.c
@@ -62,22 +62,16 @@
 #include <stdio.h>
 #include <ctype.h>
 #include "cryptlib.h"
-#include "conf.h"
-#include "x509.h"
-#include "x509v3.h"
+#include <openssl/conf.h>
+#include <openssl/x509.h>
+#include <openssl/x509v3.h>
 
-#ifndef NOPROTO
 static int v3_check_critical(char **value);
 static int v3_check_generic(char **value);
 static X509_EXTENSION *do_ext_conf(LHASH *conf, X509V3_CTX *ctx, int ext_nid, int crit, char *value);
 static X509_EXTENSION *v3_generic_extension(const char *ext, char *value, int crit, int type);
-#else
-static int v3_check_critical();
-static int v3_check_generic();
-static X509_EXTENSION *do_ext_conf();
-static X509V3_EXTENSION *v3_generic_extension();
-#endif
-
+static char *conf_lhash_get_string(void *db, char *section, char *value);
+static STACK *conf_lhash_get_section(void *db, char *section);
 /* LHASH *conf:  Config file    */
 /* char *name:  Name    */
 /* char *value:  Value    */
@@ -121,7 +115,7 @@ static X509_EXTENSION *do_ext_conf(LHASH *conf, X509V3_CTX *ctx, int ext_nid,
        X509V3_EXT_METHOD *method;
        STACK *nval;
        char *ext_struc;
-       char *ext_der, *p;
+       unsigned char *ext_der, *p;
        int ext_len;
        ASN1_OCTET_STRING *ext_oct;
        if(ext_nid == NID_undef) {
@@ -299,14 +293,14 @@ void X509V3_string_free(X509V3_CTX *ctx, char *str)
 {
        if(!str) return;
        if(ctx->db_meth->free_string)
-                       return ctx->db_meth->free_string(ctx->db, str);
+                       ctx->db_meth->free_string(ctx->db, str);
 }
 
 void X509V3_section_free(X509V3_CTX *ctx, STACK *section)
 {
        if(!section) return;
        if(ctx->db_meth->free_section)
-                       return ctx->db_meth->free_section(ctx->db, section);
+                       ctx->db_meth->free_section(ctx->db, section);
 }
 
 static char *conf_lhash_get_string(void *db, char *section, char *value)