diff options
| author | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2017-06-27 15:36:04 +0200 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2017-08-01 09:34:02 +0200 |
| commit | 2a552f2eb3c93e2c13c1eb8cd4f64317d8586e5f (patch) | |
| tree | 5acdb04170e020d876c3671bff2dad6f013294c9 /lib/state.h | |
| parent | dffd5a166e7aa59e5966b3ad27949170bf1d8061 (diff) | |
| download | gnutls-2a552f2eb3c93e2c13c1eb8cd4f64317d8586e5f.tar.gz | |
TLS: introduced support for RFC7919 groups
That replaces the EC curve extension negotiation with
the negotiated groups extensions, introduces handling
for groups as priority strings, as well as using and
checking of RFC7919 DH parameters once negotiated.
Resolves: #37
Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>
Diffstat (limited to 'lib/state.h')
| -rw-r--r-- | lib/state.h | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/lib/state.h b/lib/state.h index 154ce51259..5fec7f64bb 100644 --- a/lib/state.h +++ b/lib/state.h @@ -26,16 +26,22 @@ #include "gnutls_int.h" inline static gnutls_ecc_curve_t -_gnutls_session_ecc_curve_get(gnutls_session_t session) +_gnutls_session_group_get(gnutls_session_t session) { - return session->security_parameters.ecc_curve; + return session->security_parameters.group; } int _gnutls_session_is_ecc(gnutls_session_t session); -void -_gnutls_session_ecc_curve_set(gnutls_session_t session, - gnutls_ecc_curve_t c); +inline static void +_gnutls_session_group_set(gnutls_session_t session, + const gnutls_group_entry_st *e) +{ + _gnutls_handshake_log("HSK[%p]: Selected group %s (%d)\n", + session, e->name, e->id); + session->security_parameters.group = e->id; +} + void _gnutls_record_set_default_version(gnutls_session_t session, @@ -59,7 +65,7 @@ _gnutls_hello_set_default_version(gnutls_session_t session, int _gnutls_dh_set_secret_bits(gnutls_session_t session, unsigned bits); int _gnutls_dh_set_peer_public(gnutls_session_t session, bigint_t public); -int _gnutls_dh_set_group(gnutls_session_t session, bigint_t gen, +int _gnutls_dh_save_group(gnutls_session_t session, bigint_t gen, bigint_t prime); static inline int _gnutls_dh_get_min_prime_bits(gnutls_session_t session) |