Fix no-ec compilation
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2624)
diff --git a/ssl/statem/extensions.c b/ssl/statem/extensions.c
index 50fd3bb..edb674d 100644
--- a/ssl/statem/extensions.c
+++ b/ssl/statem/extensions.c
@@ -36,7 +36,9 @@
static int init_ems(SSL *s, unsigned int context);
static int final_ems(SSL *s, unsigned int context, int sent, int *al);
static int init_psk_kex_modes(SSL *s, unsigned int context);
+#ifndef OPENSSL_NO_EC
static int final_key_share(SSL *s, unsigned int context, int sent, int *al);
+#endif
#ifndef OPENSSL_NO_SRTP
static int init_srtp(SSL *s, unsigned int context);
#endif
@@ -244,6 +246,7 @@
init_psk_kex_modes, tls_parse_ctos_psk_kex_modes, NULL, NULL,
tls_construct_ctos_psk_kex_modes, NULL
},
+#ifndef OPENSSL_NO_EC
{
/*
* Must be in this list after supported_groups. We need that to have
@@ -257,6 +260,7 @@
tls_construct_stoc_key_share, tls_construct_ctos_key_share,
final_key_share
},
+#endif
{
/*
* Special unsolicited ServerHello extension only used when
@@ -960,7 +964,7 @@
return 1;
}
-
+#ifndef OPENSSL_NO_EC
static int final_key_share(SSL *s, unsigned int context, int sent, int *al)
{
if (!SSL_IS_TLS13(s))
@@ -1078,6 +1082,7 @@
return 1;
}
+#endif
static int init_psk_kex_modes(SSL *s, unsigned int context)
{
diff --git a/ssl/statem/statem_lib.c b/ssl/statem/statem_lib.c
index d7564e6..3a03ada 100644
--- a/ssl/statem/statem_lib.c
+++ b/ssl/statem/statem_lib.c
@@ -1745,6 +1745,7 @@
* used. Returns 1 if the group is in the list (and allowed if |checkallow| is
* 1) or 0 otherwise.
*/
+#ifndef OPENSSL_NO_EC
int check_in_list(SSL *s, unsigned int group_id, const unsigned char *groups,
size_t num_groups, int checkallow)
{
@@ -1766,3 +1767,4 @@
/* If i == num_groups then not in the list */
return i < num_groups;
}
+#endif