Implement STACK_OF(ANS1_OBJECT) for extended key usage extension, change the

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

diff --git a/crypto/x509v3/v3_skey.c b/crypto/x509v3/v3_skey.c
index e725d6630c039334a3ed926cea52beb967324e5d..fb3e36014d673c06c77c5b6b3a8ec0fb692034d6 100644 (file)
--- a/crypto/x509v3/v3_skey.c
+++ b/crypto/x509v3/v3_skey.c
@@ -59,21 +59,16 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "x509v3.h"
+#include <openssl/x509v3.h>
 
-#ifndef NOPROTO
 static ASN1_OCTET_STRING *octet_string_new(void);
 static ASN1_OCTET_STRING *s2i_skey_id(X509V3_EXT_METHOD *method, X509V3_CTX *ctx, char *str);
-#else
-static ASN1_OCTET_STRING *s2i_skey_id();
-static ASN1_OCTET_STRING *octet_string_new();
-#endif
-
 X509V3_EXT_METHOD v3_skey_id = { 
 NID_subject_key_identifier, 0,
-(X509V3_EXT_NEW)octet_string_new, ASN1_STRING_free,
+(X509V3_EXT_NEW)octet_string_new,
+(X509V3_EXT_FREE)ASN1_STRING_free,
 (X509V3_EXT_D2I)d2i_ASN1_OCTET_STRING,
-i2d_ASN1_OCTET_STRING,
+(X509V3_EXT_I2D)i2d_ASN1_OCTET_STRING,
 (X509V3_EXT_I2S)i2s_ASN1_OCTET_STRING,
 (X509V3_EXT_S2I)s2i_skey_id,
 NULL, NULL, NULL, NULL, NULL};
@@ -84,17 +79,14 @@ static ASN1_OCTET_STRING *octet_string_new(void)
        return ASN1_OCTET_STRING_new();
 }
 
-char *i2s_ASN1_OCTET_STRING(method, oct)
-X509V3_EXT_METHOD *method;
-ASN1_OCTET_STRING *oct;
+char *i2s_ASN1_OCTET_STRING(X509V3_EXT_METHOD *method,
+            ASN1_OCTET_STRING *oct)
 {
        return hex_to_string(oct->data, oct->length);
 }
 
-ASN1_OCTET_STRING *s2i_ASN1_OCTET_STRING(method, ctx, str)
-X509V3_EXT_METHOD *method;
-X509V3_CTX *ctx;
-char *str;
+ASN1_OCTET_STRING *s2i_ASN1_OCTET_STRING(X509V3_EXT_METHOD *method,
+            X509V3_CTX *ctx, char *str)
 {
        ASN1_OCTET_STRING *oct;
        long length;
@@ -115,10 +107,8 @@ char *str;
 
 }
 
-ASN1_OCTET_STRING *s2i_skey_id(method, ctx, str)
-X509V3_EXT_METHOD *method;
-X509V3_CTX *ctx;
-char *str;
+static ASN1_OCTET_STRING *s2i_skey_id(X509V3_EXT_METHOD *method,
+            X509V3_CTX *ctx, char *str)
 {
        ASN1_OCTET_STRING *oct;
        ASN1_BIT_STRING *pk;