diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2004-03-28 12:40:11 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2004-03-28 12:40:11 +0000 |
| commit | 5d6383c83f34a9c8612a6eedd484d41e4be4974c (patch) | |
| tree | ed7be24a6b014c23c4893890b926c26aef497a6e | |
| parent | e07d3a021d1e7ef168669cf8c4431f1078de022f (diff) | |
| download | openssl-new-5d6383c83f34a9c8612a6eedd484d41e4be4974c.tar.gz | |
Make {i2v,v2i}_ASN1_BIT_STRING global.
make update
| -rw-r--r-- | TABLE | 2 | ||||
| -rw-r--r-- | crypto/x509v3/v3_bitst.c | 10 | ||||
| -rw-r--r-- | crypto/x509v3/x509v3.h | 7 | ||||
| -rwxr-xr-x | util/libeay.num | 3 |
4 files changed, 13 insertions, 9 deletions
@@ -2027,7 +2027,7 @@ $arflags = *** 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 = diff --git a/crypto/x509v3/v3_bitst.c b/crypto/x509v3/v3_bitst.c index 16cf125562..42d5f8beff 100644 --- a/crypto/x509v3/v3_bitst.c +++ b/crypto/x509v3/v3_bitst.c @@ -61,12 +61,6 @@ #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"}, @@ -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); -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; @@ -108,7 +102,7 @@ static STACK_OF(CONF_VALUE) *i2v_ASN1_BIT_STRING(X509V3_EXT_METHOD *method, 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; diff --git a/crypto/x509v3/x509v3.h b/crypto/x509v3/x509v3.h index d3c06f581d..89cc3c49d1 100644 --- 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) + +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); diff --git a/util/libeay.num b/util/libeay.num index 3d3ab3dbd1..e86af1b7dd 100755 --- 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 +X509_STORE_CTX_set0_crls 3611 EXIST::FUNCTION: +v2i_ASN1_BIT_STRING 3612 EXIST::FUNCTION: +i2v_ASN1_BIT_STRING 3613 EXIST::FUNCTION: |