openssl/SOURCES/openssl-1.1.1-cleanup-peer-point-reneg.patch

41 lines
1.5 KiB
Diff
Raw Permalink Normal View History

2021-10-06 11:03:01 +00:00
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
2023-03-28 08:57:46 +00:00
@@ -42,6 +42,9 @@ static int tls_parse_certificate_authori
2021-10-06 11:03:01 +00:00
#ifndef OPENSSL_NO_SRP
static int init_srp(SSL *s, unsigned int context);
#endif
2023-03-28 08:57:46 +00:00
+#ifndef OPENSSL_NO_EC
2021-10-06 11:03:01 +00:00
+static int init_ec_point_formats(SSL *s, unsigned int context);
2023-03-28 08:57:46 +00:00
+#endif
2021-10-06 11:03:01 +00:00
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
},
2023-03-28 08:57:46 +00:00
@@ -1164,6 +1165,17 @@ static int init_srp(SSL *s, unsigned int
2021-10-06 11:03:01 +00:00
}
#endif
2023-03-28 08:57:46 +00:00
+#ifndef OPENSSL_NO_EC
2021-10-06 11:03:01 +00:00
+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;
+}
2023-03-28 08:57:46 +00:00
+#endif
2021-10-06 11:03:01 +00:00
+
static int init_etm(SSL *s, unsigned int context)
{
s->ext.use_etm = 0;