diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2016-01-19 13:57:19 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2016-01-19 14:00:32 +0000 |
| commit | 1eff3485b63f84956b5f212aa4d853783bf6c8b5 (patch) | |
| tree | 0514fcea64dc2d2edc7616614b257e88584a6c24 /crypto/objects | |
| parent | 8957728772824c1efd1c5e479d8b60fe6f88e6f5 (diff) | |
Add TLS PRF method.
Add EVP_PKEY algorithm for TLS1 PRF.
Reviewed-by: Matt Caswell <matt@openssl.org>
Diffstat (limited to 'crypto/objects')
| -rw-r--r-- | crypto/objects/obj_dat.h | 9 | ||||
| -rw-r--r-- | crypto/objects/obj_mac.num | 1 | ||||
| -rw-r--r-- | crypto/objects/objects.txt | 3 |
3 files changed, 10 insertions, 3 deletions
diff --git a/crypto/objects/obj_dat.h b/crypto/objects/obj_dat.h index debf8cccf6..1f13992462 100644 --- a/crypto/objects/obj_dat.h +++ b/crypto/objects/obj_dat.h @@ -62,9 +62,9 @@ * [including the GNU Public Licence.] */ -#define NUM_NID 1021 -#define NUM_SN 1014 -#define NUM_LN 1014 +#define NUM_NID 1022 +#define NUM_SN 1015 +#define NUM_LN 1015 #define NUM_OBJ 937 static const unsigned char lvalues[6612]={ @@ -2671,6 +2671,7 @@ static const ASN1_OBJECT nid_objs[NUM_NID]={ {"ChaCha20-Poly1305","chacha20-poly1305",NID_chacha20_poly1305,0,NULL,0}, {"ChaCha20","chacha20",NID_chacha20,0,NULL,0}, {"tlsfeature","TLS Feature",NID_tlsfeature,8,&(lvalues[6603]),0}, +{"TLS1-PRF","tls1-prf",NID_tls1_prf,0,NULL,0}, }; static const unsigned int sn_objs[NUM_SN]={ @@ -2878,6 +2879,7 @@ static const unsigned int sn_objs[NUM_SN]={ 1006, /* "SNILS" */ 16, /* "ST" */ 143, /* "SXNetID" */ +1021, /* "TLS1-PRF" */ 458, /* "UID" */ 0, /* "UNDEF" */ 11, /* "X500" */ @@ -4674,6 +4676,7 @@ static const unsigned int ln_objs[NUM_LN]={ 459, /* "textEncodedORAddress" */ 293, /* "textNotice" */ 106, /* "title" */ +1021, /* "tls1-prf" */ 682, /* "tpBasis" */ 436, /* "ucl" */ 0, /* "undefined" */ diff --git a/crypto/objects/obj_mac.num b/crypto/objects/obj_mac.num index 5c6ffd41af..663e86c10c 100644 --- a/crypto/objects/obj_mac.num +++ b/crypto/objects/obj_mac.num @@ -1018,3 +1018,4 @@ grasshopper_mac 1017 chacha20_poly1305 1018 chacha20 1019 tlsfeature 1020 +tls1_prf 1021 diff --git a/crypto/objects/objects.txt b/crypto/objects/objects.txt index f34609dd26..1de8e79e5b 100644 --- a/crypto/objects/objects.txt +++ b/crypto/objects/objects.txt @@ -1428,3 +1428,6 @@ secg-scheme 14 3 : dhSinglePass-cofactorDH-sha512kdf-scheme # SCRYPT algorithm 1 3 6 1 4 1 11591 4 11 : id-scrypt + +# NID for TLS1 PRF + : TLS1-PRF : tls1-prf |