summaryrefslogtreecommitdiffstats
path: root/ssl/s3_lib.c
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2017-09-22 23:43:03 +0100
committerDr. Stephen Henson <steve@openssl.org>2017-09-26 13:00:26 +0100
commit8841154a90914c6f8cb4649beed36f8d1b82a19c (patch)
tree3aeb7b10d64872462d110be326c505d9d3c2ad99 /ssl/s3_lib.c
parent1483b8582ce2c77717dea5c369efe56c93cef998 (diff)
Return group id in tls1_shared_group
Reviewed-by: Rich Salz <rsalz@openssl.org> (Merged from https://github.com/openssl/openssl/pull/=4412)
Diffstat (limited to 'ssl/s3_lib.c')
-rw-r--r--ssl/s3_lib.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c
index 4127b28ea4..84e945fc1d 100644
--- a/ssl/s3_lib.c
+++ b/ssl/s3_lib.c
@@ -3633,7 +3633,7 @@ long ssl3_ctrl(SSL *s, int cmd, long larg, void *parg)
&s->ext.supportedgroups_len, parg);
case SSL_CTRL_GET_SHARED_GROUP:
- return tls1_shared_group(s, larg);
+ return tls1_ec_curve_id2nid(tls1_shared_group(s, larg), NULL);
#endif
case SSL_CTRL_SET_SIGALGS: