diff options
author | Emilia Kasper <emilia@openssl.org> | 2016-06-09 23:09:48 +0200 |
---|---|---|
committer | Emilia Kasper <emilia@openssl.org> | 2016-06-20 14:58:36 +0200 |
commit | 9267c11bb5d408e43482173794f08a3c8472afba (patch) | |
tree | 172336307a646ab33854a51627192f3307eb6545 /test/ecdsatest.c | |
parent | b73cfb137e596f3e4396fbc5502ace3ff17cbaed (diff) | |
download | openssl-9267c11bb5d408e43482173794f08a3c8472afba.zip openssl-9267c11bb5d408e43482173794f08a3c8472afba.tar.gz openssl-9267c11bb5d408e43482173794f08a3c8472afba.tar.bz2 |
Make DSA_SIG and ECDSA_SIG getters const.
Reorder arguments to follow convention.
Also allow r/s to be NULL in DSA_SIG_get0, similarly to ECDSA_SIG_get0.
This complements GH1193 which adds non-const setters.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'test/ecdsatest.c')
-rw-r--r-- | test/ecdsatest.c | 39 |
1 files changed, 27 insertions, 12 deletions
diff --git a/test/ecdsatest.c b/test/ecdsatest.c index 932ea3b..538f9df 100644 --- a/test/ecdsatest.c +++ b/test/ecdsatest.c @@ -145,7 +145,7 @@ int x9_62_test_internal(BIO *out, int nid, const char *r_in, const char *s_in) ECDSA_SIG *signature = NULL; BIGNUM *r = NULL, *s = NULL; BIGNUM *kinv = NULL, *rp = NULL; - BIGNUM *sig_r, *sig_s; + const BIGNUM *sig_r, *sig_s; if (md_ctx == NULL) goto x962_int_err; @@ -180,7 +180,7 @@ int x9_62_test_internal(BIO *out, int nid, const char *r_in, const char *s_in) goto x962_int_err; if (!BN_dec2bn(&r, r_in) || !BN_dec2bn(&s, s_in)) goto x962_int_err; - ECDSA_SIG_get0(&sig_r, &sig_s, signature); + ECDSA_SIG_get0(signature, &sig_r, &sig_s); if (BN_cmp(sig_r, r) || BN_cmp(sig_s, s)) goto x962_int_err; BIO_printf(out, "."); @@ -251,13 +251,15 @@ int test_builtin(BIO *out) size_t crv_len = 0, n = 0; EC_KEY *eckey = NULL, *wrong_eckey = NULL; EC_GROUP *group; - ECDSA_SIG *ecdsa_sig = NULL; + ECDSA_SIG *ecdsa_sig = NULL, *modified_sig = NULL; unsigned char digest[20], wrong_digest[20]; unsigned char *signature = NULL; const unsigned char *sig_ptr; unsigned char *sig_ptr2; unsigned char *raw_buf = NULL; - BIGNUM *sig_r, *sig_s; + const BIGNUM *sig_r, *sig_s; + BIGNUM *modified_r = NULL, *modified_s = NULL; + BIGNUM *unmodified_r = NULL, *unmodified_s = NULL; unsigned int sig_len, degree, r_len, s_len, bn_len, buf_len; int nid, ret = 0; @@ -388,7 +390,7 @@ int test_builtin(BIO *out) goto builtin_err; } - ECDSA_SIG_get0(&sig_r, &sig_s, ecdsa_sig); + ECDSA_SIG_get0(ecdsa_sig, &sig_r, &sig_s); /* Store the two BIGNUMs in raw_buf. */ r_len = BN_num_bytes(sig_r); @@ -409,12 +411,18 @@ int test_builtin(BIO *out) dirt = raw_buf[11] ? raw_buf[11] : 1; raw_buf[offset] ^= dirt; /* Now read the BIGNUMs back in from raw_buf. */ - if ((BN_bin2bn(raw_buf, bn_len, sig_r) == NULL) || - (BN_bin2bn(raw_buf + bn_len, bn_len, sig_s) == NULL)) + modified_sig = ECDSA_SIG_new(); + if (modified_sig == NULL) goto builtin_err; - + if (((modified_r = BN_bin2bn(raw_buf, bn_len, NULL)) == NULL) + || ((modified_s = BN_bin2bn(raw_buf + bn_len, bn_len, NULL)) == NULL) + || !ECDSA_SIG_set0(modified_sig, modified_r, modified_s)) { + BN_free(modified_r); + BN_free(modified_s); + goto builtin_err; + } sig_ptr2 = signature; - sig_len = i2d_ECDSA_SIG(ecdsa_sig, &sig_ptr2); + sig_len = i2d_ECDSA_SIG(modified_sig, &sig_ptr2); if (ECDSA_verify(0, digest, 20, signature, sig_len, eckey) == 1) { BIO_printf(out, " failed\n"); goto builtin_err; @@ -423,12 +431,16 @@ int test_builtin(BIO *out) * Sanity check: undo the modification and verify signature. */ raw_buf[offset] ^= dirt; - if ((BN_bin2bn(raw_buf, bn_len, sig_r) == NULL) || - (BN_bin2bn(raw_buf + bn_len, bn_len, sig_s) == NULL)) + if (((unmodified_r = BN_bin2bn(raw_buf, bn_len, NULL)) == NULL) + || ((unmodified_s = BN_bin2bn(raw_buf + bn_len, bn_len, NULL)) == NULL) + || !ECDSA_SIG_set0(modified_sig, unmodified_r, unmodified_s)) { + BN_free(unmodified_r); + BN_free(unmodified_s); goto builtin_err; + } sig_ptr2 = signature; - sig_len = i2d_ECDSA_SIG(ecdsa_sig, &sig_ptr2); + sig_len = i2d_ECDSA_SIG(modified_sig, &sig_ptr2); if (ECDSA_verify(0, digest, 20, signature, sig_len, eckey) != 1) { BIO_printf(out, " failed\n"); goto builtin_err; @@ -448,6 +460,8 @@ int test_builtin(BIO *out) wrong_eckey = NULL; ECDSA_SIG_free(ecdsa_sig); ecdsa_sig = NULL; + ECDSA_SIG_free(modified_sig); + modified_sig = NULL; OPENSSL_free(raw_buf); raw_buf = NULL; } @@ -457,6 +471,7 @@ int test_builtin(BIO *out) EC_KEY_free(eckey); EC_KEY_free(wrong_eckey); ECDSA_SIG_free(ecdsa_sig); + ECDSA_SIG_free(modified_sig); OPENSSL_free(signature); OPENSSL_free(raw_buf); OPENSSL_free(curves); |