kris/boringssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Allocate a NID for X25519.

Browse Source 
No corresponding OID, but SSL_CTX_set1_curves assumes NIDs exist.

BUG=571231

Change-Id: Id5221cdc59132e26a89ae5f8978b946de690b4e0
Reviewed-on: https://boringssl-review.googlesource.com/6779
Reviewed-by: Adam Langley <agl@google.com>
This commit is contained in:
David Benjamin 2015-12-18 22:42:51 -05:00 committed by Adam Langley
parent 3a2a48086b
commit c18ef750ee
4 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
crypto/obj/obj_dat.h
View File

@ -58,9 +58,9 @@
* copied and put under another distribution licence * copied and put under another distribution licence
* [including the GNU Public Licence.] */ * [including the GNU Public Licence.] */
#define NUM_NID 948 #define NUM_NID 949
#define NUM_SN 940 #define NUM_SN 941
#define NUM_LN 940 #define NUM_LN 941
#define NUM_OBJ 882 #define NUM_OBJ 882
static const unsigned char lvalues[6176]={ static const unsigned char lvalues[6176]={
@ -2482,6 +2482,7 @@ static const ASN1_OBJECT kObjects[NUM_NID]={
NID_dhSinglePass_cofactorDH_sha512kdf_scheme,6,&(lvalues[6169]),0}, NID_dhSinglePass_cofactorDH_sha512kdf_scheme,6,&(lvalues[6169]),0},
{"dh-std-kdf","dh-std-kdf",NID_dh_std_kdf,0,NULL,0}, {"dh-std-kdf","dh-std-kdf",NID_dh_std_kdf,0,NULL,0},
{"dh-cofactor-kdf","dh-cofactor-kdf",NID_dh_cofactor_kdf,0,NULL,0}, {"dh-cofactor-kdf","dh-cofactor-kdf",NID_dh_cofactor_kdf,0,NULL,0},
{"X25519","x25519",NID_x25519,0,NULL,0},
}; };
static const unsigned int kNIDsInShortNameOrder[NUM_SN]={ static const unsigned int kNIDsInShortNameOrder[NUM_SN]={
@ -2668,6 +2669,7 @@ static const unsigned int kNIDsInShortNameOrder[NUM_SN]={
143, /* "SXNetID" */ 143, /* "SXNetID" */
458, /* "UID" */ 458, /* "UID" */
0, /* "UNDEF" */ 0, /* "UNDEF" */
948, /* "X25519" */
11, /* "X500" */ 11, /* "X500" */
378, /* "X500algorithms" */ 378, /* "X500algorithms" */
12, /* "X509" */ 12, /* "X509" */
@ -4364,6 +4366,7 @@ static const unsigned int kNIDsInLongNameOrder[NUM_LN]={
742, /* "wap-wsg-idm-ecid-wtls9" */ 742, /* "wap-wsg-idm-ecid-wtls9" */
804, /* "whirlpool" */ 804, /* "whirlpool" */
868, /* "x121Address" */ 868, /* "x121Address" */
948, /* "x25519" */
503, /* "x500UniqueIdentifier" */ 503, /* "x500UniqueIdentifier" */
158, /* "x509Certificate" */ 158, /* "x509Certificate" */
160, /* "x509Crl" */ 160, /* "x509Crl" */

1
crypto/obj/obj_mac.num
View File

@ -945,3 +945,4 @@ dhSinglePass_cofactorDH_sha384kdf_scheme 944
dhSinglePass_cofactorDH_sha512kdf_scheme 945 dhSinglePass_cofactorDH_sha512kdf_scheme 945
dh_std_kdf 946 dh_std_kdf 946
dh_cofactor_kdf 947 dh_cofactor_kdf 947
x25519 948

3
crypto/obj/objects.txt
View File

@ -1330,3 +1330,6 @@ secg-scheme 14 3 : dhSinglePass-cofactorDH-sha512kdf-scheme
# NIDs for use with lookup tables. # NIDs for use with lookup tables.
: dh-std-kdf : dh-std-kdf
: dh-cofactor-kdf : dh-cofactor-kdf
# NID for X25519 (no corresponding OID).
: X25519 : x25519

4
include/openssl/obj_mac.h
View File

@ -4138,3 +4138,7 @@
#define SN_dh_cofactor_kdf "dh-cofactor-kdf" #define SN_dh_cofactor_kdf "dh-cofactor-kdf"
#define NID_dh_cofactor_kdf 947 #define NID_dh_cofactor_kdf 947
#define SN_x25519 "X25519"
#define LN_x25519 "x25519"
#define NID_x25519 948