diff options
Diffstat (limited to 'src/lib/libcrypto/x509v3/v3_enum.c')
-rw-r--r-- | src/lib/libcrypto/x509v3/v3_enum.c | 52 |
1 files changed, 27 insertions, 25 deletions
diff --git a/src/lib/libcrypto/x509v3/v3_enum.c b/src/lib/libcrypto/x509v3/v3_enum.c index c0575e368d..b546014b2b 100644 --- a/src/lib/libcrypto/x509v3/v3_enum.c +++ b/src/lib/libcrypto/x509v3/v3_enum.c | |||
@@ -10,7 +10,7 @@ | |||
10 | * are met: | 10 | * are met: |
11 | * | 11 | * |
12 | * 1. Redistributions of source code must retain the above copyright | 12 | * 1. Redistributions of source code must retain the above copyright |
13 | * notice, this list of conditions and the following disclaimer. | 13 | * notice, this list of conditions and the following disclaimer. |
14 | * | 14 | * |
15 | * 2. Redistributions in binary form must reproduce the above copyright | 15 | * 2. Redistributions in binary form must reproduce the above copyright |
16 | * notice, this list of conditions and the following disclaimer in | 16 | * notice, this list of conditions and the following disclaimer in |
@@ -61,37 +61,39 @@ | |||
61 | #include <openssl/x509v3.h> | 61 | #include <openssl/x509v3.h> |
62 | 62 | ||
63 | static ENUMERATED_NAMES crl_reasons[] = { | 63 | static ENUMERATED_NAMES crl_reasons[] = { |
64 | {CRL_REASON_UNSPECIFIED, "Unspecified", "unspecified"}, | 64 | {CRL_REASON_UNSPECIFIED, "Unspecified", "unspecified"}, |
65 | {CRL_REASON_KEY_COMPROMISE, "Key Compromise", "keyCompromise"}, | 65 | {CRL_REASON_KEY_COMPROMISE, "Key Compromise", "keyCompromise"}, |
66 | {CRL_REASON_CA_COMPROMISE, "CA Compromise", "CACompromise"}, | 66 | {CRL_REASON_CA_COMPROMISE, "CA Compromise", "CACompromise"}, |
67 | {CRL_REASON_AFFILIATION_CHANGED, "Affiliation Changed", "affiliationChanged"}, | 67 | {CRL_REASON_AFFILIATION_CHANGED, "Affiliation Changed", "affiliationChanged"}, |
68 | {CRL_REASON_SUPERSEDED, "Superseded", "superseded"}, | 68 | {CRL_REASON_SUPERSEDED, "Superseded", "superseded"}, |
69 | {CRL_REASON_CESSATION_OF_OPERATION, | 69 | {CRL_REASON_CESSATION_OF_OPERATION, |
70 | "Cessation Of Operation", "cessationOfOperation"}, | 70 | "Cessation Of Operation", "cessationOfOperation"}, |
71 | {CRL_REASON_CERTIFICATE_HOLD, "Certificate Hold", "certificateHold"}, | 71 | {CRL_REASON_CERTIFICATE_HOLD, "Certificate Hold", "certificateHold"}, |
72 | {CRL_REASON_REMOVE_FROM_CRL, "Remove From CRL", "removeFromCRL"}, | 72 | {CRL_REASON_REMOVE_FROM_CRL, "Remove From CRL", "removeFromCRL"}, |
73 | {CRL_REASON_PRIVILEGE_WITHDRAWN, "Privilege Withdrawn", "privilegeWithdrawn"}, | 73 | {CRL_REASON_PRIVILEGE_WITHDRAWN, "Privilege Withdrawn", "privilegeWithdrawn"}, |
74 | {CRL_REASON_AA_COMPROMISE, "AA Compromise", "AACompromise"}, | 74 | {CRL_REASON_AA_COMPROMISE, "AA Compromise", "AACompromise"}, |
75 | {-1, NULL, NULL} | 75 | {-1, NULL, NULL} |
76 | }; | 76 | }; |
77 | 77 | ||
78 | const X509V3_EXT_METHOD v3_crl_reason = { | 78 | const X509V3_EXT_METHOD v3_crl_reason = { |
79 | NID_crl_reason, 0, ASN1_ITEM_ref(ASN1_ENUMERATED), | 79 | NID_crl_reason, 0, ASN1_ITEM_ref(ASN1_ENUMERATED), |
80 | 0,0,0,0, | 80 | 0, 0, 0, 0, |
81 | (X509V3_EXT_I2S)i2s_ASN1_ENUMERATED_TABLE, | 81 | (X509V3_EXT_I2S)i2s_ASN1_ENUMERATED_TABLE, |
82 | 0, | 82 | 0, |
83 | 0,0,0,0, | 83 | 0, 0, 0, 0, |
84 | crl_reasons}; | 84 | crl_reasons |
85 | 85 | }; | |
86 | 86 | ||
87 | char *i2s_ASN1_ENUMERATED_TABLE(X509V3_EXT_METHOD *method, | 87 | char * |
88 | ASN1_ENUMERATED *e) | 88 | i2s_ASN1_ENUMERATED_TABLE(X509V3_EXT_METHOD *method, ASN1_ENUMERATED *e) |
89 | { | 89 | { |
90 | ENUMERATED_NAMES *enam; | 90 | ENUMERATED_NAMES *enam; |
91 | long strval; | 91 | long strval; |
92 | |||
92 | strval = ASN1_ENUMERATED_get(e); | 93 | strval = ASN1_ENUMERATED_get(e); |
93 | for(enam = method->usr_data; enam->lname; enam++) { | 94 | for (enam = method->usr_data; enam->lname; enam++) { |
94 | if(strval == enam->bitnum) return BUF_strdup(enam->lname); | 95 | if (strval == enam->bitnum) |
96 | return BUF_strdup(enam->lname); | ||
95 | } | 97 | } |
96 | return i2s_ASN1_ENUMERATED(method, e); | 98 | return i2s_ASN1_ENUMERATED(method, e); |
97 | } | 99 | } |