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

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

diff --git a/crypto/x509v3/v3_pku.c b/crypto/x509v3/v3_pku.c
index f6d314f5e2c9202d311cfda0949bacaa0c3d9f63..a602191c55ecfadb3d27c2f8678de5c31c664066 100644 (file)
--- a/crypto/x509v3/v3_pku.c
+++ b/crypto/x509v3/v3_pku.c
@@ -1,4 +1,4 @@
-/* v3_akey.c */
+/* v3_pku.c */
 /* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
  * project 1999.
  */
@@ -57,18 +57,16 @@
  */
 
 #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 "asn1.h"
+#include "asn1_mac.h"
 #include "x509v3.h"
 
 #ifndef NOPROTO
 static int i2r_PKEY_USAGE_PERIOD(X509V3_EXT_METHOD *method, PKEY_USAGE_PERIOD *usage, BIO *out);
+/*
 static PKEY_USAGE_PERIOD *v2i_PKEY_USAGE_PERIOD(X509V3_EXT_METHOD *method, X509V3_CTX *ctx, STACK *values);
-
+*/
 #else
 
 static int i2r_PKEY_USAGE_PERIOD();
@@ -83,7 +81,7 @@ PKEY_USAGE_PERIOD_free,
 (X509V3_EXT_D2I)d2i_PKEY_USAGE_PERIOD,
 i2d_PKEY_USAGE_PERIOD,
 NULL, NULL, NULL, NULL,
-(X509V3_EXT_I2R)i2r_PKEY_USAGE_PERIOD,
+(X509V3_EXT_I2R)i2r_PKEY_USAGE_PERIOD, NULL,
 NULL
 };
 
@@ -162,6 +160,7 @@ BIO *out;
        return 1;
 }
 
+/*
 static PKEY_USAGE_PERIOD *v2i_PKEY_USAGE_PERIOD(method, ctx, values)
 X509V3_EXT_METHOD *method;
 X509V3_CTX *ctx;
@@ -169,4 +168,4 @@ STACK *values;
 {
 return NULL;
 }
-
+*/