Add error checking to obj_xref.pl and add command line support for data

[openssl.git] / crypto / objects / obj_xref.h

diff --git a/crypto/objects/obj_xref.h b/crypto/objects/obj_xref.h
index b385083df1640ad04e120b0657a9bf71041098fd..d5b9b8e19830c30e6fbf87cc972a66c77beef0c1 100644 (file)
--- a/crypto/objects/obj_xref.h
+++ b/crypto/objects/obj_xref.h
@@ -1,5 +1,11 @@
+/* AUTOGENERATED BY objxref.pl, DO NOT EDIT */
 
-typedef int nid_triple[3];
+typedef struct
+       {
+       int sign_id;
+       int hash_id;
+       int pkey_id;
+       } nid_triple;
 
 static const nid_triple sigoid_srt[] =
        {
@@ -20,22 +26,24 @@ static const nid_triple sigoid_srt[] =
        {NID_sha384WithRSAEncryption, NID_sha384, NID_rsaEncryption},
        {NID_sha512WithRSAEncryption, NID_sha512, NID_rsaEncryption},
        {NID_sha224WithRSAEncryption, NID_sha224, NID_rsaEncryption},
-       {NID_id_GostR3411_94_with_GostR3410_2001, NID_id_GostR3411_94, NID_id_GostR3410_2001},
-       {NID_id_GostR3411_94_with_GostR3410_94, NID_id_GostR3411_94, NID_id_GostR3410_94},
-       {NID_id_GostR3411_94_with_GostR3410_94_cc, NID_id_GostR3411_94, NID_id_GostR3410_94_cc},
-       {NID_id_GostR3411_94_with_GostR3410_2001_cc, NID_id_GostR3411_94, NID_id_GostR3410_2001_cc},
        {NID_ecdsa_with_Recommended, NID_undef, NID_X9_62_id_ecPublicKey},
        {NID_ecdsa_with_Specified, NID_undef, NID_X9_62_id_ecPublicKey},
        {NID_ecdsa_with_SHA224, NID_sha224, NID_X9_62_id_ecPublicKey},
        {NID_ecdsa_with_SHA256, NID_sha256, NID_X9_62_id_ecPublicKey},
        {NID_ecdsa_with_SHA384, NID_sha384, NID_X9_62_id_ecPublicKey},
        {NID_ecdsa_with_SHA512, NID_sha512, NID_X9_62_id_ecPublicKey},
+       {NID_dsa_with_SHA224, NID_sha224, NID_dsa},
+       {NID_dsa_with_SHA256, NID_sha256, NID_dsa},
+       {NID_id_GostR3411_94_with_GostR3410_2001, NID_id_GostR3411_94, NID_id_GostR3410_2001},
+       {NID_id_GostR3411_94_with_GostR3410_94, NID_id_GostR3411_94, NID_id_GostR3410_94},
+       {NID_id_GostR3411_94_with_GostR3410_94_cc, NID_id_GostR3411_94, NID_id_GostR3410_94_cc},
+       {NID_id_GostR3411_94_with_GostR3410_2001_cc, NID_id_GostR3411_94, NID_id_GostR3410_2001_cc},
        };
 
 static const nid_triple * const sigoid_srt_xref[] =
        {
-       &sigoid_srt[21],
-       &sigoid_srt[22],
+       &sigoid_srt[17],
+       &sigoid_srt[18],
        &sigoid_srt[0],
        &sigoid_srt[1],
        &sigoid_srt[7],
@@ -51,15 +59,17 @@ static const nid_triple * const sigoid_srt_xref[] =
        &sigoid_srt[11],
        &sigoid_srt[13],
        &sigoid_srt[24],
+       &sigoid_srt[20],
        &sigoid_srt[14],
-       &sigoid_srt[25],
+       &sigoid_srt[21],
        &sigoid_srt[15],
-       &sigoid_srt[26],
+       &sigoid_srt[22],
        &sigoid_srt[16],
        &sigoid_srt[23],
-       &sigoid_srt[17],
-       &sigoid_srt[18],
        &sigoid_srt[19],
-       &sigoid_srt[20],
+       &sigoid_srt[25],
+       &sigoid_srt[26],
+       &sigoid_srt[27],
+       &sigoid_srt[28],
        };