Skip to content

Commit cc95e09

Browse files
Updated patch for openssl
Added new extensions to enum tlsext_index_en in ssl/ssl_locl.h - now tests in debian package pass without errors
1 parent 6f0a0d1 commit cc95e09

File tree

1 file changed

+20
-9
lines changed

1 file changed

+20
-9
lines changed

patches/openssl.extensions.patch

Lines changed: 20 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
diff -r -u openssl.orig/include/openssl/tls1.h openssl/include/openssl/tls1.h
2-
--- openssl.orig/include/openssl/tls1.h 2019-02-12 23:44:30.004081000 +0000
3-
+++ openssl/include/openssl/tls1.h 2019-02-12 23:51:42.213326000 +0000
4-
@@ -133,6 +133,11 @@
1+
diff -upr openssl-1.1.1d_orig/include/openssl/tls1.h openssl-1.1.1d/include/openssl/tls1.h
2+
--- openssl-1.1.1d_orig/include/openssl/tls1.h 2019-09-10 16:13:07.000000000 +0300
3+
+++ openssl-1.1.1d/include/openssl/tls1.h 2020-11-10 19:31:11.139757273 +0300
4+
@@ -131,6 +131,11 @@ extern "C" {
55
/* ExtensionType value from RFC7627 */
66
# define TLSEXT_TYPE_extended_master_secret 23
77

@@ -13,11 +13,10 @@ diff -r -u openssl.orig/include/openssl/tls1.h openssl/include/openssl/tls1.h
1313
/* ExtensionType value from RFC4507 */
1414
# define TLSEXT_TYPE_session_ticket 35
1515

16-
Only in openssl/ssl/statem: .extensions.c.swp
17-
diff -r -u openssl.orig/ssl/statem/extensions.c openssl/ssl/statem/extensions.c
18-
--- openssl.orig/ssl/statem/extensions.c 2019-02-12 23:48:29.687608000 +0000
19-
+++ openssl/ssl/statem/extensions.c 2019-02-12 23:45:46.161153000 +0000
20-
@@ -374,6 +374,22 @@
16+
diff -upr openssl-1.1.1d_orig/ssl/statem/extensions.c openssl-1.1.1d/ssl/statem/extensions.c
17+
--- openssl-1.1.1d_orig/ssl/statem/extensions.c 2019-09-10 16:13:07.000000000 +0300
18+
+++ openssl-1.1.1d/ssl/statem/extensions.c 2020-11-10 19:31:11.139757273 +0300
19+
@@ -374,6 +374,22 @@ static const EXTENSION_DEFINITION ext_de
2120
tls_construct_certificate_authorities, NULL,
2221
},
2322
{
@@ -40,3 +39,15 @@ diff -r -u openssl.orig/ssl/statem/extensions.c openssl/ssl/statem/extensions.c
4039
/* Must be immediately before pre_shared_key */
4140
TLSEXT_TYPE_padding,
4241
SSL_EXT_CLIENT_HELLO,
42+
diff -upr openssl-1.1.1d_orig/ssl/ssl_locl.h openssl-1.1.1d/ssl/ssl_locl.h
43+
--- openssl-1.1.1d_orig/ssl/ssl_locl.h 2020-10-26 18:19:43.157168940 +0300
44+
+++ openssl-1.1.1d/ssl/ssl_locl.h 2020-11-10 18:49:14.150574957 +0300
45+
@@ -715,6 +715,8 @@ typedef enum tlsext_index_en {
46+
TLSEXT_IDX_cryptopro_bug,
47+
TLSEXT_IDX_early_data,
48+
TLSEXT_IDX_certificate_authorities,
49+
+ TLSEXT_IDX_compress_certificate,
50+
+ TLSEXT_IDX_record_size_limit,
51+
TLSEXT_IDX_padding,
52+
TLSEXT_IDX_psk,
53+
/* Dummy index - must always be the last entry */

0 commit comments

Comments
 (0)