From 16d5a92ca530e5082417911e99a4040c39514b17 Mon Sep 17 00:00:00 2001 From: tb Date: Fri, 21 Apr 2023 05:56:51 +0000 Subject: [PATCH] Stop using ENUMERATED_NAMES This is a public alias for the also public BIT_STRING_BITNAME. The ENUMERATED_NAMES type is used exactly twice, namely on two lines in this file. This is silly. --- lib/libcrypto/x509/x509_enum.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/libcrypto/x509/x509_enum.c b/lib/libcrypto/x509/x509_enum.c index 432239e0fe7..07f3c89e758 100644 --- a/lib/libcrypto/x509/x509_enum.c +++ b/lib/libcrypto/x509/x509_enum.c @@ -1,4 +1,4 @@ -/* $OpenBSD: x509_enum.c,v 1.3 2023/02/16 08:38:17 tb Exp $ */ +/* $OpenBSD: x509_enum.c,v 1.4 2023/04/21 05:56:51 tb Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 1999. */ @@ -58,9 +58,11 @@ #include #include + +#include #include -static ENUMERATED_NAMES crl_reasons[] = { +static BIT_STRING_BITNAME crl_reasons[] = { {CRL_REASON_UNSPECIFIED, "Unspecified", "unspecified"}, {CRL_REASON_KEY_COMPROMISE, "Key Compromise", "keyCompromise"}, {CRL_REASON_CA_COMPROMISE, "CA Compromise", "CACompromise"}, @@ -95,7 +97,7 @@ const X509V3_EXT_METHOD v3_crl_reason = { char * i2s_ASN1_ENUMERATED_TABLE(X509V3_EXT_METHOD *method, const ASN1_ENUMERATED *e) { - ENUMERATED_NAMES *enam; + BIT_STRING_BITNAME *enam; long strval; strval = ASN1_ENUMERATED_get(e); -- 2.20.1