Fix issues with testapp and remove extra args.

Signed-off-by: Yogaraj Alamenda <[email protected]> Co-authored-by: Yogaraj Alamenda <[email protected]>
intel · May 10, 2023 · e42d23e · e42d23e
1 parent 278be78
commit e42d23e
Show file tree

Hide file tree

Showing 9 changed files with 148 additions and 250 deletions.
diff --git a/test/main.c b/test/main.c
@@ -121,7 +121,6 @@ static char *tls_version = NULL;
 static char *digest_kdf = NULL;
 static int prf_op = -1;
 static int hkdf_op = -1;
-static int ecx_op = -1;
 static int explicit_engine = 0;
 static int async_jobs = 1;
 static int sw_fallback = 0;
@@ -236,8 +235,8 @@ static const option_data ecdh_choices[] = {
     {"ecdhb283", 0, TEST_ECDH, B_CURVE_283, 0},
     {"ecdhb409", 0, TEST_ECDH, B_CURVE_409, 0},
     {"ecdhb571", 0, TEST_ECDH, B_CURVE_571, 0},
-    {"ecdhx25519", 0, TEST_ECX, 0, 0},
-    {"ecdhx448", 0, TEST_ECX, 0, 1},
+    {"ecdhx25519", 0, TEST_ECX, X_CURVE_25519, 0},
+    {"ecdhx448", 0, TEST_ECX, X_CURVE_448, 0},
     {"ecdhsm2", 0, TEST_ECDH, P_CURVE_SM2, 0},
 };
 
@@ -915,7 +914,6 @@ static void handle_option(int argc, char *argv[], int *index)
                 printf ("name %s\n", ecdh_choices[i].name);
                 curve = ecdh_choices[i].curve_name;
                 test_alg = ecdh_choices[i].test_alg;
-                ecx_op = ecdh_choices[i].op;
                 break;
             }
     } else if (!strncmp(option, "ecdsa", strlen("ecdsa"))) {
@@ -1114,7 +1112,6 @@ static void performance_test(void)
         info->test_params->async_jobs = async_jobs;
         info->test_params->prf_op = prf_op;
         info->test_params->hkdf_op = hkdf_op;
-        info->test_params->ecx_op = ecx_op;
         info->test_params->jobs = OPENSSL_malloc(sizeof(ASYNC_JOB*)*async_jobs);
         if (info->test_params->jobs == NULL) {
             WARN("# FAIL: Unable to allocate info->test_params->jobs\n");
@@ -1337,7 +1334,6 @@ static void functional_test(void)
     args.async_jobs = async_jobs;
     args.prf_op = prf_op;
     args.hkdf_op = hkdf_op;
-    args.ecx_op = ecx_op;
     args.jobs = OPENSSL_malloc(sizeof(ASYNC_JOB*)*async_jobs);
     if (args.jobs == NULL) {
         WARN("# FAIL: Unable to allocate args.jobs\n");
@@ -1377,8 +1373,9 @@ static void functional_test(void)
     } else if (test_alg == TEST_TYPE_MAX - 1) {
         args.count = &test_count;
         tests_run(&args, 0);
-    } else
+    } else {
         tests_run(&args, 0);
+    }
 
     for (i =0; i < async_jobs; i++)
         ASYNC_WAIT_CTX_free(args.awcs[i]);
@@ -1508,12 +1505,10 @@ int main(int argc, char *argv[])
         printf("\tPRF Operation:        %d\n", prf_op);
     if (hkdf_op != -1)
         printf("\tHKDF Operation:       %d\n", hkdf_op);
-    if (ecx_op != -1)
-        printf("\tECX Operation:        %s\n", ecx_op ? "X448" : "X25519");
     printf("\tSW Fallback:          %s\n", sw_fallback ? "Yes" : "No");
     printf("\n");
 
-    if (enable_perf == 0)
+    if (!enable_perf)
         functional_test();
     else
         performance_test();
@@ -1523,7 +1518,7 @@ int main(int argc, char *argv[])
                              enable_external_polling,
                              enable_event_driven_polling, sw_fallback);
 #ifdef QAT_OPENSSL_PROVIDER
-    else if (provider)
+    if (provider)
         tests_cleanup_provider(provider);
 #endif
 

