diff options
| author | Rob Stradling <rob@comodo.com> | 2015-12-04 14:35:43 +0000 |
|---|---|---|
| committer | Kurt Roeckx <kurt@roeckx.be> | 2015-12-10 19:27:40 +0100 |
| commit | ba67253db19d0319f672d47aa359032e5e66d1b8 (patch) | |
| tree | 69b3f0a9523ac9b506608b72e04c495b2c6ef98f /include | |
| parent | f8137a62d94c0a5809a4363b7b4aab3adcb8201c (diff) | |
Support the TLS Feature (aka Must Staple) X.509v3 extension (RFC7633).
Signed-off-by: Kurt Roeckx <kurt@roeckx.be>
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Dr. Stephen Henson <steve@openssl.org>
GH: #495, MR: #1435
Diffstat (limited to 'include')
| -rw-r--r-- | include/openssl/obj_mac.h | 5 | ||||
| -rw-r--r-- | include/openssl/x509v3.h | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/include/openssl/obj_mac.h b/include/openssl/obj_mac.h index 060126b56c..5f21fd5a32 100644 --- a/include/openssl/obj_mac.h +++ b/include/openssl/obj_mac.h @@ -1490,6 +1490,11 @@ #define NID_proxyCertInfo 663 #define OBJ_proxyCertInfo OBJ_id_pe,14L +#define SN_tlsfeature "tlsfeature" +#define LN_tlsfeature "TLS Feature" +#define NID_tlsfeature 1020 +#define OBJ_tlsfeature OBJ_id_pe,24L + #define SN_id_qt_cps "id-qt-cps" #define LN_id_qt_cps "Policy Qualifier CPS" #define NID_id_qt_cps 164 diff --git a/include/openssl/x509v3.h b/include/openssl/x509v3.h index 9a68b7316c..7932acb9c8 100644 --- a/include/openssl/x509v3.h +++ b/include/openssl/x509v3.h @@ -217,6 +217,8 @@ typedef STACK_OF(ACCESS_DESCRIPTION) AUTHORITY_INFO_ACCESS; typedef STACK_OF(ASN1_OBJECT) EXTENDED_KEY_USAGE; +typedef STACK_OF(ASN1_INTEGER) TLS_FEATURE; + DECLARE_STACK_OF(GENERAL_NAME) DECLARE_STACK_OF(ACCESS_DESCRIPTION) @@ -561,6 +563,8 @@ ASN1_OCTET_STRING *s2i_ASN1_OCTET_STRING(X509V3_EXT_METHOD *method, DECLARE_ASN1_FUNCTIONS(EXTENDED_KEY_USAGE) int i2a_ACCESS_DESCRIPTION(BIO *bp, ACCESS_DESCRIPTION *a); +DECLARE_ASN1_ALLOC_FUNCTIONS(TLS_FEATURE) + DECLARE_ASN1_FUNCTIONS(CERTIFICATEPOLICIES) DECLARE_ASN1_FUNCTIONS(POLICYINFO) DECLARE_ASN1_FUNCTIONS(POLICYQUALINFO) @@ -962,6 +966,7 @@ void ERR_load_X509V3_strings(void); # define X509V3_F_V2I_POLICY_CONSTRAINTS 146 # define X509V3_F_V2I_POLICY_MAPPINGS 145 # define X509V3_F_V2I_SUBJECT_ALT 154 +# define X509V3_F_V2I_TLS_FEATURE 165 # define X509V3_F_V3_ADDR_VALIDATE_PATH_INTERNAL 160 # define X509V3_F_V3_GENERIC_EXTENSION 116 # define X509V3_F_X509V3_ADD1_I2D 140 |