diff --git a/test/ecdsatest.c b/test/ecdsatest.c index 95b642b1955dbbaf22a27548de7a8d210fb72b21..01a19cecd778267188a3a88707fc470cd359de0c 100644 --- a/test/ecdsatest.c +++ b/test/ecdsatest.c @@ -135,7 +135,7 @@ static int x9_62_test_internal(int nid, const char *r_in, const char *s_in) /* Use ECDSA_sign_setup to avoid use of ECDSA nonces */ if (!TEST_true(ECDSA_sign_setup(key, NULL, &kinv, &rp))) goto x962_int_err; - if (!TEST_ptr(signature = + if (!TEST_ptr(signature = ECDSA_do_sign_ex(digest, SHA_DIGEST_LENGTH, kinv, rp, key))) goto x962_int_err; @@ -151,7 +151,7 @@ static int x9_62_test_internal(int nid, const char *r_in, const char *s_in) /* verify the signature */ if (!TEST_int_eq(ECDSA_do_verify(digest, SHA_DIGEST_LENGTH, - signature, key), 1)) + signature, key), 1)) goto x962_int_err; ret = 1; @@ -213,8 +213,8 @@ static int test_builtin(void) EC_KEY *eckey = NULL, *wrong_eckey = NULL; EC_GROUP *group; ECDSA_SIG *ecdsa_sig = NULL, *modified_sig = NULL; - unsigned char digest[SHA512_DIGEST_LENGTH], - wrong_digest[SHA512_DIGEST_LENGTH]; + unsigned char digest[SHA512_DIGEST_LENGTH]; + unsigned char wrong_digest[SHA512_DIGEST_LENGTH]; unsigned char *signature = NULL; const unsigned char *sig_ptr; unsigned char *sig_ptr2; @@ -273,8 +273,8 @@ static int test_builtin(void) /* create signature */ sig_len = ECDSA_size(eckey); if (!TEST_ptr(signature = OPENSSL_malloc(sig_len)) - || !TEST_true(ECDSA_sign(0, digest, SHA512_DIGEST_LENGTH, - signature, &sig_len, eckey))) + || !TEST_true(ECDSA_sign(0, digest, SHA512_DIGEST_LENGTH, + signature, &sig_len, eckey))) goto builtin_err; /* verify signature */ @@ -335,7 +335,7 @@ static int test_builtin(void) goto builtin_err; if (!TEST_ptr(modified_r = BN_bin2bn(raw_buf, bn_len, NULL)) || !TEST_ptr(modified_s = BN_bin2bn(raw_buf + bn_len, - bn_len, NULL)) + bn_len, NULL)) || !TEST_true(ECDSA_SIG_set0(modified_sig, modified_r, modified_s))) { BN_free(modified_r); @@ -352,7 +352,7 @@ static int test_builtin(void) raw_buf[offset] ^= dirt; if (!TEST_ptr(unmodified_r = BN_bin2bn(raw_buf, bn_len, NULL)) || !TEST_ptr(unmodified_s = BN_bin2bn(raw_buf + bn_len, - bn_len, NULL)) + bn_len, NULL)) || !TEST_true(ECDSA_SIG_set0(modified_sig, unmodified_r, unmodified_s))) { BN_free(unmodified_r);