diff options
author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2011-05-20 20:50:03 +0200 |
---|---|---|
committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2011-05-20 20:50:03 +0200 |
commit | 03397384d1a3c5035d8a43c1ad0f1b2790f27c75 (patch) | |
tree | c8cfcd83d640f5fbc60382fa1316de37c0481569 /lib/auth | |
parent | 5854b4c2557dcb75c6263df32932047688d5c64b (diff) | |
download | gnutls-03397384d1a3c5035d8a43c1ad0f1b2790f27c75.tar.gz |
Account 'A' in calculations for point doubling.
Diffstat (limited to 'lib/auth')
-rw-r--r-- | lib/auth/ecdh_common.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/lib/auth/ecdh_common.c b/lib/auth/ecdh_common.c index e3d247e8c1..555ab4f9ef 100644 --- a/lib/auth/ecdh_common.c +++ b/lib/auth/ecdh_common.c @@ -52,17 +52,18 @@ int ret; pub.params[1] = session->key->ecdh_params.params[1]; pub.params[2] = session->key->ecdh_params.params[2]; pub.params[3] = session->key->ecdh_params.params[3]; - pub.params[4] = session->key->ecdh_x; - pub.params[5] = session->key->ecdh_y; - pub.params[6] = _gnutls_mpi_new(1); - if (pub.params[6] == NULL) + pub.params[4] = session->key->ecdh_params.params[4]; + pub.params[5] = session->key->ecdh_x; + pub.params[6] = session->key->ecdh_y; + pub.params[7] = _gnutls_mpi_new(1); + if (pub.params[7] == NULL) return gnutls_assert_val(GNUTLS_E_MEMORY_ERROR); - _gnutls_mpi_set_ui(pub.params[6], 1); + _gnutls_mpi_set_ui(pub.params[7], 1); ret = _gnutls_pk_derive(GNUTLS_PK_ECDH, &session->key->key, &session->key->ecdh_params, &pub); - _gnutls_mpi_release(&pub.params[6]); + _gnutls_mpi_release(&pub.params[7]); if (ret < 0) return gnutls_assert_val(ret); @@ -109,8 +110,8 @@ _gnutls_gen_ecdh_common_client_kx (gnutls_session_t session, gnutls_buffer_st* d if (ret < 0) return gnutls_assert_val(ret); - ret = _gnutls_ecc_ansi_x963_export(curve, session->key->ecdh_params.params[4] /* x */, - session->key->ecdh_params.params[5] /* y */, &out); + ret = _gnutls_ecc_ansi_x963_export(curve, session->key->ecdh_params.params[5] /* x */, + session->key->ecdh_params.params[6] /* y */, &out); if (ret < 0) return gnutls_assert_val(ret); @@ -187,8 +188,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[4] /* x */, - session->key->ecdh_params.params[5] /* y */, &out); + ret = _gnutls_ecc_ansi_x963_export(curve, session->key->ecdh_params.params[5] /* x */, + session->key->ecdh_params.params[6] /* y */, &out); if (ret < 0) return gnutls_assert_val(ret); |