|
 |
81356c |
diff -up openssl-1.1.1k/ssl/statem/extensions.c.cleanup-reneg openssl-1.1.1k/ssl/statem/extensions.c
|
|
|
81356c |
--- openssl-1.1.1k/ssl/statem/extensions.c.cleanup-reneg 2021-03-25 14:28:38.000000000 +0100
|
|
|
81356c |
+++ openssl-1.1.1k/ssl/statem/extensions.c 2021-06-24 16:16:19.526181743 +0200
|
|
|
2502e2 |
@@ -42,6 +42,9 @@ static int tls_parse_certificate_authori
|
|
|
81356c |
#ifndef OPENSSL_NO_SRP
|
|
|
81356c |
static int init_srp(SSL *s, unsigned int context);
|
|
|
81356c |
#endif
|
|
|
2502e2 |
+#ifndef OPENSSL_NO_EC
|
|
|
81356c |
+static int init_ec_point_formats(SSL *s, unsigned int context);
|
|
|
2502e2 |
+#endif
|
|
|
81356c |
static int init_etm(SSL *s, unsigned int context);
|
|
|
81356c |
static int init_ems(SSL *s, unsigned int context);
|
|
|
81356c |
static int final_ems(SSL *s, unsigned int context, int sent);
|
|
|
81356c |
@@ -158,7 +159,7 @@ static const EXTENSION_DEFINITION ext_de
|
|
|
81356c |
TLSEXT_TYPE_ec_point_formats,
|
|
|
81356c |
SSL_EXT_CLIENT_HELLO | SSL_EXT_TLS1_2_SERVER_HELLO
|
|
|
81356c |
| SSL_EXT_TLS1_2_AND_BELOW_ONLY,
|
|
|
81356c |
- NULL, tls_parse_ctos_ec_pt_formats, tls_parse_stoc_ec_pt_formats,
|
|
|
81356c |
+ init_ec_point_formats, tls_parse_ctos_ec_pt_formats, tls_parse_stoc_ec_pt_formats,
|
|
|
81356c |
tls_construct_stoc_ec_pt_formats, tls_construct_ctos_ec_pt_formats,
|
|
|
81356c |
final_ec_pt_formats
|
|
|
81356c |
},
|
|
|
2502e2 |
@@ -1164,6 +1165,17 @@ static int init_srp(SSL *s, unsigned int
|
|
|
81356c |
}
|
|
|
81356c |
#endif
|
|
|
81356c |
|
|
|
2502e2 |
+#ifndef OPENSSL_NO_EC
|
|
|
81356c |
+static int init_ec_point_formats(SSL *s, unsigned int context)
|
|
|
81356c |
+{
|
|
|
81356c |
+ OPENSSL_free(s->ext.peer_ecpointformats);
|
|
|
81356c |
+ s->ext.peer_ecpointformats = NULL;
|
|
|
81356c |
+ s->ext.peer_ecpointformats_len = 0;
|
|
|
81356c |
+
|
|
|
81356c |
+ return 1;
|
|
|
81356c |
+}
|
|
|
2502e2 |
+#endif
|
|
|
81356c |
+
|
|
|
81356c |
static int init_etm(SSL *s, unsigned int context)
|
|
|
81356c |
{
|
|
|
81356c |
s->ext.use_etm = 0;
|