diff options
Diffstat (limited to 'src/lib/libcrypto/x509v3/ext_dat.h')
-rw-r--r-- | src/lib/libcrypto/x509v3/ext_dat.h | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/lib/libcrypto/x509v3/ext_dat.h b/src/lib/libcrypto/x509v3/ext_dat.h index 76daee6fcd..3eaec46f8a 100644 --- a/src/lib/libcrypto/x509v3/ext_dat.h +++ b/src/lib/libcrypto/x509v3/ext_dat.h | |||
@@ -61,19 +61,21 @@ extern X509V3_EXT_METHOD v3_bcons, v3_nscert, v3_key_usage, v3_ext_ku; | |||
61 | extern X509V3_EXT_METHOD v3_pkey_usage_period, v3_sxnet, v3_info, v3_sinfo; | 61 | extern X509V3_EXT_METHOD v3_pkey_usage_period, v3_sxnet, v3_info, v3_sinfo; |
62 | extern X509V3_EXT_METHOD v3_ns_ia5_list[], v3_alt[], v3_skey_id, v3_akey_id; | 62 | extern X509V3_EXT_METHOD v3_ns_ia5_list[], v3_alt[], v3_skey_id, v3_akey_id; |
63 | extern X509V3_EXT_METHOD v3_crl_num, v3_crl_reason, v3_crl_invdate; | 63 | extern X509V3_EXT_METHOD v3_crl_num, v3_crl_reason, v3_crl_invdate; |
64 | extern X509V3_EXT_METHOD v3_delta_crl, v3_cpols, v3_crld, v3_freshest_crl; | 64 | extern X509V3_EXT_METHOD v3_delta_crl, v3_cpols, v3_crld; |
65 | extern X509V3_EXT_METHOD v3_ocsp_nonce, v3_ocsp_accresp, v3_ocsp_acutoff; | 65 | extern X509V3_EXT_METHOD v3_ocsp_nonce, v3_ocsp_accresp, v3_ocsp_acutoff; |
66 | extern X509V3_EXT_METHOD v3_ocsp_crlid, v3_ocsp_nocheck, v3_ocsp_serviceloc; | 66 | extern X509V3_EXT_METHOD v3_ocsp_crlid, v3_ocsp_nocheck, v3_ocsp_serviceloc; |
67 | extern X509V3_EXT_METHOD v3_crl_hold, v3_pci; | 67 | extern X509V3_EXT_METHOD v3_crl_hold, v3_pci; |
68 | extern X509V3_EXT_METHOD v3_policy_mappings, v3_policy_constraints; | 68 | extern X509V3_EXT_METHOD v3_policy_mappings, v3_policy_constraints; |
69 | extern X509V3_EXT_METHOD v3_name_constraints, v3_inhibit_anyp, v3_idp; | 69 | extern X509V3_EXT_METHOD v3_name_constraints, v3_inhibit_anyp; |
70 | #ifndef OPENSSL_NO_RFC3779 | ||
70 | extern X509V3_EXT_METHOD v3_addr, v3_asid; | 71 | extern X509V3_EXT_METHOD v3_addr, v3_asid; |
72 | #endif | ||
71 | 73 | ||
72 | /* This table will be searched using OBJ_bsearch so it *must* kept in | 74 | /* This table will be searched using OBJ_bsearch so it *must* kept in |
73 | * order of the ext_nid values. | 75 | * order of the ext_nid values. |
74 | */ | 76 | */ |
75 | 77 | ||
76 | static const X509V3_EXT_METHOD *standard_exts[] = { | 78 | static X509V3_EXT_METHOD *standard_exts[] = { |
77 | &v3_nscert, | 79 | &v3_nscert, |
78 | &v3_ns_ia5_list[0], | 80 | &v3_ns_ia5_list[0], |
79 | &v3_ns_ia5_list[1], | 81 | &v3_ns_ia5_list[1], |
@@ -120,10 +122,7 @@ static const X509V3_EXT_METHOD *standard_exts[] = { | |||
120 | &v3_pci, | 122 | &v3_pci, |
121 | &v3_name_constraints, | 123 | &v3_name_constraints, |
122 | &v3_policy_mappings, | 124 | &v3_policy_mappings, |
123 | &v3_inhibit_anyp, | 125 | &v3_inhibit_anyp |
124 | &v3_idp, | ||
125 | &v3_alt[2], | ||
126 | &v3_freshest_crl, | ||
127 | }; | 126 | }; |
128 | 127 | ||
129 | /* Number of standard extensions */ | 128 | /* Number of standard extensions */ |