X-Git-Url: https://git.openssl.org/?p=openssl.git;a=blobdiff_plain;f=crypto%2Fx509v3%2Fv3_enum.c;h=a236cb22e158f7ae66f72cf67d4dad14a3b50703;hp=05af992f6d8e7936bee6aad7743b0dd931c75a45;hb=560b79cbff4bc4c6898a862b18b4a00961099095;hpb=397f703892d66df668d2a7192d89227dcd0ffad4 diff --git a/crypto/x509v3/v3_enum.c b/crypto/x509v3/v3_enum.c index 05af992f6d..a236cb22e1 100644 --- a/crypto/x509v3/v3_enum.c +++ b/crypto/x509v3/v3_enum.c @@ -60,8 +60,6 @@ #include "cryptlib.h" #include -static ASN1_ENUMERATED *asn1_enumerated_new(void); - static ENUMERATED_NAMES crl_reasons[] = { {0, "Unspecified", "unspecified"}, {1, "Key Compromise", "keyCompromise"}, @@ -74,20 +72,14 @@ static ENUMERATED_NAMES crl_reasons[] = { {-1, NULL, NULL} }; -X509V3_EXT_METHOD v3_crl_reason = { -NID_crl_reason, 0, -(X509V3_EXT_NEW)asn1_enumerated_new, ASN1_STRING_free, -(X509V3_EXT_D2I)d2i_ASN1_ENUMERATED, -i2d_ASN1_ENUMERATED, +const X509V3_EXT_METHOD v3_crl_reason = { +NID_crl_reason, 0, ASN1_ITEM_ref(ASN1_ENUMERATED), +0,0,0,0, (X509V3_EXT_I2S)i2s_ASN1_ENUMERATED_TABLE, -(X509V3_EXT_S2I)NULL, -NULL, NULL, NULL, NULL, (char *)crl_reasons}; - +0, +0,0,0,0, +crl_reasons}; -static ASN1_ENUMERATED *asn1_enumerated_new(void) -{ - return ASN1_ENUMERATED_new(); -} char *i2s_ASN1_ENUMERATED_TABLE(X509V3_EXT_METHOD *method, ASN1_ENUMERATED *e)