diff options
| author | Bill Cox <waywardgeek@google.com> | 2016-03-09 23:08:31 +0100 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2016-03-11 16:39:10 +0100 |
| commit | 2d0b44126763f989a4cbffbffe9d0c7518158bb7 (patch) | |
| tree | 241855d2b5a9b91688f969bf849037f6a0343594 /crypto/objects | |
| parent | move DSA_SIG definition into C source file (diff) | |
| download | openssl-2d0b44126763f989a4cbffbffe9d0c7518158bb7.tar.xz openssl-2d0b44126763f989a4cbffbffe9d0c7518158bb7.zip | |
Add blake2 support.
Reviewed-by: Andy Polyakov <appro@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'crypto/objects')
| -rw-r--r-- | crypto/objects/obj_dat.h | 22 | ||||
| -rw-r--r-- | crypto/objects/obj_mac.num | 2 | ||||
| -rw-r--r-- | crypto/objects/objects.txt | 3 |
3 files changed, 22 insertions, 5 deletions
diff --git a/crypto/objects/obj_dat.h b/crypto/objects/obj_dat.h index 8cd3b2071e..c9314208a7 100644 --- a/crypto/objects/obj_dat.h +++ b/crypto/objects/obj_dat.h @@ -60,12 +60,12 @@ * [including the GNU Public Licence.] */ -#define NUM_NID 1054 -#define NUM_SN 1047 -#define NUM_LN 1047 -#define NUM_OBJ 951 +#define NUM_NID 1058 +#define NUM_SN 1049 +#define NUM_LN 1049 +#define NUM_OBJ 953 -static const unsigned char lvalues[6722]={ +static const unsigned char lvalues[6744]={ 0x2A,0x86,0x48,0x86,0xF7,0x0D, /* [ 0] OBJ_rsadsi */ 0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01, /* [ 6] OBJ_pkcs */ 0x2A,0x86,0x48,0x86,0xF7,0x0D,0x02,0x02, /* [ 13] OBJ_md2 */ @@ -1011,6 +1011,8 @@ static const unsigned char lvalues[6722]={ 0x2B,0x06,0x01,0x05,0x02,0x03,0x05, /* [6696] OBJ_pkInitKDC */ 0x2B,0x06,0x01,0x04,0x01,0xDA,0x47,0x0F,0x01,/* [6703] OBJ_X25519 */ 0x2B,0x06,0x01,0x04,0x01,0xDA,0x47,0x0F,0x02,/* [6712] OBJ_X448 */ +0x2B,0x06,0x01,0x04,0x01,0x8D,0x3A,0x0C,0x02,0x01,0x10,/* [6721] OBJ_blake2b */ +0x2B,0x06,0x01,0x04,0x01,0x8D,0x3A,0x0C,0x02,0x02,0x08,/* [6732] OBJ_blake2s */ }; static const ASN1_OBJECT nid_objs[NUM_NID]={ @@ -2722,6 +2724,10 @@ static const ASN1_OBJECT nid_objs[NUM_NID]={ {"AuthGOST12","auth-gost12",NID_auth_gost12,0,NULL,0}, {"AuthSRP","auth-srp",NID_auth_srp,0,NULL,0}, {"AuthNULL","auth-null",NID_auth_null,0,NULL,0}, +{NULL,NULL,NID_undef,0,NULL,0}, +{NULL,NULL,NID_undef,0,NULL,0}, +{"BLAKE2b","blake2b",NID_blake2b,11,&(lvalues[6721]),0}, +{"BLAKE2s","blake2s",NID_blake2s,11,&(lvalues[6732]),0}, }; static const unsigned int sn_objs[NUM_SN]={ @@ -2770,6 +2776,8 @@ static const unsigned int sn_objs[NUM_SN]={ 93, /* "BF-CFB" */ 92, /* "BF-ECB" */ 94, /* "BF-OFB" */ +1056, /* "BLAKE2b" */ +1057, /* "BLAKE2s" */ 14, /* "C" */ 751, /* "CAMELLIA-128-CBC" */ 962, /* "CAMELLIA-128-CCM" */ @@ -4008,6 +4016,8 @@ static const unsigned int ln_objs[NUM_LN]={ 93, /* "bf-cfb" */ 92, /* "bf-ecb" */ 94, /* "bf-ofb" */ +1056, /* "blake2b" */ +1057, /* "blake2s" */ 921, /* "brainpoolP160r1" */ 922, /* "brainpoolP160t1" */ 923, /* "brainpoolP192r1" */ @@ -5776,5 +5786,7 @@ static const unsigned int obj_objs[NUM_OBJ]={ 955, /* OBJ_jurisdictionLocalityName 1 3 6 1 4 1 311 60 2 1 1 */ 956, /* OBJ_jurisdictionStateOrProvinceName 1 3 6 1 4 1 311 60 2 1 2 */ 957, /* OBJ_jurisdictionCountryName 1 3 6 1 4 1 311 60 2 1 3 */ +1056, /* OBJ_blake2b 1 3 6 1 4 1 1722 12 2 1 16 */ +1057, /* OBJ_blake2s 1 3 6 1 4 1 1722 12 2 2 8 */ }; diff --git a/crypto/objects/obj_mac.num b/crypto/objects/obj_mac.num index 2a80d9d0c9..dfdb61aa5d 100644 --- a/crypto/objects/obj_mac.num +++ b/crypto/objects/obj_mac.num @@ -1053,3 +1053,5 @@ auth_srp 1052 auth_null 1053 fips_none 1054 fips_140_2 1055 +blake2b 1056 +blake2s 1057 diff --git a/crypto/objects/objects.txt b/crypto/objects/objects.txt index a79968b85a..24b0f42e52 100644 --- a/crypto/objects/objects.txt +++ b/crypto/objects/objects.txt @@ -671,6 +671,9 @@ algorithm 29 : RSA-SHA1-2 : sha1WithRSA 1 3 36 3 2 1 : RIPEMD160 : ripemd160 1 3 36 3 3 1 2 : RSA-RIPEMD160 : ripemd160WithRSA +1 3 6 1 4 1 1722 12 2 1 16 : BLAKE2b : blake2b +1 3 6 1 4 1 1722 12 2 2 8 : BLAKE2s : blake2s + !Cname sxnet 1 3 101 1 4 1 : SXNetID : Strong Extranet ID |