diff options
author | Matt Caswell <matt@openssl.org> | 2014-12-06 20:55:10 +0000 |
---|---|---|
committer | Matt Caswell <matt@openssl.org> | 2014-12-08 10:28:34 +0000 |
commit | e6b336efa31c9916bd64504a478d56532f86d6aa (patch) | |
tree | 66b5bd690c59a025b814685b4d43dffb2b38fb65 /crypto/objects | |
parent | c857a80c9dccf82de94137410c754b18e893a55d (diff) |
Add EVP support for OCB mode
Reviewed-by: Tim Hudson <tjh@openssl.org>
Diffstat (limited to 'crypto/objects')
-rw-r--r-- | crypto/objects/obj_dat.h | 15 | ||||
-rw-r--r-- | crypto/objects/obj_mac.h | 12 | ||||
-rw-r--r-- | crypto/objects/obj_mac.num | 3 | ||||
-rw-r--r-- | crypto/objects/objects.txt | 3 |
4 files changed, 30 insertions, 3 deletions
diff --git a/crypto/objects/obj_dat.h b/crypto/objects/obj_dat.h index b7e3cf280e..e93e1b0d42 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 958 -#define NUM_SN 951 -#define NUM_LN 951 +#define NUM_NID 961 +#define NUM_SN 954 +#define NUM_LN 954 #define NUM_OBJ 890 static const unsigned char lvalues[6255]={ @@ -2514,6 +2514,9 @@ static const ASN1_OBJECT nid_objs[NUM_NID]={ NID_jurisdictionStateOrProvinceName,11,&(lvalues[6232]),0}, {"jurisdictionC","jurisdictionCountryName", NID_jurisdictionCountryName,11,&(lvalues[6243]),0}, +{"AES-128-OCB","aes-128-ocb",NID_aes_128_ocb,0,NULL,0}, +{"AES-192-OCB","aes-192-ocb",NID_aes_192_ocb,0,NULL,0}, +{"AES-256-OCB","aes-256-ocb",NID_aes_256_ocb,0,NULL,0}, }; static const unsigned int sn_objs[NUM_SN]={ @@ -2526,6 +2529,7 @@ static const unsigned int sn_objs[NUM_SN]={ 653, /* "AES-128-CFB8" */ 904, /* "AES-128-CTR" */ 418, /* "AES-128-ECB" */ +958, /* "AES-128-OCB" */ 420, /* "AES-128-OFB" */ 913, /* "AES-128-XTS" */ 423, /* "AES-192-CBC" */ @@ -2536,6 +2540,7 @@ static const unsigned int sn_objs[NUM_SN]={ 654, /* "AES-192-CFB8" */ 905, /* "AES-192-CTR" */ 422, /* "AES-192-ECB" */ +959, /* "AES-192-OCB" */ 424, /* "AES-192-OFB" */ 427, /* "AES-256-CBC" */ 918, /* "AES-256-CBC-HMAC-SHA1" */ @@ -2545,6 +2550,7 @@ static const unsigned int sn_objs[NUM_SN]={ 655, /* "AES-256-CFB8" */ 906, /* "AES-256-CTR" */ 426, /* "AES-256-ECB" */ +960, /* "AES-256-OCB" */ 428, /* "AES-256-OFB" */ 914, /* "AES-256-XTS" */ 91, /* "BF-CBC" */ @@ -3629,6 +3635,7 @@ static const unsigned int ln_objs[NUM_LN]={ 904, /* "aes-128-ctr" */ 418, /* "aes-128-ecb" */ 895, /* "aes-128-gcm" */ +958, /* "aes-128-ocb" */ 420, /* "aes-128-ofb" */ 913, /* "aes-128-xts" */ 423, /* "aes-192-cbc" */ @@ -3641,6 +3648,7 @@ static const unsigned int ln_objs[NUM_LN]={ 905, /* "aes-192-ctr" */ 422, /* "aes-192-ecb" */ 898, /* "aes-192-gcm" */ +959, /* "aes-192-ocb" */ 424, /* "aes-192-ofb" */ 427, /* "aes-256-cbc" */ 918, /* "aes-256-cbc-hmac-sha1" */ @@ -3652,6 +3660,7 @@ static const unsigned int ln_objs[NUM_LN]={ 906, /* "aes-256-ctr" */ 426, /* "aes-256-ecb" */ 901, /* "aes-256-gcm" */ +960, /* "aes-256-ocb" */ 428, /* "aes-256-ofb" */ 914, /* "aes-256-xts" */ 376, /* "algorithm" */ diff --git a/crypto/objects/obj_mac.h b/crypto/objects/obj_mac.h index f0690b0683..0ce54a8f72 100644 --- a/crypto/objects/obj_mac.h +++ b/crypto/objects/obj_mac.h @@ -2745,6 +2745,18 @@ #define LN_aes_256_ctr "aes-256-ctr" #define NID_aes_256_ctr 906 +#define SN_aes_128_ocb "AES-128-OCB" +#define LN_aes_128_ocb "aes-128-ocb" +#define NID_aes_128_ocb 958 + +#define SN_aes_192_ocb "AES-192-OCB" +#define LN_aes_192_ocb "aes-192-ocb" +#define NID_aes_192_ocb 959 + +#define SN_aes_256_ocb "AES-256-OCB" +#define LN_aes_256_ocb "aes-256-ocb" +#define NID_aes_256_ocb 960 + #define SN_aes_128_xts "AES-128-XTS" #define LN_aes_128_xts "aes-128-xts" #define NID_aes_128_xts 913 diff --git a/crypto/objects/obj_mac.num b/crypto/objects/obj_mac.num index 8e5ea83363..648e2df1c7 100644 --- a/crypto/objects/obj_mac.num +++ b/crypto/objects/obj_mac.num @@ -955,3 +955,6 @@ ct_cert_scts 954 jurisdictionLocalityName 955 jurisdictionStateOrProvinceName 956 jurisdictionCountryName 957 +aes_128_ocb 958 +aes_192_ocb 959 +aes_256_ocb 960 diff --git a/crypto/objects/objects.txt b/crypto/objects/objects.txt index b57aabb226..a4af282173 100644 --- a/crypto/objects/objects.txt +++ b/crypto/objects/objects.txt @@ -894,6 +894,9 @@ aes 48 : id-aes256-wrap-pad : AES-128-CTR : aes-128-ctr : AES-192-CTR : aes-192-ctr : AES-256-CTR : aes-256-ctr + : AES-128-OCB : aes-128-ocb + : AES-192-OCB : aes-192-ocb + : AES-256-OCB : aes-256-ocb : AES-128-XTS : aes-128-xts : AES-256-XTS : aes-256-xts : DES-CFB1 : des-cfb1 |