diff options
Diffstat (limited to 'lib/auth/ecdhe.c')
| -rw-r--r-- | lib/auth/ecdhe.c | 529 |
1 files changed, 281 insertions, 248 deletions
diff --git a/lib/auth/ecdhe.c b/lib/auth/ecdhe.c index 060c683233..8e8abbe498 100644 --- a/lib/auth/ecdhe.c +++ b/lib/auth/ecdhe.c @@ -42,308 +42,341 @@ #include <auth/cert.h> #include <gnutls_pk.h> -static int gen_ecdhe_server_kx (gnutls_session_t, gnutls_buffer_st*); +static int gen_ecdhe_server_kx(gnutls_session_t, gnutls_buffer_st *); static int -proc_ecdhe_server_kx (gnutls_session_t session, - uint8_t * data, size_t _data_size); +proc_ecdhe_server_kx(gnutls_session_t session, + uint8_t * data, size_t _data_size); static int -proc_ecdhe_client_kx (gnutls_session_t session, - uint8_t * data, size_t _data_size); +proc_ecdhe_client_kx(gnutls_session_t session, + uint8_t * data, size_t _data_size); #if defined(ENABLE_ECDHE) const mod_auth_st ecdhe_ecdsa_auth_struct = { - "ECDHE_ECDSA", - _gnutls_gen_cert_server_crt, - _gnutls_gen_cert_client_crt, - gen_ecdhe_server_kx, - _gnutls_gen_ecdh_common_client_kx, /* This is the only difference */ - _gnutls_gen_cert_client_crt_vrfy, - _gnutls_gen_cert_server_cert_req, - - _gnutls_proc_crt, - _gnutls_proc_crt, - proc_ecdhe_server_kx, - proc_ecdhe_client_kx, - _gnutls_proc_cert_client_crt_vrfy, - _gnutls_proc_cert_cert_req + "ECDHE_ECDSA", + _gnutls_gen_cert_server_crt, + _gnutls_gen_cert_client_crt, + gen_ecdhe_server_kx, + _gnutls_gen_ecdh_common_client_kx, /* This is the only difference */ + _gnutls_gen_cert_client_crt_vrfy, + _gnutls_gen_cert_server_cert_req, + + _gnutls_proc_crt, + _gnutls_proc_crt, + proc_ecdhe_server_kx, + proc_ecdhe_client_kx, + _gnutls_proc_cert_client_crt_vrfy, + _gnutls_proc_cert_cert_req }; const mod_auth_st ecdhe_rsa_auth_struct = { - "ECDHE_RSA", - _gnutls_gen_cert_server_crt, - _gnutls_gen_cert_client_crt, - gen_ecdhe_server_kx, - _gnutls_gen_ecdh_common_client_kx, /* This is the only difference */ - _gnutls_gen_cert_client_crt_vrfy, - _gnutls_gen_cert_server_cert_req, - - _gnutls_proc_crt, - _gnutls_proc_crt, - proc_ecdhe_server_kx, - proc_ecdhe_client_kx, - _gnutls_proc_cert_client_crt_vrfy, - _gnutls_proc_cert_cert_req + "ECDHE_RSA", + _gnutls_gen_cert_server_crt, + _gnutls_gen_cert_client_crt, + gen_ecdhe_server_kx, + _gnutls_gen_ecdh_common_client_kx, /* This is the only difference */ + _gnutls_gen_cert_client_crt_vrfy, + _gnutls_gen_cert_server_cert_req, + + _gnutls_proc_crt, + _gnutls_proc_crt, + proc_ecdhe_server_kx, + proc_ecdhe_client_kx, + _gnutls_proc_cert_client_crt_vrfy, + _gnutls_proc_cert_cert_req }; -static int calc_ecdh_key( gnutls_session_t session, gnutls_datum_t * psk_key, - gnutls_ecc_curve_t curve) +static int calc_ecdh_key(gnutls_session_t session, + gnutls_datum_t * psk_key, + gnutls_ecc_curve_t curve) { -gnutls_pk_params_st pub; -int ret; - - memset(&pub,0,sizeof(pub)); - pub.params[ECC_X] = session->key.ecdh_x; - pub.params[ECC_Y] = session->key.ecdh_y; - pub.flags = curve; - - if (psk_key == NULL) - ret = _gnutls_pk_derive(GNUTLS_PK_EC, &session->key.key, &session->key.ecdh_params, &pub); - else - { - gnutls_datum_t tmp_dh_key; - - ret = _gnutls_pk_derive(GNUTLS_PK_EC, &tmp_dh_key, &session->key.ecdh_params, &pub); - if (ret < 0) - { - ret = gnutls_assert_val(ret); - goto cleanup; - } - - ret = _gnutls_set_psk_session_key (session, psk_key, &tmp_dh_key); - _gnutls_free_datum (&tmp_dh_key); - } - - if (ret < 0) - { - ret = gnutls_assert_val(ret); - goto cleanup; - } - - ret = 0; - -cleanup: - /* no longer needed */ - _gnutls_mpi_release (&session->key.ecdh_x); - _gnutls_mpi_release (&session->key.ecdh_y); - gnutls_pk_params_release( &session->key.ecdh_params); - return ret; + gnutls_pk_params_st pub; + int ret; + + memset(&pub, 0, sizeof(pub)); + pub.params[ECC_X] = session->key.ecdh_x; + pub.params[ECC_Y] = session->key.ecdh_y; + pub.flags = curve; + + if (psk_key == NULL) + ret = + _gnutls_pk_derive(GNUTLS_PK_EC, &session->key.key, + &session->key.ecdh_params, &pub); + else { + gnutls_datum_t tmp_dh_key; + + ret = + _gnutls_pk_derive(GNUTLS_PK_EC, &tmp_dh_key, + &session->key.ecdh_params, &pub); + if (ret < 0) { + ret = gnutls_assert_val(ret); + goto cleanup; + } + + ret = + _gnutls_set_psk_session_key(session, psk_key, + &tmp_dh_key); + _gnutls_free_datum(&tmp_dh_key); + } + + if (ret < 0) { + ret = gnutls_assert_val(ret); + goto cleanup; + } + + ret = 0; + + cleanup: + /* no longer needed */ + _gnutls_mpi_release(&session->key.ecdh_x); + _gnutls_mpi_release(&session->key.ecdh_y); + gnutls_pk_params_release(&session->key.ecdh_params); + return ret; } int _gnutls_proc_ecdh_common_client_kx(gnutls_session_t session, - uint8_t * data, size_t _data_size, - gnutls_ecc_curve_t curve, - gnutls_datum_t* psk_key) + uint8_t * data, size_t _data_size, + gnutls_ecc_curve_t curve, + gnutls_datum_t * psk_key) { - ssize_t data_size = _data_size; - int ret, i = 0; - int point_size; - - if (curve == GNUTLS_ECC_CURVE_INVALID) - return gnutls_assert_val(GNUTLS_E_ECC_NO_SUPPORTED_CURVES); - - DECR_LEN (data_size, 1); - point_size = data[i]; - i+=1; - - DECR_LEN (data_size, point_size); - ret = _gnutls_ecc_ansi_x963_import(&data[i], point_size, &session->key.ecdh_x, &session->key.ecdh_y); - if (ret < 0) - return gnutls_assert_val(ret); - - /* generate pre-shared key */ - ret = calc_ecdh_key(session, psk_key, curve); - if (ret < 0) - return gnutls_assert_val(ret); - - return 0; + ssize_t data_size = _data_size; + int ret, i = 0; + int point_size; + + if (curve == GNUTLS_ECC_CURVE_INVALID) + return gnutls_assert_val(GNUTLS_E_ECC_NO_SUPPORTED_CURVES); + + DECR_LEN(data_size, 1); + point_size = data[i]; + i += 1; + + DECR_LEN(data_size, point_size); + ret = + _gnutls_ecc_ansi_x963_import(&data[i], point_size, + &session->key.ecdh_x, + &session->key.ecdh_y); + if (ret < 0) + return gnutls_assert_val(ret); + + /* generate pre-shared key */ + ret = calc_ecdh_key(session, psk_key, curve); + if (ret < 0) + return gnutls_assert_val(ret); + + return 0; } static int -proc_ecdhe_client_kx (gnutls_session_t session, - uint8_t * data, size_t _data_size) +proc_ecdhe_client_kx(gnutls_session_t session, + uint8_t * data, size_t _data_size) { - gnutls_certificate_credentials_t cred; - - cred = (gnutls_certificate_credentials_t) - _gnutls_get_cred (session, GNUTLS_CRD_CERTIFICATE, NULL); - if (cred == NULL) - { - gnutls_assert (); - return GNUTLS_E_INSUFFICIENT_CREDENTIALS; - } - - return _gnutls_proc_ecdh_common_client_kx(session, data, _data_size, - _gnutls_session_ecc_curve_get(session), NULL); + gnutls_certificate_credentials_t cred; + + cred = (gnutls_certificate_credentials_t) + _gnutls_get_cred(session, GNUTLS_CRD_CERTIFICATE, NULL); + if (cred == NULL) { + gnutls_assert(); + return GNUTLS_E_INSUFFICIENT_CREDENTIALS; + } + + return _gnutls_proc_ecdh_common_client_kx(session, data, + _data_size, + _gnutls_session_ecc_curve_get + (session), NULL); } int -_gnutls_gen_ecdh_common_client_kx (gnutls_session_t session, - gnutls_buffer_st* data) +_gnutls_gen_ecdh_common_client_kx(gnutls_session_t session, + gnutls_buffer_st * data) { - return _gnutls_gen_ecdh_common_client_kx_int(session, data, NULL); + return _gnutls_gen_ecdh_common_client_kx_int(session, data, NULL); } int -_gnutls_gen_ecdh_common_client_kx_int (gnutls_session_t session, - gnutls_buffer_st* data, - gnutls_datum_t * psk_key) +_gnutls_gen_ecdh_common_client_kx_int(gnutls_session_t session, + gnutls_buffer_st * data, + gnutls_datum_t * psk_key) { - int ret; - gnutls_datum_t out; - int curve = _gnutls_session_ecc_curve_get(session); - - /* generate temporal key */ - ret = _gnutls_pk_generate(GNUTLS_PK_EC, curve, &session->key.ecdh_params); - if (ret < 0) - return gnutls_assert_val(ret); - - 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); - - ret = _gnutls_buffer_append_data_prefix(data, 8, out.data, out.size); - - _gnutls_free_datum(&out); - - if (ret < 0) - return gnutls_assert_val(ret); - - /* generate pre-shared key */ - ret = calc_ecdh_key(session, psk_key, curve); - if (ret < 0) - return gnutls_assert_val(ret); - - return data->length; + int ret; + gnutls_datum_t out; + int curve = _gnutls_session_ecc_curve_get(session); + + /* generate temporal key */ + ret = + _gnutls_pk_generate(GNUTLS_PK_EC, curve, + &session->key.ecdh_params); + if (ret < 0) + return gnutls_assert_val(ret); + + 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); + + ret = + _gnutls_buffer_append_data_prefix(data, 8, out.data, out.size); + + _gnutls_free_datum(&out); + + if (ret < 0) + return gnutls_assert_val(ret); + + /* generate pre-shared key */ + ret = calc_ecdh_key(session, psk_key, curve); + if (ret < 0) + return gnutls_assert_val(ret); + + return data->length; } static int -proc_ecdhe_server_kx (gnutls_session_t session, - uint8_t * data, size_t _data_size) +proc_ecdhe_server_kx(gnutls_session_t session, + uint8_t * data, size_t _data_size) { -int ret; -gnutls_datum_t vparams; + int ret; + gnutls_datum_t vparams; - ret = _gnutls_proc_ecdh_common_server_kx(session, data, _data_size); - if (ret < 0) - return gnutls_assert_val(ret); + ret = + _gnutls_proc_ecdh_common_server_kx(session, data, _data_size); + if (ret < 0) + return gnutls_assert_val(ret); - vparams.data = data; - vparams.size = ret; + vparams.data = data; + vparams.size = ret; - return _gnutls_proc_dhe_signature(session, data+ret, _data_size-ret, &vparams); + return _gnutls_proc_dhe_signature(session, data + ret, + _data_size - ret, &vparams); } int -_gnutls_proc_ecdh_common_server_kx (gnutls_session_t session, - uint8_t * data, size_t _data_size) +_gnutls_proc_ecdh_common_server_kx(gnutls_session_t session, + uint8_t * data, size_t _data_size) { - int i, ret, point_size; - gnutls_ecc_curve_t curve; - ssize_t data_size = _data_size; + int i, ret, point_size; + gnutls_ecc_curve_t curve; + ssize_t data_size = _data_size; - i = 0; - DECR_LEN (data_size, 1); - if (data[i++] != 3) - return gnutls_assert_val(GNUTLS_E_ECC_NO_SUPPORTED_CURVES); - - DECR_LEN (data_size, 2); - curve = _gnutls_tls_id_to_ecc_curve(_gnutls_read_uint16 (&data[i])); - i += 2; + i = 0; + DECR_LEN(data_size, 1); + if (data[i++] != 3) + return gnutls_assert_val(GNUTLS_E_ECC_NO_SUPPORTED_CURVES); - ret = _gnutls_session_supports_ecc_curve(session, curve); - if (ret < 0) - return gnutls_assert_val(ret); + DECR_LEN(data_size, 2); + curve = _gnutls_tls_id_to_ecc_curve(_gnutls_read_uint16(&data[i])); + i += 2; - _gnutls_session_ecc_curve_set(session, curve); + ret = _gnutls_session_supports_ecc_curve(session, curve); + if (ret < 0) + return gnutls_assert_val(ret); - DECR_LEN (data_size, 1); - point_size = data[i]; - i++; + _gnutls_session_ecc_curve_set(session, curve); - DECR_LEN (data_size, point_size); - ret = _gnutls_ecc_ansi_x963_import(&data[i], point_size, &session->key.ecdh_x, &session->key.ecdh_y); - if (ret < 0) - return gnutls_assert_val(ret); + DECR_LEN(data_size, 1); + point_size = data[i]; + i++; - i+=point_size; + DECR_LEN(data_size, point_size); + ret = + _gnutls_ecc_ansi_x963_import(&data[i], point_size, + &session->key.ecdh_x, + &session->key.ecdh_y); + if (ret < 0) + return gnutls_assert_val(ret); - return i; + i += point_size; + + return i; } /* If the psk flag is set, then an empty psk_identity_hint will * be inserted */ -int _gnutls_ecdh_common_print_server_kx (gnutls_session_t session, gnutls_buffer_st* data, - gnutls_ecc_curve_t curve) +int _gnutls_ecdh_common_print_server_kx(gnutls_session_t session, + gnutls_buffer_st * data, + gnutls_ecc_curve_t curve) { - uint8_t p; - int ret; - gnutls_datum_t out; - - if (curve == GNUTLS_ECC_CURVE_INVALID) - return gnutls_assert_val(GNUTLS_E_ECC_NO_SUPPORTED_CURVES); - - /* curve type */ - p = 3; - - ret = _gnutls_buffer_append_data(data, &p, 1); - if (ret < 0) - return gnutls_assert_val(ret); - - ret = _gnutls_buffer_append_prefix(data, 16, _gnutls_ecc_curve_get_tls_id(curve)); - if (ret < 0) - return gnutls_assert_val(ret); - - /* generate temporal key */ - ret = _gnutls_pk_generate(GNUTLS_PK_EC, curve, &session->key.ecdh_params); - if (ret < 0) - return gnutls_assert_val(ret); - - 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); - - ret = _gnutls_buffer_append_data_prefix(data, 8, out.data, out.size); - - _gnutls_free_datum(&out); - - if (ret < 0) - return gnutls_assert_val(ret); - - return data->length; + uint8_t p; + int ret; + gnutls_datum_t out; + + if (curve == GNUTLS_ECC_CURVE_INVALID) + return gnutls_assert_val(GNUTLS_E_ECC_NO_SUPPORTED_CURVES); + + /* curve type */ + p = 3; + + ret = _gnutls_buffer_append_data(data, &p, 1); + if (ret < 0) + return gnutls_assert_val(ret); + + ret = + _gnutls_buffer_append_prefix(data, 16, + _gnutls_ecc_curve_get_tls_id + (curve)); + if (ret < 0) + return gnutls_assert_val(ret); + + /* generate temporal key */ + ret = + _gnutls_pk_generate(GNUTLS_PK_EC, curve, + &session->key.ecdh_params); + if (ret < 0) + return gnutls_assert_val(ret); + + 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); + + ret = + _gnutls_buffer_append_data_prefix(data, 8, out.data, out.size); + + _gnutls_free_datum(&out); + + if (ret < 0) + return gnutls_assert_val(ret); + + return data->length; } static int -gen_ecdhe_server_kx (gnutls_session_t session, gnutls_buffer_st* data) +gen_ecdhe_server_kx(gnutls_session_t session, gnutls_buffer_st * data) { - int ret = 0; - gnutls_certificate_credentials_t cred; - - cred = (gnutls_certificate_credentials_t) - _gnutls_get_cred (session, GNUTLS_CRD_CERTIFICATE, NULL); - if (cred == NULL) - { - gnutls_assert (); - return GNUTLS_E_INSUFFICIENT_CREDENTIALS; - } - - if ((ret = _gnutls_auth_info_set (session, GNUTLS_CRD_CERTIFICATE, - sizeof (cert_auth_info_st), 0)) < 0) - { - gnutls_assert (); - return ret; - } - - ret = _gnutls_ecdh_common_print_server_kx (session, data, _gnutls_session_ecc_curve_get(session)); - if (ret < 0) - { - gnutls_assert (); - return ret; - } - - /* Generate the signature. */ - return _gnutls_gen_dhe_signature(session, data, data->data, data->length); + int ret = 0; + gnutls_certificate_credentials_t cred; + + cred = (gnutls_certificate_credentials_t) + _gnutls_get_cred(session, GNUTLS_CRD_CERTIFICATE, NULL); + if (cred == NULL) { + gnutls_assert(); + return GNUTLS_E_INSUFFICIENT_CREDENTIALS; + } + + if ((ret = _gnutls_auth_info_set(session, GNUTLS_CRD_CERTIFICATE, + sizeof(cert_auth_info_st), + 0)) < 0) { + gnutls_assert(); + return ret; + } + + ret = + _gnutls_ecdh_common_print_server_kx(session, data, + _gnutls_session_ecc_curve_get + (session)); + if (ret < 0) { + gnutls_assert(); + return ret; + } + + /* Generate the signature. */ + return _gnutls_gen_dhe_signature(session, data, data->data, + data->length); } #endif |