diff options
| author | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2019-10-10 00:13:16 +0000 |
|---|---|---|
| committer | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2019-10-10 00:13:16 +0000 |
| commit | 57bb571084bfa56e310192f591a581c05fe732f2 (patch) | |
| tree | d67bcf6250d5e8e25d519ce40e61e23c4a83e9d4 | |
| parent | 5a50a481b440bf32db3e7370909e0bde93ece325 (diff) | |
| parent | 14041d8f93fcd895cc979e82e817751df51ac1f3 (diff) | |
| download | gnutls-57bb571084bfa56e310192f591a581c05fe732f2.tar.gz | |
Merge branch 'groups-non-ec' into 'master'
ext/supported_groups: don't consider non-EC groups for EC
See merge request gnutls/gnutls!1089
| -rw-r--r-- | lib/ext/supported_groups.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/ext/supported_groups.c b/lib/ext/supported_groups.c index ef7859f731..ab704d41e5 100644 --- a/lib/ext/supported_groups.c +++ b/lib/ext/supported_groups.c @@ -159,7 +159,7 @@ _gnutls_supported_groups_recv_params(gnutls_session_t session, break; serv_dh_idx = j; cli_dh_pos = i; - } else { + } else if (IS_EC(group->pk)) { if (serv_ec_idx != -1 && (int)j > serv_ec_idx) break; serv_ec_idx = j; @@ -171,7 +171,7 @@ _gnutls_supported_groups_recv_params(gnutls_session_t session, break; cli_dh_pos = i; serv_dh_idx = j; - } else { + } else if (IS_EC(group->pk)) { if (cli_ec_pos != -1) break; cli_ec_pos = i; |