diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2011-04-12 23:21:33 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2011-04-12 23:21:33 +0000 |
| commit | 32a2d8ddfebdde06bfdf4fdac54d487c5d03cbea (patch) | |
| tree | 65c2b96de034be57560a3cc7943890ce62d6b2ce /crypto/objects | |
| parent | 4bd1e895faa35a8d4810402fe3ba9d07c1166908 (diff) | |
| download | openssl-32a2d8ddfebdde06bfdf4fdac54d487c5d03cbea.tar.gz | |
Provisional AES XTS support.
Diffstat (limited to 'crypto/objects')
| -rw-r--r-- | crypto/objects/obj_dat.h | 12 | ||||
| -rw-r--r-- | crypto/objects/obj_mac.h | 8 | ||||
| -rw-r--r-- | crypto/objects/obj_mac.num | 2 | ||||
| -rw-r--r-- | crypto/objects/objects.txt | 2 |
4 files changed, 21 insertions, 3 deletions
diff --git a/crypto/objects/obj_dat.h b/crypto/objects/obj_dat.h index 1477c787f8..8d1100b321 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 913 -#define NUM_SN 906 -#define NUM_LN 906 +#define NUM_NID 915 +#define NUM_SN 908 +#define NUM_LN 908 #define NUM_OBJ 856 static const unsigned char lvalues[5971]={ @@ -2395,6 +2395,8 @@ static const ASN1_OBJECT nid_objs[NUM_NID]={ NID_anyExtendedKeyUsage,4,&(lvalues[5948]),0}, {"MGF1","mgf1",NID_mgf1,9,&(lvalues[5952]),0}, {"RSASSA-PSS","rsassaPss",NID_rsassaPss,9,&(lvalues[5961]),0}, +{"AES-128-XTS","aes-128-xts",NID_aes_128_xts,0,NULL,0}, +{"AES-256-XTS","aes-256-xts",NID_aes_256_xts,0,NULL,0}, }; static const unsigned int sn_objs[NUM_SN]={ @@ -2406,6 +2408,7 @@ static const unsigned int sn_objs[NUM_SN]={ 904, /* "AES-128-CTR" */ 418, /* "AES-128-ECB" */ 420, /* "AES-128-OFB" */ +913, /* "AES-128-XTS" */ 423, /* "AES-192-CBC" */ 425, /* "AES-192-CFB" */ 651, /* "AES-192-CFB1" */ @@ -2420,6 +2423,7 @@ static const unsigned int sn_objs[NUM_SN]={ 906, /* "AES-256-CTR" */ 426, /* "AES-256-ECB" */ 428, /* "AES-256-OFB" */ +914, /* "AES-256-XTS" */ 91, /* "BF-CBC" */ 93, /* "BF-CFB" */ 92, /* "BF-ECB" */ @@ -3459,6 +3463,7 @@ static const unsigned int ln_objs[NUM_LN]={ 418, /* "aes-128-ecb" */ 895, /* "aes-128-gcm" */ 420, /* "aes-128-ofb" */ +913, /* "aes-128-xts" */ 423, /* "aes-192-cbc" */ 899, /* "aes-192-ccm" */ 425, /* "aes-192-cfb" */ @@ -3477,6 +3482,7 @@ static const unsigned int ln_objs[NUM_LN]={ 426, /* "aes-256-ecb" */ 901, /* "aes-256-gcm" */ 428, /* "aes-256-ofb" */ +914, /* "aes-256-xts" */ 376, /* "algorithm" */ 484, /* "associatedDomain" */ 485, /* "associatedName" */ diff --git a/crypto/objects/obj_mac.h b/crypto/objects/obj_mac.h index 9b88cf88d6..6de8c70479 100644 --- a/crypto/objects/obj_mac.h +++ b/crypto/objects/obj_mac.h @@ -2735,6 +2735,14 @@ #define LN_aes_256_ctr "aes-256-ctr" #define NID_aes_256_ctr 906 +#define SN_aes_128_xts "AES-128-XTS" +#define LN_aes_128_xts "aes-128-xts" +#define NID_aes_128_xts 913 + +#define SN_aes_256_xts "AES-256-XTS" +#define LN_aes_256_xts "aes-256-xts" +#define NID_aes_256_xts 914 + #define SN_des_cfb1 "DES-CFB1" #define LN_des_cfb1 "des-cfb1" #define NID_des_cfb1 656 diff --git a/crypto/objects/obj_mac.num b/crypto/objects/obj_mac.num index 5ff1f49e82..cbd77f3a41 100644 --- a/crypto/objects/obj_mac.num +++ b/crypto/objects/obj_mac.num @@ -910,3 +910,5 @@ id_camellia256_wrap 909 anyExtendedKeyUsage 910 mgf1 911 rsassaPss 912 +aes_128_xts 913 +aes_256_xts 914 diff --git a/crypto/objects/objects.txt b/crypto/objects/objects.txt index 7d53d9a12c..1bf3ad6eed 100644 --- a/crypto/objects/objects.txt +++ b/crypto/objects/objects.txt @@ -892,6 +892,8 @@ 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-XTS : aes-128-xts + : AES-256-XTS : aes-256-xts : DES-CFB1 : des-cfb1 : DES-CFB8 : des-cfb8 : DES-EDE3-CFB1 : des-ede3-cfb1 |