You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
41 lines
1.5 KiB
41 lines
1.5 KiB
2 years ago
|
diff -up openssl-1.1.1k/ssl/statem/extensions.c.cleanup-reneg openssl-1.1.1k/ssl/statem/extensions.c
|
||
|
|
--- openssl-1.1.1k/ssl/statem/extensions.c.cleanup-reneg 2021-03-25 14:28:38.000000000 +0100
|
||
|
|
+++ openssl-1.1.1k/ssl/statem/extensions.c 2021-06-24 16:16:19.526181743 +0200
|
||
|
|
@@ -42,6 +42,9 @@ static int tls_parse_certificate_authori
|
||
|
|
#ifndef OPENSSL_NO_SRP
|
||
|
|
static int init_srp(SSL *s, unsigned int context);
|
||
|
|
#endif
|
||
|
|
+#ifndef OPENSSL_NO_EC
|
||
|
|
+static int init_ec_point_formats(SSL *s, unsigned int context);
|
||
|
|
+#endif
|
||
|
|
static int init_etm(SSL *s, unsigned int context);
|
||
|
|
static int init_ems(SSL *s, unsigned int context);
|
||
|
|
static int final_ems(SSL *s, unsigned int context, int sent);
|
||
|
|
@@ -158,7 +159,7 @@ static const EXTENSION_DEFINITION ext_de
|
||
|
|
TLSEXT_TYPE_ec_point_formats,
|
||
|
|
SSL_EXT_CLIENT_HELLO | SSL_EXT_TLS1_2_SERVER_HELLO
|
||
|
|
| SSL_EXT_TLS1_2_AND_BELOW_ONLY,
|
||
|
|
- NULL, tls_parse_ctos_ec_pt_formats, tls_parse_stoc_ec_pt_formats,
|
||
|
|
+ init_ec_point_formats, tls_parse_ctos_ec_pt_formats, tls_parse_stoc_ec_pt_formats,
|
||
|
|
tls_construct_stoc_ec_pt_formats, tls_construct_ctos_ec_pt_formats,
|
||
|
|
final_ec_pt_formats
|
||
|
|
},
|
||
|
|
@@ -1164,6 +1165,17 @@ static int init_srp(SSL *s, unsigned int
|
||
|
|
}
|
||
|
|
#endif
|
||
|
|
|
||
|
|
+#ifndef OPENSSL_NO_EC
|
||
|
|
+static int init_ec_point_formats(SSL *s, unsigned int context)
|
||
|
|
+{
|
||
|
|
+ OPENSSL_free(s->ext.peer_ecpointformats);
|
||
|
|
+ s->ext.peer_ecpointformats = NULL;
|
||
|
|
+ s->ext.peer_ecpointformats_len = 0;
|
||
|
|
+
|
||
|
|
+ return 1;
|
||
|
|
+}
|
||
|
|
+#endif
|
||
|
|
+
|
||
|
|
static int init_etm(SSL *s, unsigned int context)
|
||
|
|
{
|
||
|
|
s->ext.use_etm = 0;
|