diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2013-04-02 21:48:39 +0200 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2013-04-02 21:50:28 +0200 |
| commit | fed208e129ccd61b19b0036d1ff5f55b62b496c2 (patch) | |
| tree | 831c868c1bf0df076556a88a12848183f6b6b575 /lib/auth/ecdhe.c | |
| parent | 59b455c597e7bc94f817e05a1aa5ed2950522268 (diff) | |
| download | gnutls-fed208e129ccd61b19b0036d1ff5f55b62b496c2.tar.gz | |
Removed elliptic curve code from gnutls. Use nettle's implementation.
Diffstat (limited to 'lib/auth/ecdhe.c')
| -rw-r--r-- | lib/auth/ecdhe.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/lib/auth/ecdhe.c b/lib/auth/ecdhe.c index 0c75caa9a4..0a7c03ea9c 100644 --- a/lib/auth/ecdhe.c +++ b/lib/auth/ecdhe.c @@ -91,12 +91,6 @@ gnutls_pk_params_st pub; int ret; memset(&pub,0,sizeof(pub)); - pub.params[ECC_PRIME] = session->key.ecdh_params.params[ECC_PRIME]; - pub.params[ECC_ORDER] = session->key.ecdh_params.params[ECC_ORDER]; - pub.params[ECC_A] = session->key.ecdh_params.params[ECC_A]; - pub.params[ECC_B] = session->key.ecdh_params.params[ECC_B]; - pub.params[ECC_GX] = session->key.ecdh_params.params[ECC_GX]; - pub.params[ECC_GY] = session->key.ecdh_params.params[ECC_GY]; pub.params[ECC_X] = session->key.ecdh_x; pub.params[ECC_Y] = session->key.ecdh_y; @@ -116,7 +110,6 @@ int ret; ret = _gnutls_set_psk_session_key (session, psk_key, &tmp_dh_key); _gnutls_free_datum (&tmp_dh_key); } - if (ret < 0) { @@ -202,8 +195,8 @@ _gnutls_gen_ecdh_common_client_kx_int (gnutls_session_t session, if (ret < 0) return gnutls_assert_val(ret); - ret = _gnutls_ecc_ansi_x963_export(curve, session->key.ecdh_params.params[6] /* x */, - session->key.ecdh_params.params[7] /* y */, &out); + ret = _gnutls_ecc_ansi_x963_export(curve, session->key.ecdh_params.params[ECC_X] /* x */, + session->key.ecdh_params.params[ECC_Y] /* y */, &out); if (ret < 0) return gnutls_assert_val(ret); @@ -304,8 +297,8 @@ int _gnutls_ecdh_common_print_server_kx (gnutls_session_t session, gnutls_buffer if (ret < 0) return gnutls_assert_val(ret); - ret = _gnutls_ecc_ansi_x963_export(curve, session->key.ecdh_params.params[6] /* x */, - session->key.ecdh_params.params[7] /* y */, &out); + ret = _gnutls_ecc_ansi_x963_export(curve, session->key.ecdh_params.params[ECC_X] /* x */, + session->key.ecdh_params.params[ECC_Y] /* y */, &out); if (ret < 0) return gnutls_assert_val(ret); |