Add an extra 'raw' function r2i to the extension code. Nothing uses this yet and

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

diff --git a/crypto/x509v3/v3_alt.c b/crypto/x509v3/v3_alt.c
index 76f1b633c53a0485d568e3502d3b2af86b14bd2b..3adf50966867f13ecd98360c6ce7f8d145b66af8 100644 (file)
--- a/crypto/x509v3/v3_alt.c
+++ b/crypto/x509v3/v3_alt.c
@@ -57,22 +57,18 @@
  */
 
 #include <stdio.h>
-#include <stdlib.h>
-#include <pem.h>
-#include <asn1_mac.h>
-#include <err.h>
-#include <objects.h>
-#include <conf.h>
+#include "cryptlib.h"
+#include "conf.h"
 #include "x509v3.h"
 
 #ifndef NOPROTO
-STACK *v2i_subject_alt(X509V3_EXT_METHOD *method, X509V3_CTX *ctx, STACK *nval);
-STACK *v2i_issuer_alt(X509V3_EXT_METHOD *method, X509V3_CTX *ctx, STACK *nval);
+static STACK *v2i_subject_alt(X509V3_EXT_METHOD *method, X509V3_CTX *ctx, STACK *nval);
+static STACK *v2i_issuer_alt(X509V3_EXT_METHOD *method, X509V3_CTX *ctx, STACK *nval);
 static int copy_email(X509V3_CTX *ctx, STACK *gens);
 static int copy_issuer(X509V3_CTX *ctx, STACK *gens);
 #else
-STACK *v2i_issuer_alt();
-STACK *v2i_subject_alt();
+static STACK *v2i_issuer_alt();
+static STACK *v2i_subject_alt();
 static int copy_email();
 static int copy_issuer();
 #endif
@@ -86,7 +82,7 @@ i2d_GENERAL_NAMES,
 NULL, NULL,
 (X509V3_EXT_I2V)i2v_GENERAL_NAMES,
 (X509V3_EXT_V2I)v2i_subject_alt,
-NULL, NULL},
+NULL, NULL, NULL},
 { NID_issuer_alt_name, 0,
 (X509V3_EXT_NEW)GENERAL_NAMES_new,
 GENERAL_NAMES_free,
@@ -95,7 +91,7 @@ i2d_GENERAL_NAMES,
 NULL, NULL,
 (X509V3_EXT_I2V)i2v_GENERAL_NAMES,
 (X509V3_EXT_V2I)v2i_issuer_alt,
-NULL, NULL},
+NULL, NULL, NULL},
 EXT_END
 };
 
@@ -170,7 +166,7 @@ STACK *ret;
        return ret;
 }
 
-STACK *v2i_issuer_alt(method, ctx, nval)
+static STACK *v2i_issuer_alt(method, ctx, nval)
 X509V3_EXT_METHOD *method;
 X509V3_CTX *ctx;
 STACK *nval;
@@ -239,7 +235,7 @@ STACK *gens;
        
 }
 
-STACK *v2i_subject_alt(method, ctx, nval)
+static STACK *v2i_subject_alt(method, ctx, nval)
 X509V3_EXT_METHOD *method;
 X509V3_CTX *ctx;
 STACK *nval;