Make {i2v,v2i}_ASN1_BIT_STRING global.

make update

diff --git a/TABLE b/TABLE
index 429e627b9f6ff65800b86432e77bb90d11f6c04d..1500669deccdd823d0de7cf5aef970dfb9033752 100644 (file)
--- a/TABLE
+++ b/TABLE
@@ -2027,7 +2027,7 @@ $arflags      =
 
 *** debug-steve
 $cc           = gcc
 
 *** debug-steve
 $cc           = gcc

-$cflags       = -DL_ENDIAN -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DDEBUG_SAFESTACK -DCRYPTO_MDEBUG_ALL -DPEDANTIC -g -mcpu=i486 -pedantic -Wall -Werror -Wshadow -pipe
+$cflags       = -DL_ENDIAN -DREF_CHECK -DCONF_DEBUG -DDEBUG_SAFESTACK -DCRYPTO_MDEBUG_ALL -DPEDANTIC -g -mcpu=i486 -pedantic -Wall -Werror -Wshadow -pipe

 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 
 $unistd       = 
 $thread_cflag = -D_REENTRANT
 $sys_id       = 

diff --git a/crypto/x509v3/v3_bitst.c b/crypto/x509v3/v3_bitst.c
index 16cf12556218d815a090def51767586a468f3d79..42d5f8beffdcbe1f5f4570d28f3f65a196046b87 100644 (file)
--- a/crypto/x509v3/v3_bitst.c
+++ b/crypto/x509v3/v3_bitst.c
@@ -61,12 +61,6 @@
 #include <openssl/conf.h>
 #include <openssl/x509v3.h>
 
 #include <openssl/conf.h>
 #include <openssl/x509v3.h>
 

-static ASN1_BIT_STRING *v2i_ASN1_BIT_STRING(X509V3_EXT_METHOD *method,
-                               X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval);
-static STACK_OF(CONF_VALUE) *i2v_ASN1_BIT_STRING(X509V3_EXT_METHOD *method,
-                               ASN1_BIT_STRING *bits,
-                               STACK_OF(CONF_VALUE) *extlist);
-

 static BIT_STRING_BITNAME ns_cert_type_table[] = {
 {0, "SSL Client", "client"},
 {1, "SSL Server", "server"},
 static BIT_STRING_BITNAME ns_cert_type_table[] = {
 {0, "SSL Client", "client"},
 {1, "SSL Server", "server"},


@@ -97,7 +91,7 @@ static BIT_STRING_BITNAME key_usage_type_table[] = {
 X509V3_EXT_METHOD v3_nscert = EXT_BITSTRING(NID_netscape_cert_type, ns_cert_type_table);
 X509V3_EXT_METHOD v3_key_usage = EXT_BITSTRING(NID_key_usage, key_usage_type_table);
 
 X509V3_EXT_METHOD v3_nscert = EXT_BITSTRING(NID_netscape_cert_type, ns_cert_type_table);
 X509V3_EXT_METHOD v3_key_usage = EXT_BITSTRING(NID_key_usage, key_usage_type_table);
 

-static STACK_OF(CONF_VALUE) *i2v_ASN1_BIT_STRING(X509V3_EXT_METHOD *method,
+STACK_OF(CONF_VALUE) *i2v_ASN1_BIT_STRING(X509V3_EXT_METHOD *method,

             ASN1_BIT_STRING *bits, STACK_OF(CONF_VALUE) *ret)
 {
        BIT_STRING_BITNAME *bnam;
             ASN1_BIT_STRING *bits, STACK_OF(CONF_VALUE) *ret)
 {
        BIT_STRING_BITNAME *bnam;


@@ -108,7 +102,7 @@ static STACK_OF(CONF_VALUE) *i2v_ASN1_BIT_STRING(X509V3_EXT_METHOD *method,
        return ret;
 }
        
        return ret;
 }
        

-static ASN1_BIT_STRING *v2i_ASN1_BIT_STRING(X509V3_EXT_METHOD *method,
+ASN1_BIT_STRING *v2i_ASN1_BIT_STRING(X509V3_EXT_METHOD *method,

             X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval)
 {
        CONF_VALUE *val;
             X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval)
 {
        CONF_VALUE *val;

diff --git a/crypto/x509v3/x509v3.h b/crypto/x509v3/x509v3.h
index d3c06f581dc4be115b2c42b8b788114372513dca..89cc3c49d1fcc618dc0fb258ef65eb92fae4aecb 100644 (file)
--- a/crypto/x509v3/x509v3.h
+++ b/crypto/x509v3/x509v3.h
@@ -452,6 +452,13 @@ DECLARE_ASN1_FUNCTIONS(PKEY_USAGE_PERIOD)
 
 DECLARE_ASN1_FUNCTIONS(GENERAL_NAME)
 
 
 DECLARE_ASN1_FUNCTIONS(GENERAL_NAME)
 

+
+ASN1_BIT_STRING *v2i_ASN1_BIT_STRING(X509V3_EXT_METHOD *method,
+                               X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval);
+STACK_OF(CONF_VALUE) *i2v_ASN1_BIT_STRING(X509V3_EXT_METHOD *method,
+                               ASN1_BIT_STRING *bits,
+                               STACK_OF(CONF_VALUE) *extlist);
+

 STACK_OF(CONF_VALUE) *i2v_GENERAL_NAME(X509V3_EXT_METHOD *method, GENERAL_NAME *gen, STACK_OF(CONF_VALUE) *ret);
 int GENERAL_NAME_print(BIO *out, GENERAL_NAME *gen);
 
 STACK_OF(CONF_VALUE) *i2v_GENERAL_NAME(X509V3_EXT_METHOD *method, GENERAL_NAME *gen, STACK_OF(CONF_VALUE) *ret);
 int GENERAL_NAME_print(BIO *out, GENERAL_NAME *gen);
 

diff --git a/util/libeay.num b/util/libeay.num
index 3d3ab3dbd139a4d55118fce3f5971b966972012e..e86af1b7dd6f791663cb5b7016051d0744eaf9ac 100755 (executable)
--- a/util/libeay.num
+++ b/util/libeay.num
@@ -3179,3 +3179,6 @@ X509_policy_lib_init                    3607      EXIST::FUNCTION:
 asn1_const_Finish                       3608   EXIST::FUNCTION:
 X509_policy_check                       3609   EXIST::FUNCTION:
 AES_cfb1_encrypt                        3610   EXIST::FUNCTION:AES
 asn1_const_Finish                       3608   EXIST::FUNCTION:
 X509_policy_check                       3609   EXIST::FUNCTION:
 AES_cfb1_encrypt                        3610   EXIST::FUNCTION:AES

+X509_STORE_CTX_set0_crls                3611   EXIST::FUNCTION:
+v2i_ASN1_BIT_STRING                     3612   EXIST::FUNCTION:
+i2v_ASN1_BIT_STRING                     3613   EXIST::FUNCTION: