Blob Blame Raw
diff -up libgcrypt-1.6.1/tests/benchmark.c.eccfix libgcrypt-1.6.1/tests/benchmark.c
--- libgcrypt-1.6.1/tests/benchmark.c.eccfix	2014-01-27 14:36:43.000000000 +0100
+++ libgcrypt-1.6.1/tests/benchmark.c	2014-02-28 16:14:13.042505538 +0100
@@ -1087,8 +1087,7 @@ ecc_bench (int iterations, int print_hea
 {
 #if USE_ECC
   gpg_error_t err;
-  const char *p_sizes[] = { "192", "224", "256", "384", "521", "Ed25519",
-              "gost256", "gost512" };
+  const char *p_sizes[] = { "256", "384", "521", "Ed25519" };
   int testno;
 
   if (print_header)
diff -up libgcrypt-1.6.1/tests/dsa-rfc6979.c.eccfix libgcrypt-1.6.1/tests/dsa-rfc6979.c
--- libgcrypt-1.6.1/tests/dsa-rfc6979.c.eccfix	2013-12-16 18:44:32.000000000 +0100
+++ libgcrypt-1.6.1/tests/dsa-rfc6979.c	2014-02-28 16:18:44.138771523 +0100
@@ -210,27 +210,6 @@ check_dsa_rfc6979 (void)
       " ))"
     },
     {
-      "ECDSA, 192 bits (prime field)",
-      "(private-key"
-      " (ecdsa"
-      " (curve \"NIST P-192\")"
-      " (q #04AC2C77F529F91689FEA0EA5EFEC7F210D8EEA0B9E047ED56"
-      "       3BC723E57670BD4887EBC732C523063D0A7C957BC97C1C43#)"
-      " (d #6FAB034934E4C0FC9AE67F5B5659A9D7D1FEFD187EE09FD4#)"
-      " ))"
-    },
-    {
-      "ECDSA, 224 bits (prime field)",
-      "(private-key"
-      " (ecdsa"
-      " (curve \"NIST P-224\")"
-      " (q #04"
-      "     00CF08DA5AD719E42707FA431292DEA11244D64FC51610D94B130D6C"
-      "     EEAB6F3DEBE455E3DBF85416F7030CBD94F34F2D6F232C69F3C1385A#)"
-      " (d #F220266E1105BFE3083E03EC7A3A654651F45E37167E88600BF257C1#)"
-      " ))"
-    },
-    {
       "ECDSA, 256 bits (prime field)",
       "(private-key"
       " (ecdsa"
@@ -443,169 +422,6 @@ check_dsa_rfc6979 (void)
       "C9F0BDABCC0D880BB137A994CC7F3980CE91CC10FAF529FC46565B15CEA854E1"
     },
     {
-      "ECDSA, 192 bits (prime field)",
-      "With SHA-1, message = \"sample\"",
-      "sha1", "sample",
-      "37D7CA00D2C7B0E5E412AC03BD44BA837FDD5B28CD3B0021",
-      "98C6BD12B23EAF5E2A2045132086BE3EB8EBD62ABF6698FF",
-      "57A22B07DEA9530F8DE9471B1DC6624472E8E2844BC25B64"
-    },
-    {
-      "ECDSA, 192 bits (prime field)",
-      "With SHA-224, message = \"sample\"",
-      "sha224", "sample",
-      "4381526B3FC1E7128F202E194505592F01D5FF4C5AF015D8",
-      "A1F00DAD97AEEC91C95585F36200C65F3C01812AA60378F5",
-      "E07EC1304C7C6C9DEBBE980B9692668F81D4DE7922A0F97A"
-    },
-    {
-      "ECDSA, 192 bits (prime field)",
-      "With SHA-256, message = \"sample\"",
-      "sha256", "sample",
-      "32B1B6D7D42A05CB449065727A84804FB1A3E34D8F261496",
-      "4B0B8CE98A92866A2820E20AA6B75B56382E0F9BFD5ECB55",
-      "CCDB006926EA9565CBADC840829D8C384E06DE1F1E381B85"
-    },
-    {
-      "ECDSA, 192 bits (prime field)",
-      "With SHA-384, message = \"sample\"",
-      "sha384", "sample",
-      "4730005C4FCB01834C063A7B6760096DBE284B8252EF4311",
-      "DA63BF0B9ABCF948FBB1E9167F136145F7A20426DCC287D5",
-      "C3AA2C960972BD7A2003A57E1C4C77F0578F8AE95E31EC5E"
-    },
-    {
-      "ECDSA, 192 bits (prime field)",
-      "With SHA-512, message = \"sample\"",
-      "sha512", "sample",
-      "A2AC7AB055E4F20692D49209544C203A7D1F2C0BFBC75DB1",
-      "4D60C5AB1996BD848343B31C00850205E2EA6922DAC2E4B8",
-      "3F6E837448F027A1BF4B34E796E32A811CBB4050908D8F67"
-    },
-    {
-      "ECDSA, 192 bits (prime field)",
-      "With SHA-1, message = \"test\"",
-      "sha1", "test",
-      "D9CF9C3D3297D3260773A1DA7418DB5537AB8DD93DE7FA25",
-      "0F2141A0EBBC44D2E1AF90A50EBCFCE5E197B3B7D4DE036D",
-      "EB18BC9E1F3D7387500CB99CF5F7C157070A8961E38700B7"
-    },
-    {
-      "ECDSA, 192 bits (prime field)",
-      "With SHA-224, message = \"test\"",
-      "sha224", "test",
-      "F5DC805F76EF851800700CCE82E7B98D8911B7D510059FBE",
-      "6945A1C1D1B2206B8145548F633BB61CEF04891BAF26ED34",
-      "B7FB7FDFC339C0B9BD61A9F5A8EAF9BE58FC5CBA2CB15293"
-    },
-    {
-      "ECDSA, 192 bits (prime field)",
-      "With SHA-256, message = \"test\"",
-      "sha256", "test",
-      "5C4CE89CF56D9E7C77C8585339B006B97B5F0680B4306C6C",
-      "3A718BD8B4926C3B52EE6BBE67EF79B18CB6EB62B1AD97AE",
-      "5662E6848A4A19B1F1AE2F72ACD4B8BBE50F1EAC65D9124F"
-    },
-    {
-      "ECDSA, 192 bits (prime field)",
-      "With SHA-384, message = \"test\"",
-      "sha384", "test",
-      "5AFEFB5D3393261B828DB6C91FBC68C230727B030C975693",
-      "B234B60B4DB75A733E19280A7A6034BD6B1EE88AF5332367",
-      "7994090B2D59BB782BE57E74A44C9A1C700413F8ABEFE77A"
-    },
-    {
-      "ECDSA, 192 bits (prime field)",
-      "With SHA-512, message = \"test\"",
-      "sha512", "test",
-      "0758753A5254759C7CFBAD2E2D9B0792EEE44136C9480527",
-      "FE4F4AE86A58B6507946715934FE2D8FF9D95B6B098FE739",
-      "74CF5605C98FBA0E1EF34D4B5A1577A7DCF59457CAE52290"
-    },
-
-
-
-    {
-      "ECDSA, 224 bits (prime field)",
-      "With SHA-1, message = \"sample\"",
-      "sha1", "sample",
-      "7EEFADD91110D8DE6C2C470831387C50D3357F7F4D477054B8B426BC",
-      "22226F9D40A96E19C4A301CE5B74B115303C0F3A4FD30FC257FB57AC",
-      "66D1CDD83E3AF75605DD6E2FEFF196D30AA7ED7A2EDF7AF475403D69"
-    },
-    {
-      "ECDSA, 224 bits (prime field)",
-      "With SHA-224, message = \"sample\"",
-      "sha224", "sample",
-      "C1D1F2F10881088301880506805FEB4825FE09ACB6816C36991AA06D",
-      "1CDFE6662DDE1E4A1EC4CDEDF6A1F5A2FB7FBD9145C12113E6ABFD3E",
-      "A6694FD7718A21053F225D3F46197CA699D45006C06F871808F43EBC"
-    },
-    {
-      "ECDSA, 224 bits (prime field)",
-      "With SHA-256, message = \"sample\"",
-      "sha256", "sample",
-      "AD3029E0278F80643DE33917CE6908C70A8FF50A411F06E41DEDFCDC",
-      "61AA3DA010E8E8406C656BC477A7A7189895E7E840CDFE8FF42307BA",
-      "BC814050DAB5D23770879494F9E0A680DC1AF7161991BDE692B10101"
-    },
-    {
-      "ECDSA, 224 bits (prime field)",
-      "With SHA-384, message = \"sample\"",
-      "sha384", "sample",
-      "52B40F5A9D3D13040F494E83D3906C6079F29981035C7BD51E5CAC40",
-      "0B115E5E36F0F9EC81F1325A5952878D745E19D7BB3EABFABA77E953",
-      "830F34CCDFE826CCFDC81EB4129772E20E122348A2BBD889A1B1AF1D"
-    },
-    {
-      "ECDSA, 224 bits (prime field)",
-      "With SHA-512, message = \"sample\"",
-      "sha512", "sample",
-      "9DB103FFEDEDF9CFDBA05184F925400C1653B8501BAB89CEA0FBEC14",
-      "074BD1D979D5F32BF958DDC61E4FB4872ADCAFEB2256497CDAC30397",
-      "A4CECA196C3D5A1FF31027B33185DC8EE43F288B21AB342E5D8EB084"
-    },
-    {
-      "ECDSA, 224 bits (prime field)",
-      "With SHA-1, message = \"test\"",
-      "sha1", "test",
-      "2519178F82C3F0E4F87ED5883A4E114E5B7A6E374043D8EFD329C253",
-      "DEAA646EC2AF2EA8AD53ED66B2E2DDAA49A12EFD8356561451F3E21C",
-      "95987796F6CF2062AB8135271DE56AE55366C045F6D9593F53787BD2"
-    },
-    {
-      "ECDSA, 224 bits (prime field)",
-      "With SHA-224, message = \"test\"",
-      "sha224", "test",
-      "DF8B38D40DCA3E077D0AC520BF56B6D565134D9B5F2EAE0D34900524",
-      "C441CE8E261DED634E4CF84910E4C5D1D22C5CF3B732BB204DBEF019",
-      "902F42847A63BDC5F6046ADA114953120F99442D76510150F372A3F4"
-    },
-    {
-      "ECDSA, 224 bits (prime field)",
-      "With SHA-256, message = \"test\"",
-      "sha256", "test",
-      "FF86F57924DA248D6E44E8154EB69F0AE2AEBAEE9931D0B5A969F904",
-      "AD04DDE87B84747A243A631EA47A1BA6D1FAA059149AD2440DE6FBA6",
-      "178D49B1AE90E3D8B629BE3DB5683915F4E8C99FDF6E666CF37ADCFD"
-    },
-    {
-      "ECDSA, 224 bits (prime field)",
-      "With SHA-384, message = \"test\"",
-      "sha384", "test",
-      "7046742B839478C1B5BD31DB2E862AD868E1A45C863585B5F22BDC2D",
-      "389B92682E399B26518A95506B52C03BC9379A9DADF3391A21FB0EA4",
-      "414A718ED3249FF6DBC5B50C27F71F01F070944DA22AB1F78F559AAB"
-    },
-    {
-      "ECDSA, 224 bits (prime field)",
-      "With SHA-512, message = \"test\"",
-      "sha512", "test",
-      "E39C2AA4EA6BE2306C72126D40ED77BF9739BB4D6EF2BBB1DCB6169D",
-      "049F050477C5ADD858CAC56208394B5A55BAEBBE887FDF765047C17C",
-      "077EB13E7005929CEFA3CD0403C7CDCC077ADF4E44F3C41B2F60ECFF"
-    },
-    {
       "ECDSA, 256 bits (prime field)",
       "With SHA-1, message = \"sample\"",
       "sha1", "sample",