diff options
author | Nicola Tuveri <nic.tuv@gmail.com> | 2017-04-11 19:36:06 +0300 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2017-04-12 15:04:17 +0200 |
commit | 5c64c1bfdedf96c60bc384dedc98ee824654f6a6 (patch) | |
tree | 2ab8004b6124ad03e22530a62ae4b077bc0f3d99 /test | |
parent | d663c2db5619088800695d5cb074c3ec5d158aec (diff) |
Remove stale code in ecdhtest.c
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3187)
Diffstat (limited to 'test')
-rw-r--r-- | test/ecdhtest.c | 196 |
1 files changed, 1 insertions, 195 deletions
diff --git a/test/ecdhtest.c b/test/ecdhtest.c index 0d94083e78..99f37d2b6b 100644 --- a/test/ecdhtest.c +++ b/test/ecdhtest.c @@ -49,200 +49,6 @@ int main(int argc, char *argv[]) static const char rnd_seed[] = "string to make the random number generator think it has entropy"; -static const int KDF1_SHA1_len = 20; -static void *KDF1_SHA1(const void *in, size_t inlen, void *out, - size_t *outlen) -{ - if (*outlen < SHA_DIGEST_LENGTH) - return NULL; - *outlen = SHA_DIGEST_LENGTH; - return SHA1(in, inlen, out); -} - -static int test_ecdh_curve(int nid, BN_CTX *ctx, BIO *out) -{ - EC_KEY *a = NULL; - EC_KEY *b = NULL; - BIGNUM *x_a = NULL, *y_a = NULL, *x_b = NULL, *y_b = NULL; - char buf[12]; - unsigned char *abuf = NULL, *bbuf = NULL; - int i, alen, blen, aout, bout, ret = 0; - const EC_GROUP *group; - - a = EC_KEY_new_by_curve_name(nid); - b = EC_KEY_new_by_curve_name(nid); - if (a == NULL || b == NULL) - goto err; - - group = EC_KEY_get0_group(a); - - if ((x_a = BN_new()) == NULL) - goto err; - if ((y_a = BN_new()) == NULL) - goto err; - if ((x_b = BN_new()) == NULL) - goto err; - if ((y_b = BN_new()) == NULL) - goto err; - - BIO_puts(out, "Testing key generation with "); - BIO_puts(out, OBJ_nid2sn(nid)); -# ifdef NOISY - BIO_puts(out, "\n"); -# else - (void)BIO_flush(out); -# endif - - if (!EC_KEY_generate_key(a)) - goto err; - - if (EC_METHOD_get_field_type(EC_GROUP_method_of(group)) == - NID_X9_62_prime_field) { - if (!EC_POINT_get_affine_coordinates_GFp - (group, EC_KEY_get0_public_key(a), x_a, y_a, ctx)) - goto err; - } -# ifndef OPENSSL_NO_EC2M - else { - if (!EC_POINT_get_affine_coordinates_GF2m(group, - EC_KEY_get0_public_key(a), - x_a, y_a, ctx)) - goto err; - } -# endif -# ifdef NOISY - BIO_puts(out, " pri 1="); - BN_print(out, a->priv_key); - BIO_puts(out, "\n pub 1="); - BN_print(out, x_a); - BIO_puts(out, ","); - BN_print(out, y_a); - BIO_puts(out, "\n"); -# else - BIO_printf(out, " ."); - (void)BIO_flush(out); -# endif - - if (!EC_KEY_generate_key(b)) - goto err; - - if (EC_METHOD_get_field_type(EC_GROUP_method_of(group)) == - NID_X9_62_prime_field) { - if (!EC_POINT_get_affine_coordinates_GFp - (group, EC_KEY_get0_public_key(b), x_b, y_b, ctx)) - goto err; - } -# ifndef OPENSSL_NO_EC2M - else { - if (!EC_POINT_get_affine_coordinates_GF2m(group, - EC_KEY_get0_public_key(b), - x_b, y_b, ctx)) - goto err; - } -# endif - -# ifdef NOISY - BIO_puts(out, " pri 2="); - BN_print(out, b->priv_key); - BIO_puts(out, "\n pub 2="); - BN_print(out, x_b); - BIO_puts(out, ","); - BN_print(out, y_b); - BIO_puts(out, "\n"); -# else - BIO_printf(out, "."); - (void)BIO_flush(out); -# endif - - alen = KDF1_SHA1_len; - abuf = OPENSSL_malloc(alen); - aout = - ECDH_compute_key(abuf, alen, EC_KEY_get0_public_key(b), a, KDF1_SHA1); - -# ifdef NOISY - BIO_puts(out, " key1 ="); - for (i = 0; i < aout; i++) { - sprintf(buf, "%02X", abuf[i]); - BIO_puts(out, buf); - } - BIO_puts(out, "\n"); -# else - BIO_printf(out, "."); - (void)BIO_flush(out); -# endif - - blen = KDF1_SHA1_len; - bbuf = OPENSSL_malloc(blen); - bout = - ECDH_compute_key(bbuf, blen, EC_KEY_get0_public_key(a), b, KDF1_SHA1); - -# ifdef NOISY - BIO_puts(out, " key2 ="); - for (i = 0; i < bout; i++) { - sprintf(buf, "%02X", bbuf[i]); - BIO_puts(out, buf); - } - BIO_puts(out, "\n"); -# else - BIO_printf(out, "."); - (void)BIO_flush(out); -# endif - - if ((aout < 4) || (bout != aout) || (memcmp(abuf, bbuf, aout) != 0)) { -# ifndef NOISY - BIO_printf(out, " failed\n\n"); - BIO_printf(out, "key a:\n"); - BIO_printf(out, "private key: "); - BN_print(out, EC_KEY_get0_private_key(a)); - BIO_printf(out, "\n"); - BIO_printf(out, "public key (x,y): "); - BN_print(out, x_a); - BIO_printf(out, ","); - BN_print(out, y_a); - BIO_printf(out, "\nkey b:\n"); - BIO_printf(out, "private key: "); - BN_print(out, EC_KEY_get0_private_key(b)); - BIO_printf(out, "\n"); - BIO_printf(out, "public key (x,y): "); - BN_print(out, x_b); - BIO_printf(out, ","); - BN_print(out, y_b); - BIO_printf(out, "\n"); - BIO_printf(out, "generated key a: "); - for (i = 0; i < bout; i++) { - sprintf(buf, "%02X", bbuf[i]); - BIO_puts(out, buf); - } - BIO_printf(out, "\n"); - BIO_printf(out, "generated key b: "); - for (i = 0; i < aout; i++) { - sprintf(buf, "%02X", abuf[i]); - BIO_puts(out, buf); - } - BIO_printf(out, "\n"); -# endif - fprintf(stderr, "Error in ECDH routines\n"); - ret = 0; - } else { -# ifndef NOISY - BIO_printf(out, " ok\n"); -# endif - ret = 1; - } - err: - ERR_print_errors_fp(stderr); - - OPENSSL_free(abuf); - OPENSSL_free(bbuf); - BN_free(x_a); - BN_free(y_a); - BN_free(x_b); - BN_free(y_b); - EC_KEY_free(b); - EC_KEY_free(a); - return (ret); -} - typedef struct { const int nid; const char *da; @@ -545,7 +351,7 @@ static int ecdh_cavs_kat(BIO *out, const ecdh_cavs_kat_t *kat) int main(int argc, char *argv[]) { BN_CTX *ctx = NULL; - int nid, ret = 1; + int ret = 1; EC_builtin_curve *curves = NULL; size_t crv_len = 0, n = 0; BIO *out; |