Add XTS OIDs from HEAD.

diff --git a/crypto/objects/obj_dat.h b/crypto/objects/obj_dat.h
index 1477c787f8df580f1d23ff7b80bf834b1cd64aff..8d1100b321eb806b76ca5e2967d65f0d7beedca8 100644 (file)
--- a/crypto/objects/obj_dat.h
+++ b/crypto/objects/obj_dat.h
@@ -62,9 +62,9 @@
  * [including the GNU Public Licence.]
  */
 
  * [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]={
 #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},
        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]={
 };
 
 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" */
 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" */
 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" */
 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" */
 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" */
 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" */
 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" */
 426,   /* "aes-256-ecb" */
 901,   /* "aes-256-gcm" */
 428,   /* "aes-256-ofb" */

+914,   /* "aes-256-xts" */

 376,   /* "algorithm" */
 484,   /* "associatedDomain" */
 485,   /* "associatedName" */
 376,   /* "algorithm" */
 484,   /* "associatedDomain" */
 485,   /* "associatedName" */

diff --git a/crypto/objects/obj_mac.h b/crypto/objects/obj_mac.h
index 9b88cf88d656d6d6423278b725961dd4ce5bbd2d..6de8c704791ebe308bb46f19525327fafb31b966 100644 (file)
--- 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 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
 #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 5ff1f49e82bae0ab279ab1992982348a00643560..cbd77f3a41d0d73d98fe9ef9995b3b87a507031d 100644 (file)
--- 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
 anyExtendedKeyUsage            910
 mgf1           911
 rsassaPss              912

+aes_128_xts            913
+aes_256_xts            914

diff --git a/crypto/objects/obj_xref.h b/crypto/objects/obj_xref.h
index 7836f01d95ccacbc6a51b66abf65fdda8abef2fd..d5b9b8e19830c30e6fbf87cc972a66c77beef0c1 100644 (file)
--- a/crypto/objects/obj_xref.h
+++ b/crypto/objects/obj_xref.h
@@ -1,4 +1,4 @@
-/* AUTOGENERATED BY crypto/objects/objxref.pl, DO NOT EDIT */
+/* AUTOGENERATED BY objxref.pl, DO NOT EDIT */

 
 typedef struct
        {
 
 typedef struct
        {

diff --git a/crypto/objects/objects.txt b/crypto/objects/objects.txt
index 7d53d9a12cc22f6eea212bf3be08cc14f1245a06..1bf3ad6eedcb62b53ae45100119605bad4cb46c8 100644 (file)
--- 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-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
                        : DES-CFB1              : des-cfb1
                        : DES-CFB8              : des-cfb8
                        : DES-EDE3-CFB1         : des-ede3-cfb1