diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2017-09-24 03:26:26 +0100 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2017-09-26 13:00:26 +0100 |
| commit | 34e5292c578321b80d8e474db4be6d90519d8f33 (patch) | |
| tree | 16395af6bc9970ac4d97354a663ba783ea8a5a77 /ssl/statem/extensions.c | |
| parent | 4a1b42801997f3083211a24592d1a691a0747250 (diff) | |
Rename tls1_get_curvelist.
Rename tls1_get_curvelist to tls1_get_grouplist, change to void as
it can never fail and remove unnecessary return value checks. Clean
up the code.
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/=4412)
Diffstat (limited to 'ssl/statem/extensions.c')
| -rw-r--r-- | ssl/statem/extensions.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/ssl/statem/extensions.c b/ssl/statem/extensions.c index 8b88b21584..2991310124 100644 --- a/ssl/statem/extensions.c +++ b/ssl/statem/extensions.c @@ -1144,18 +1144,8 @@ static int final_key_share(SSL *s, unsigned int context, int sent, int *al) /* Check if a shared group exists */ /* Get the clients list of supported groups. */ - if (!tls1_get_curvelist(s, 1, &clntcurves, &clnt_num_curves)) { - *al = SSL_AD_INTERNAL_ERROR; - SSLerr(SSL_F_FINAL_KEY_SHARE, ERR_R_INTERNAL_ERROR); - return 0; - } - - /* Get our list of available groups */ - if (!tls1_get_curvelist(s, 0, &pcurves, &num_curves)) { - *al = SSL_AD_INTERNAL_ERROR; - SSLerr(SSL_F_FINAL_KEY_SHARE, ERR_R_INTERNAL_ERROR); - return 0; - } + tls1_get_grouplist(s, 1, &clntcurves, &clnt_num_curves); + tls1_get_grouplist(s, 0, &pcurves, &num_curves); /* Find the first group we allow that is also in client's list */ for (i = 0; i < num_curves; i++) { |