diff options
Diffstat (limited to 'src/lib/libcrypto/x509v3/v3_bitst.c')
-rw-r--r-- | src/lib/libcrypto/x509v3/v3_bitst.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/lib/libcrypto/x509v3/v3_bitst.c b/src/lib/libcrypto/x509v3/v3_bitst.c index 9828ba15b3..0e1167d05c 100644 --- a/src/lib/libcrypto/x509v3/v3_bitst.c +++ b/src/lib/libcrypto/x509v3/v3_bitst.c | |||
@@ -61,7 +61,6 @@ | |||
61 | #include <openssl/conf.h> | 61 | #include <openssl/conf.h> |
62 | #include <openssl/x509v3.h> | 62 | #include <openssl/x509v3.h> |
63 | 63 | ||
64 | static ASN1_BIT_STRING *asn1_bit_string_new(void); | ||
65 | static ASN1_BIT_STRING *v2i_ASN1_BIT_STRING(X509V3_EXT_METHOD *method, | 64 | static ASN1_BIT_STRING *v2i_ASN1_BIT_STRING(X509V3_EXT_METHOD *method, |
66 | X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval); | 65 | X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval); |
67 | static STACK_OF(CONF_VALUE) *i2v_ASN1_BIT_STRING(X509V3_EXT_METHOD *method, | 66 | static STACK_OF(CONF_VALUE) *i2v_ASN1_BIT_STRING(X509V3_EXT_METHOD *method, |
@@ -97,11 +96,6 @@ static BIT_STRING_BITNAME key_usage_type_table[] = { | |||
97 | X509V3_EXT_METHOD v3_nscert = EXT_BITSTRING(NID_netscape_cert_type, ns_cert_type_table); | 96 | X509V3_EXT_METHOD v3_nscert = EXT_BITSTRING(NID_netscape_cert_type, ns_cert_type_table); |
98 | X509V3_EXT_METHOD v3_key_usage = EXT_BITSTRING(NID_key_usage, key_usage_type_table); | 97 | X509V3_EXT_METHOD v3_key_usage = EXT_BITSTRING(NID_key_usage, key_usage_type_table); |
99 | 98 | ||
100 | static ASN1_BIT_STRING *asn1_bit_string_new(void) | ||
101 | { | ||
102 | return ASN1_BIT_STRING_new(); | ||
103 | } | ||
104 | |||
105 | static STACK_OF(CONF_VALUE) *i2v_ASN1_BIT_STRING(X509V3_EXT_METHOD *method, | 99 | static STACK_OF(CONF_VALUE) *i2v_ASN1_BIT_STRING(X509V3_EXT_METHOD *method, |
106 | ASN1_BIT_STRING *bits, STACK_OF(CONF_VALUE) *ret) | 100 | ASN1_BIT_STRING *bits, STACK_OF(CONF_VALUE) *ret) |
107 | { | 101 | { |
@@ -120,7 +114,7 @@ static ASN1_BIT_STRING *v2i_ASN1_BIT_STRING(X509V3_EXT_METHOD *method, | |||
120 | ASN1_BIT_STRING *bs; | 114 | ASN1_BIT_STRING *bs; |
121 | int i; | 115 | int i; |
122 | BIT_STRING_BITNAME *bnam; | 116 | BIT_STRING_BITNAME *bnam; |
123 | if(!(bs = ASN1_BIT_STRING_new())) { | 117 | if(!(bs = M_ASN1_BIT_STRING_new())) { |
124 | X509V3err(X509V3_F_V2I_ASN1_BIT_STRING,ERR_R_MALLOC_FAILURE); | 118 | X509V3err(X509V3_F_V2I_ASN1_BIT_STRING,ERR_R_MALLOC_FAILURE); |
125 | return NULL; | 119 | return NULL; |
126 | } | 120 | } |
@@ -137,7 +131,7 @@ static ASN1_BIT_STRING *v2i_ASN1_BIT_STRING(X509V3_EXT_METHOD *method, | |||
137 | X509V3err(X509V3_F_V2I_ASN1_BIT_STRING, | 131 | X509V3err(X509V3_F_V2I_ASN1_BIT_STRING, |
138 | X509V3_R_UNKNOWN_BIT_STRING_ARGUMENT); | 132 | X509V3_R_UNKNOWN_BIT_STRING_ARGUMENT); |
139 | X509V3_conf_err(val); | 133 | X509V3_conf_err(val); |
140 | ASN1_BIT_STRING_free(bs); | 134 | M_ASN1_BIT_STRING_free(bs); |
141 | return NULL; | 135 | return NULL; |
142 | } | 136 | } |
143 | } | 137 | } |