diff --git a/test/tests.h b/test/tests.h
@@ -79,13 +79,13 @@ struct test_params_t {
     char *digest_kdf;
     int prf_op;
     int hkdf_op;
-    int ecx_op;
     int explicit_engine;
     int sign_only;
     int verify_only;
     int encrypt_only;
     int decrypt_only;
     int rsa_all;
+    int padding;
     int async_jobs;
     ASYNC_JOB **jobs;
     ASYNC_WAIT_CTX **awcs;
@@ -97,19 +97,6 @@ struct async_additional_args_dsa {
     int local_verify;
 };
 
-struct async_additional_args_rsa {
-    int sign_only;
-    int verify_only;
-    int encrypt_only;
-    int decrypt_only;
-    int rsa_all;
-    int padding;
-};
-
-struct async_additional_args_kdf {
-    int operation;
-};
-
 #ifdef QAT_OPENSSL_3
 struct async_args_callback {
     int job_ready;
@@ -201,7 +188,9 @@ enum curve_name {
     B_CURVE_409,
     B_CURVE_571,
     P_CURVE_SM2,
-    CURVE_TYPE_MAX
+    X_CURVE_25519,
+    X_CURVE_448,
+    CURVE_TYPE_MAX,
 };
 
 #define SSL_MAX_DIGEST 6

diff --git a/test/tests_dsa.c b/test/tests_dsa.c
@@ -176,89 +176,92 @@ static unsigned char dsa1024_g[] = {
     0x6A, 0x7E, 0xD8, 0x32, 0xED, 0x0E, 0x02, 0xB8,
 };
 
+/* dsa 2048-256 */
 static unsigned char dsa2048_priv[] = {
-    0x32, 0x67, 0x92, 0xf6, 0xc4, 0xe2, 0xe2, 0xe8, 0xa0, 0x8b, 0x6b, 0x45,
-    0x0c, 0x8a, 0x76, 0xb0, 0xee, 0xcf, 0x91, 0xa7,
+    0x69, 0xC7, 0x54, 0x8C, 0x21, 0xD0, 0xDF, 0xEA, 0x6B, 0x9A, 0x51, 0xC9,
+    0xEA, 0xD4, 0xE2, 0x7C, 0x33, 0xD3, 0xB3, 0xF1, 0x80, 0x31, 0x6E, 0x5B,
+    0xCA, 0xB9, 0x2C, 0x93, 0x3F, 0x0E, 0x4D, 0xBC
 };
 
 static unsigned char dsa2048_pub[] = {
-    0x17, 0x8f, 0xa8, 0x11, 0x84, 0x92, 0xec, 0x83, 0x47, 0xc7, 0x6a, 0xb0,
-    0x92, 0xaf, 0x5a, 0x20, 0x37, 0xa3, 0x64, 0x79, 0xd2, 0xd0, 0x3d, 0xcd,
-    0xe0, 0x61, 0x88, 0x88, 0x21, 0xcc, 0x74, 0x5d, 0xce, 0x4c, 0x51, 0x47,
-    0xf0, 0xc5, 0x5c, 0x4c, 0x82, 0x7a, 0xaf, 0x72, 0xad, 0xb9, 0xe0, 0x53,
-    0xf2, 0x78, 0xb7, 0xf0, 0xb5, 0x48, 0x7f, 0x8a, 0x3a, 0x18, 0xd1, 0x9f,
-    0x8b, 0x7d, 0xa5, 0x47, 0xb7, 0x95, 0xab, 0x98, 0xf8, 0x7b, 0x74, 0x50,
-    0x56, 0x8e, 0x57, 0xf0, 0xee, 0xf5, 0xb7, 0xba, 0xab, 0x85, 0x86, 0xf9,
-    0x2b, 0xef, 0x41, 0x56, 0xa0, 0xa4, 0x9f, 0xb7, 0x38, 0x00, 0x46, 0x0a,
-    0xa6, 0xf1, 0xfc, 0x1f, 0xd8, 0x4e, 0x85, 0x44, 0x92, 0x43, 0x21, 0x5d,
-    0x6e, 0xcc, 0xc2, 0xcb, 0x26, 0x31, 0x0d, 0x21, 0xc4, 0xbd, 0x8d, 0x24,
-    0xbc, 0xd9, 0x18, 0x19, 0xd7, 0xdc, 0xf1, 0xe7, 0x93, 0x50, 0x48, 0x03,
-    0x2c, 0xae, 0x2e, 0xe7, 0x49, 0x88, 0x5f, 0x93, 0x57, 0x27, 0x99, 0x36,
-    0xb4, 0x20, 0xab, 0xfc, 0xa7, 0x2b, 0xf2, 0xd9, 0x98, 0xd7, 0xd4, 0x34,
-    0x9d, 0x96, 0x50, 0x58, 0x9a, 0xea, 0x54, 0xf3, 0xee, 0xf5, 0x63, 0x14,
-    0xee, 0x85, 0x83, 0x74, 0x76, 0xe1, 0x52, 0x95, 0xc3, 0xf7, 0xeb, 0x04,
-    0x04, 0x7b, 0xa7, 0x28, 0x1b, 0xcc, 0xea, 0x4a, 0x4e, 0x84, 0xda, 0xd8,
-    0x9c, 0x79, 0xd8, 0x9b, 0x66, 0x89, 0x2f, 0xcf, 0xac, 0xd7, 0x79, 0xf9,
-    0xa9, 0xd8, 0x45, 0x13, 0x78, 0xb9, 0x00, 0x14, 0xc9, 0x7e, 0x22, 0x51,
-    0x86, 0x67, 0xb0, 0x9f, 0x26, 0x11, 0x23, 0xc8, 0x38, 0xd7, 0x70, 0x1d,
-    0x15, 0x8e, 0x4d, 0x4f, 0x95, 0x97, 0x40, 0xa1, 0xc2, 0x7e, 0x01, 0x18,
-    0x72, 0xf4, 0x10, 0xe6, 0x8d, 0x52, 0x16, 0x7f, 0xf2, 0xc9, 0xf8, 0x33,
-    0x8b, 0x33, 0xb7, 0xce,
+    0x66, 0x70, 0x98, 0xC6, 0x54, 0x42, 0x6C, 0x78, 0xD7, 0xF8, 0x20, 0x1E,
+    0xAC, 0x6C, 0x20, 0x3E, 0xF0, 0x30, 0xD4, 0x36, 0x05, 0x03, 0x2C, 0x2F,
+    0x1F, 0xA9, 0x37, 0xE5, 0x23, 0x7D, 0xBD, 0x94, 0x9F, 0x34, 0xA0, 0xA2,
+    0x56, 0x4F, 0xE1, 0x26, 0xDC, 0x8B, 0x71, 0x5C, 0x51, 0x41, 0x80, 0x2C,
+    0xE0, 0x97, 0x9C, 0x82, 0x46, 0x46, 0x3C, 0x40, 0xE6, 0xB6, 0xBD, 0xAA,
+    0x25, 0x13, 0xFA, 0x61, 0x17, 0x28, 0x71, 0x6C, 0x2E, 0x4F, 0xD5, 0x3B,
+    0xC9, 0x5B, 0x89, 0xE6, 0x99, 0x49, 0xD9, 0x65, 0x12, 0xE8, 0x73, 0xB9,
+    0xC8, 0xF8, 0xDF, 0xD4, 0x99, 0xCC, 0x31, 0x28, 0x82, 0x56, 0x1A, 0xDE,
+    0xCB, 0x31, 0xF6, 0x58, 0xE9, 0x34, 0xC0, 0xC1, 0x97, 0xF2, 0xC4, 0xD9,
+    0x6B, 0x05, 0xCB, 0xAD, 0x67, 0x38, 0x1E, 0x7B, 0x76, 0x88, 0x91, 0xE4,
+    0xDA, 0x38, 0x43, 0xD2, 0x4D, 0x94, 0xCD, 0xFB, 0x51, 0x26, 0xE9, 0xB8,
+    0xBF, 0x21, 0xE8, 0x35, 0x8E, 0xE0, 0xE0, 0xA3, 0x0E, 0xF1, 0x3F, 0xD6,
+    0xA6, 0x64, 0xC0, 0xDC, 0xE3, 0x73, 0x1F, 0x7F, 0xB4, 0x9A, 0x48, 0x45,
+    0xA4, 0xFD, 0x82, 0x54, 0x68, 0x79, 0x72, 0xA2, 0xD3, 0x82, 0x59, 0x9C,
+    0x9B, 0xAC, 0x4E, 0x0E, 0xD7, 0x99, 0x81, 0x93, 0x07, 0x89, 0x13, 0x03,
+    0x25, 0x58, 0x13, 0x49, 0x76, 0x41, 0x0B, 0x89, 0xD2, 0xC1, 0x71, 0xD1,
+    0x23, 0xAC, 0x35, 0xFD, 0x97, 0x72, 0x19, 0x59, 0x7A, 0xA7, 0xD1, 0x5C,
+    0x1A, 0x9A, 0x42, 0x8E, 0x59, 0x19, 0x4F, 0x75, 0xC7, 0x21, 0xEB, 0xCB,
+    0xCF, 0xAE, 0x44, 0x69, 0x6A, 0x49, 0x9A, 0xFA, 0x74, 0xE0, 0x42, 0x99,
+    0xF1, 0x32, 0x02, 0x66, 0x01, 0x63, 0x8C, 0xB8, 0x7A, 0xB7, 0x91, 0x90,
+    0xD4, 0xA0, 0x98, 0x63, 0x15, 0xDA, 0x8E, 0xEC, 0x65, 0x61, 0xC9, 0x38,
+    0x99, 0x6B, 0xEA, 0xDF
 };
 
 static unsigned char dsa2048_p[] = {
-    0xA0, 0x25, 0xFA, 0xAD, 0xF4, 0x8E, 0xB9, 0xE5, 0x99, 0xF3, 0x5D, 0x6F,
-    0x4F, 0x83, 0x34, 0xE2, 0x7E, 0xCF, 0x6F, 0xBF, 0x30, 0xAF, 0x6F, 0x81,
-    0xEB, 0xF8, 0xC4, 0x13, 0xD9, 0xA0, 0x5D, 0x8B, 0x5C, 0x8E, 0xDC, 0xC2,
-    0x1D, 0x0B, 0x41, 0x32, 0xB0, 0x1F, 0xFE, 0xEF, 0x0C, 0xC2, 0xA2, 0x7E,
-    0x68, 0x5C, 0x28, 0x21, 0xE9, 0xF5, 0xB1, 0x58, 0x12, 0x63, 0x4C, 0x19,
-    0x4E, 0xFF, 0x02, 0x4B, 0x92, 0xED, 0xD2, 0x07, 0x11, 0x4D, 0x8C, 0x58,
-    0x16, 0x5C, 0x55, 0x8E, 0xAD, 0xA3, 0x67, 0x7D, 0xB9, 0x86, 0x6E, 0x0B,
-    0xE6, 0x54, 0x6F, 0x40, 0xAE, 0x0E, 0x67, 0x4C, 0xF9, 0x12, 0x5B, 0x3C,
-    0x08, 0x7A, 0xF7, 0xFC, 0x67, 0x86, 0x69, 0xE7, 0x0A, 0x94, 0x40, 0xBF,
-    0x8B, 0x76, 0xFE, 0x26, 0xD1, 0xF2, 0xA1, 0x1A, 0x84, 0xA1, 0x43, 0x56,
-    0x28, 0xBC, 0x9A, 0x5F, 0xD7, 0x3B, 0x69, 0x89, 0x8A, 0x36, 0x2C, 0x51,
-    0xDF, 0x12, 0x77, 0x2F, 0x57, 0x7B, 0xA0, 0xAA, 0xDD, 0x7F, 0xA1, 0x62,
-    0x3B, 0x40, 0x7B, 0x68, 0x1A, 0x8F, 0x0D, 0x38, 0xBB, 0x21, 0x5D, 0x18,
-    0xFC, 0x0F, 0x46, 0xF7, 0xA3, 0xB0, 0x1D, 0x23, 0xC3, 0xD2, 0xC7, 0x72,
-    0x51, 0x18, 0xDF, 0x46, 0x95, 0x79, 0xD9, 0xBD, 0xB5, 0x19, 0x02, 0x2C,
-    0x87, 0xDC, 0xE7, 0x57, 0x82, 0x7E, 0xF1, 0x8B, 0x06, 0x3D, 0x00, 0xA5,
-    0x7B, 0x6B, 0x26, 0x27, 0x91, 0x0F, 0x6A, 0x77, 0xE4, 0xD5, 0x04, 0xE4,
-    0x12, 0x2C, 0x42, 0xFF, 0xD2, 0x88, 0xBB, 0xD3, 0x92, 0xA0, 0xF9, 0xC8,
-    0x51, 0x64, 0x14, 0x5C, 0xD8, 0xF9, 0x6C, 0x47, 0x82, 0xB4, 0x1C, 0x7F,
-    0x09, 0xB8, 0xF0, 0x25, 0x83, 0x1D, 0x3F, 0x3F, 0x05, 0xB3, 0x21, 0x0A,
-    0x5D, 0xA7, 0xD8, 0x54, 0xC3, 0x65, 0x7D, 0xC3, 0xB0, 0x1D, 0xBF, 0xAE,
-    0xF8, 0x68, 0xCF, 0x9B,
+    0x9D, 0xB6, 0xFB, 0x59, 0x51, 0xB6, 0x6B, 0xB6, 0xFE, 0x1E, 0x14, 0x0F,
+    0x1D, 0x2C, 0xE5, 0x50, 0x23, 0x74, 0x16, 0x1F, 0xD6, 0x53, 0x8D, 0xF1,
+    0x64, 0x82, 0x18, 0x64, 0x2F, 0x0B, 0x5C, 0x48, 0xC8, 0xF7, 0xA4, 0x1A,
+    0xAD, 0xFA, 0x18, 0x73, 0x24, 0xB8, 0x76, 0x74, 0xFA, 0x18, 0x22, 0xB0,
+    0x0F, 0x1E, 0xCF, 0x81, 0x36, 0x94, 0x3D, 0x7C, 0x55, 0x75, 0x72, 0x64,
+    0xE5, 0xA1, 0xA4, 0x4F, 0xFE, 0x01, 0x2E, 0x99, 0x36, 0xE0, 0x0C, 0x1D,
+    0x3E, 0x93, 0x10, 0xB0, 0x1C, 0x7D, 0x17, 0x98, 0x05, 0xD3, 0x05, 0x8B,
+    0x2A, 0x9F, 0x4B, 0xB6, 0xF9, 0x71, 0x6B, 0xFE, 0x61, 0x17, 0xC6, 0xB5,
+    0xB3, 0xCC, 0x4D, 0x9B, 0xE3, 0x41, 0x10, 0x4A, 0xD4, 0xA8, 0x0A, 0xD6,
+    0xC9, 0x4E, 0x00, 0x5F, 0x4B, 0x99, 0x3E, 0x14, 0xF0, 0x91, 0xEB, 0x51,
+    0x74, 0x3B, 0xF3, 0x30, 0x50, 0xC3, 0x8D, 0xE2, 0x35, 0x56, 0x7E, 0x1B,
+    0x34, 0xC3, 0xD6, 0xA5, 0xC0, 0xCE, 0xAA, 0x1A, 0x0F, 0x36, 0x82, 0x13,
+    0xC3, 0xD1, 0x98, 0x43, 0xD0, 0xB4, 0xB0, 0x9D, 0xCB, 0x9F, 0xC7, 0x2D,
+    0x39, 0xC8, 0xDE, 0x41, 0xF1, 0xBF, 0x14, 0xD4, 0xBB, 0x45, 0x63, 0xCA,
+    0x28, 0x37, 0x16, 0x21, 0xCA, 0xD3, 0x32, 0x4B, 0x6A, 0x2D, 0x39, 0x21,
+    0x45, 0xBE, 0xBF, 0xAC, 0x74, 0x88, 0x05, 0x23, 0x6F, 0x5C, 0xA2, 0xFE,
+    0x92, 0xB8, 0x71, 0xCD, 0x8F, 0x9C, 0x36, 0xD3, 0x29, 0x2B, 0x55, 0x09,
+    0xCA, 0x8C, 0xAA, 0x77, 0xA2, 0xAD, 0xFC, 0x7B, 0xFD, 0x77, 0xDD, 0xA6,
+    0xF7, 0x11, 0x25, 0xA7, 0x45, 0x6F, 0xEA, 0x15, 0x3E, 0x43, 0x32, 0x56,
+    0xA2, 0x26, 0x1C, 0x6A, 0x06, 0xED, 0x36, 0x93, 0x79, 0x7E, 0x79, 0x95,
+    0xFA, 0xD5, 0xAA, 0xBB, 0xCF, 0xBE, 0x3E, 0xDA, 0x27, 0x41, 0xE3, 0x75,
+    0x40, 0x4A, 0xE2, 0x5B
 };
 
 static unsigned char dsa2048_q[] = {
-    0x97, 0xE7, 0x33, 0x4D, 0xD3, 0x94, 0x3E, 0x0B, 0xDB, 0x62, 0x74, 0xC6,
-    0xA1, 0x08, 0xDD, 0x19, 0xA3, 0x75, 0x17, 0x1B,
+    0xF2, 0xC3, 0x11, 0x93, 0x74, 0xCE, 0x76, 0xC9, 0x35, 0x69, 0x90, 0xB4,
+    0x65, 0x37, 0x4A, 0x17, 0xF2, 0x3F, 0x9E, 0xD3, 0x50, 0x89, 0xBD, 0x96,
+    0x9F, 0x61, 0xC6, 0xDD, 0xE9, 0x99, 0x8C, 0x1F
 };
 
 static unsigned char dsa2048_g[] = {
-    0x2C, 0x78, 0x16, 0x59, 0x34, 0x63, 0xF4, 0xF3, 0x92, 0xFC, 0xB5, 0xA5,
-    0x4F, 0x13, 0xDE, 0x2F, 0x1C, 0xA4, 0x3C, 0xAE, 0xAD, 0x38, 0x3F, 0x7E,
-    0x90, 0xBF, 0x96, 0xA6, 0xAE, 0x25, 0x90, 0x72, 0xF5, 0x8E, 0x80, 0x0C,
-    0x39, 0x1C, 0xD9, 0xEC, 0xBA, 0x90, 0x5B, 0x3A, 0xE8, 0x58, 0x6C, 0x9E,
-    0x30, 0x42, 0x37, 0x02, 0x31, 0x82, 0xBC, 0x6A, 0xDF, 0x6A, 0x09, 0x29,
-    0xE3, 0xC0, 0x46, 0xD1, 0xCB, 0x85, 0xEC, 0x0C, 0x30, 0x5E, 0xEA, 0xC8,
-    0x39, 0x8E, 0x22, 0x9F, 0x22, 0x10, 0xD2, 0x34, 0x61, 0x68, 0x37, 0x3D,
-    0x2E, 0x4A, 0x5B, 0x9A, 0xF5, 0xC1, 0x48, 0xC6, 0xF6, 0xDC, 0x63, 0x1A,
-    0xD3, 0x96, 0x64, 0xBA, 0x34, 0xC9, 0xD1, 0xA0, 0xD1, 0xAE, 0x6C, 0x2F,
-    0x48, 0x17, 0x93, 0x14, 0x43, 0xED, 0xF0, 0x21, 0x30, 0x19, 0xC3, 0x1B,
-    0x5F, 0xDE, 0xA3, 0xF0, 0x70, 0x78, 0x18, 0xE1, 0xA8, 0xE4, 0xEE, 0x2E,
-    0x00, 0xA5, 0xE4, 0xB3, 0x17, 0xC8, 0x0C, 0x7D, 0x6E, 0x42, 0xDC, 0xB7,
-    0x46, 0x00, 0x36, 0x4D, 0xD4, 0x46, 0xAA, 0x3D, 0x3C, 0x46, 0x89, 0x40,
-    0xBF, 0x1D, 0x84, 0x77, 0x0A, 0x75, 0xF3, 0x87, 0x1D, 0x08, 0x4C, 0xA6,
-    0xD1, 0xA9, 0x1C, 0x1E, 0x12, 0x1E, 0xE1, 0xC7, 0x30, 0x28, 0x76, 0xA5,
-    0x7F, 0x6C, 0x85, 0x96, 0x2B, 0x6F, 0xDB, 0x80, 0x66, 0x26, 0xAE, 0xF5,
-    0x93, 0xC7, 0x8E, 0xAE, 0x9A, 0xED, 0xE4, 0xCA, 0x04, 0xEA, 0x3B, 0x72,
-    0xEF, 0xDC, 0x87, 0xED, 0x0D, 0xA5, 0x4C, 0x4A, 0xDD, 0x71, 0x22, 0x64,
-    0x59, 0x69, 0x4E, 0x8E, 0xBF, 0x43, 0xDC, 0xAB, 0x8E, 0x66, 0xBB, 0x01,
-    0xB6, 0xF4, 0xE7, 0xFD, 0xD2, 0xAD, 0x9F, 0x36, 0xC1, 0xA0, 0x29, 0x99,
-    0xD1, 0x96, 0x70, 0x59, 0x06, 0x78, 0x35, 0xBD, 0x65, 0x55, 0x52, 0x9E,
-    0xF8, 0xB2, 0xE5, 0x38,
+    0x5C, 0x7F, 0xF6, 0xB0, 0x6F, 0x8F, 0x14, 0x3F, 0xE8, 0x28, 0x84, 0x33,
+    0x49, 0x3E, 0x47, 0x69, 0xC4, 0xD9, 0x88, 0xAC, 0xE5, 0xBE, 0x25, 0xA0,
+    0xE2, 0x48, 0x09, 0x67, 0x07, 0x16, 0xC6, 0x13, 0xD7, 0xB0, 0xCE, 0xE6,
+    0x93, 0x2F, 0x8F, 0xAA, 0x7C, 0x44, 0xD2, 0xCB, 0x24, 0x52, 0x3D, 0xA5,
+    0x3F, 0xBE, 0x4F, 0x6E, 0xC3, 0x59, 0x58, 0x92, 0xD1, 0xAA, 0x58, 0xC4,
+    0x32, 0x8A, 0x06, 0xC4, 0x6A, 0x15, 0x66, 0x2E, 0x7E, 0xAA, 0x70, 0x3A,
+    0x1D, 0xEC, 0xF8, 0xBB, 0xB2, 0xD0, 0x5D, 0xBE, 0x2E, 0xB9, 0x56, 0xC1,
+    0x42, 0xA3, 0x38, 0x66, 0x1D, 0x10, 0x46, 0x1C, 0x0D, 0x13, 0x54, 0x72,
+    0x08, 0x50, 0x57, 0xF3, 0x49, 0x43, 0x09, 0xFF, 0xA7, 0x3C, 0x61, 0x1F,
+    0x78, 0xB3, 0x2A, 0xDB, 0xB5, 0x74, 0x0C, 0x36, 0x1C, 0x9F, 0x35, 0xBE,
+    0x90, 0x99, 0x7D, 0xB2, 0x01, 0x4E, 0x2E, 0xF5, 0xAA, 0x61, 0x78, 0x2F,
+    0x52, 0xAB, 0xEB, 0x8B, 0xD6, 0x43, 0x2C, 0x4D, 0xD0, 0x97, 0xBC, 0x54,
+    0x23, 0xB2, 0x85, 0xDA, 0xFB, 0x60, 0xDC, 0x36, 0x4E, 0x81, 0x61, 0xF4,
+    0xA2, 0xA3, 0x5A, 0xCA, 0x3A, 0x10, 0xB1, 0xC4, 0xD2, 0x03, 0xCC, 0x76,
+    0xA4, 0x70, 0xA3, 0x3A, 0xFD, 0xCB, 0xDD, 0x92, 0x95, 0x98, 0x59, 0xAB,
+    0xD8, 0xB5, 0x6E, 0x17, 0x25, 0x25, 0x2D, 0x78, 0xEA, 0xC6, 0x6E, 0x71,
+    0xBA, 0x9A, 0xE3, 0xF1, 0xDD, 0x24, 0x87, 0x19, 0x98, 0x74, 0x39, 0x3C,
+    0xD4, 0xD8, 0x32, 0x18, 0x68, 0x00, 0x65, 0x47, 0x60, 0xE1, 0xE3, 0x4C,
+    0x09, 0xE4, 0xD1, 0x55, 0x17, 0x9F, 0x9E, 0xC0, 0xDC, 0x44, 0x73, 0xF9,
+    0x96, 0xBD, 0xCE, 0x6E, 0xED, 0x1C, 0xAB, 0xED, 0x8B, 0x6F, 0x11, 0x6F,
+    0x7A, 0xD9, 0xCF, 0x50, 0x5D, 0xF0, 0xF9, 0x98, 0xE3, 0x4A, 0xB2, 0x75,
+    0x14, 0xB0, 0xFF, 0xE7
 };
 
 typedef struct testdsa_st {
@@ -513,7 +516,7 @@ static int run_dsa(void *args)
     dsa_verify_ctx = EVP_PKEY_CTX_new(dsa_key, NULL);
     if (dsa_verify_ctx == NULL
         || EVP_PKEY_verify_init(dsa_verify_ctx) <= 0
-        || EVP_PKEY_verify(dsa_verify_ctx, buf2, sigsize, buf, 36) <= 0){
+        || EVP_PKEY_verify(dsa_verify_ctx, buf2, sigsize, buf, 20) <= 0){
         WARN("# FAIL DSA verify init failed! \n");
         goto end;
     }

diff --git a/test/tests_ecdh.c b/test/tests_ecdh.c
@@ -371,9 +371,9 @@ static int test_ecdh_curve(ENGINE * e,
         }
     }
     if (!ret) {
-        if (!ecdh_negative_testcount )
+        if (!ecdh_negative_testcount ) {
             INFO("# PASS verify for ECDH.\n");
-        else {
+        } else {
             INFO("# FAIL verify for ECDH.\n");
             BIO_printf(out,"Negative scenario %d: verify Passed unexpectedly ",
                        ecdh_negative_testcount );
@@ -387,7 +387,7 @@ static int test_ecdh_curve(ENGINE * e,
         BIO_puts(out,"\nTesting key generation with ");
         BIO_puts(out,text);
         BIO_puts(out,"\n");
-       }
+    }
 
     key1 = get_ec_key(nid);
     key2 = get_ec_key(nid);
@@ -574,7 +574,7 @@ EVP_PKEY *get_ec_key(const int nid)
 static int run_ecdh(void *args)
 {
     BN_CTX *ctx = NULL;
-    int i = 0, j = 0;
+    int i = 0;
     BIO *out = NULL;
     int ret = 1;
 
@@ -610,24 +610,11 @@ static int run_ecdh(void *args)
     if(enable_negative > 0)
        ecdh_negative_testcount = ECDH_NEGATIVE_TESTCOUNT;
 
-    if (curve) {
-            for (i = 0; i <= ecdh_negative_testcount; i++) {
-                  if (test_ecdh_curve(e, get_nid(curve), ecdh_curve_name(curve),
-                          ctx, count, print_output, verify, out, kdf, i) < 0) {
-                          ret = 0;
-                     }
-            }
-     }
-     else {
-          for (i = 0; i <= ecdh_negative_testcount; i++) {
-               for (j = 1; j < CURVE_TYPE_MAX; j++) {
-                    if (test_ecdh_curve(e, get_nid(j), ecdh_curve_name(j), ctx,
-                           count, print_output, verify, out, kdf, i) < 0) {
-                    ret = 0;
-                    }
-               }
-         }
-     }
+    for (i = 0; i <= ecdh_negative_testcount; i++) {
+        if (test_ecdh_curve(e, get_nid(curve), ecdh_curve_name(curve),
+                    ctx, count, print_output, verify, out, kdf, i) < 0)
+            ret = 0;
+    }
 err:
     if (ret != 1)
         ERR_print_errors_fp(stderr);

diff --git a/test/tests_ecdsa.c b/test/tests_ecdsa.c
@@ -590,7 +590,6 @@ static int test_ecdsa(int count, int size, ENGINE * e, int print_output,
 ******************************************************************************/
 static int run_ecdsa(void *args)
 {
-    int i = 0;
     int ret = 1;
 
     TEST_PARAMS *temp_args = (TEST_PARAMS *)args;
@@ -615,16 +614,9 @@ static int run_ecdsa(void *args)
 
     RAND_seed(rnd_seed, sizeof(rnd_seed));
 
-    if (!curve) {
-        for (i = 1; i < CURVE_TYPE_MAX; i++) {
-            if (test_ecdsa(count, size, e, print, verify, i,
-                           ne) < 0)
-                ret = 0;
-        }
-    } else if (test_ecdsa(count, size, e, print, verify, curve,
-                          ne) < 0) {
-            ret = 0;
-    }
+    if (test_ecdsa(count, size, e, print, verify, curve, ne) < 0)
+        ret = 0;
+
     return ret;
 }