wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make {i2v,v2i}_ASN1_BIT_STRING global.

Browse source 
make update
This commit is contained in:
Dr. Stephen Henson 2004-03-28 12:40:11 +00:00
parent e07d3a021d
commit 5d6383c83f
4 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
TABLE
View file

@ -2027,7 +2027,7 @@ $arflags =
*** debug-steve *** debug-steve
$cc = gcc $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 = $unistd =
$thread_cflag = -D_REENTRANT $thread_cflag = -D_REENTRANT
$sys_id = $sys_id =

10
crypto/x509v3/v3_bitst.c
View file

@ -61,12 +61,6 @@
#include <openssl/conf.h> #include <openssl/conf.h>
#include <openssl/x509v3.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[] = { static BIT_STRING_BITNAME ns_cert_type_table[] = {
{0, "SSL Client", "client"}, {0, "SSL Client", "client"},
{1, "SSL Server", "server"}, {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_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_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) ASN1_BIT_STRING *bits, STACK_OF(CONF_VALUE) *ret)
{ {
BIT_STRING_BITNAME *bnam; 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) X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval)
{ {
CONF_VALUE *val; CONF_VALUE *val;

7
crypto/x509v3/x509v3.h
View file

@ -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); 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); int GENERAL_NAME_print(BIO *out, GENERAL_NAME *gen);

3
util/libeay.num
View file

@ -3179,3 +3179,6 @@ X509_policy_lib_init 3607 EXIST::FUNCTION:
asn1_const_Finish 3608 EXIST::FUNCTION: asn1_const_Finish 3608 EXIST::FUNCTION:
X509_policy_check 3609 EXIST::FUNCTION: X509_policy_check 3609 EXIST::FUNCTION:
AES_cfb1_encrypt 3610 EXIST::FUNCTION:AES 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: