| 1 |
commit: a392cec2c172819242ab72e4b98409fc0e8e843c |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon May 3 18:33:04 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon May 3 18:45:39 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a392cec2 |
| 7 |
|
| 8 |
net-dialup/freeradius: drop obsolete LibreSSL patch |
| 9 |
|
| 10 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 11 |
|
| 12 |
.../files/freeradius-3.0.18-libressl.patch | 63 ---------------------- |
| 13 |
1 file changed, 63 deletions(-) |
| 14 |
|
| 15 |
diff --git a/net-dialup/freeradius/files/freeradius-3.0.18-libressl.patch b/net-dialup/freeradius/files/freeradius-3.0.18-libressl.patch |
| 16 |
deleted file mode 100644 |
| 17 |
index 129e251d87b..00000000000 |
| 18 |
--- a/net-dialup/freeradius/files/freeradius-3.0.18-libressl.patch |
| 19 |
+++ /dev/null |
| 20 |
@@ -1,63 +0,0 @@ |
| 21 |
-From 39e4ac0cf8d415b41dc2ff1fc329de0522b135ca Mon Sep 17 00:00:00 2001 |
| 22 |
-From: Stefan Strogin <stefan.strogin@×××××.com> |
| 23 |
-Date: Wed, 24 Apr 2019 09:16:12 +0300 |
| 24 |
-Subject: [PATCH] Fix build to LibreSSL |
| 25 |
- |
| 26 |
-Upstream-Status: Inappropriate |
| 27 |
-[https://github.com/FreeRADIUS/freeradius-server/commit/9652affe38f41ba2484e013cf9d2c0bcb8c80d67] |
| 28 |
-Signed-off-by: Stefan Strogin <stefan.strogin@×××××.com> |
| 29 |
---- |
| 30 |
- src/main/tls.c | 9 ++++++--- |
| 31 |
- src/modules/rlm_eap/types/rlm_eap_fast/eap_fast.c | 3 ++- |
| 32 |
- 2 files changed, 8 insertions(+), 4 deletions(-) |
| 33 |
- |
| 34 |
-diff --git a/src/main/tls.c b/src/main/tls.c |
| 35 |
-index 9726953234..840724bf61 100644 |
| 36 |
---- a/src/main/tls.c |
| 37 |
-+++ b/src/main/tls.c |
| 38 |
-@@ -1579,7 +1579,8 @@ done: |
| 39 |
- return 0; |
| 40 |
- } |
| 41 |
- |
| 42 |
--#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) |
| 43 |
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || \ |
| 44 |
-+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2090100fL) |
| 45 |
- static SSL_SESSION *cbtls_get_session(SSL *ssl, unsigned char *data, int len, int *copy) |
| 46 |
- #else |
| 47 |
- static SSL_SESSION *cbtls_get_session(SSL *ssl, const unsigned char *data, int len, int *copy) |
| 48 |
-@@ -3379,14 +3380,16 @@ post_ca: |
| 49 |
- */ |
| 50 |
- SSL_CTX_sess_set_cache_size(ctx, conf->session_cache_size); |
| 51 |
- |
| 52 |
--#if OPENSSL_VERSION_NUMBER >= 0x10101000L |
| 53 |
-+/* Not implemented in LibreSSL 2.9.1 */ |
| 54 |
-+#if OPENSSL_VERSION_NUMBER >= 0x10101000L && !defined(LIBRESSL_VERSION_NUMBER) |
| 55 |
- SSL_CTX_set_num_tickets(ctx, 1); |
| 56 |
- #endif |
| 57 |
- |
| 58 |
- } else { |
| 59 |
- SSL_CTX_set_session_cache_mode(ctx, SSL_SESS_CACHE_OFF); |
| 60 |
- |
| 61 |
--#if OPENSSL_VERSION_NUMBER >= 0x10101000L |
| 62 |
-+/* Not implemented in LibreSSL 2.9.1 */ |
| 63 |
-+#if OPENSSL_VERSION_NUMBER >= 0x10101000L && !defined(LIBRESSL_VERSION_NUMBER) |
| 64 |
- /* |
| 65 |
- * This controls the number of stateful or stateless tickets |
| 66 |
- * generated with TLS 1.3. In OpenSSL 1.1.1 it's also |
| 67 |
-diff --git a/src/modules/rlm_eap/types/rlm_eap_fast/eap_fast.c b/src/modules/rlm_eap/types/rlm_eap_fast/eap_fast.c |
| 68 |
-index fa9c58f3c3..a53341fc20 100644 |
| 69 |
---- a/src/modules/rlm_eap/types/rlm_eap_fast/eap_fast.c |
| 70 |
-+++ b/src/modules/rlm_eap/types/rlm_eap_fast/eap_fast.c |
| 71 |
-@@ -44,7 +44,8 @@ static int openssl_get_keyblock_size(REQUEST *request, SSL *ssl) |
| 72 |
- { |
| 73 |
- const EVP_CIPHER *c; |
| 74 |
- const EVP_MD *h; |
| 75 |
--#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) |
| 76 |
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || \ |
| 77 |
-+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2090100fL) |
| 78 |
- int md_size; |
| 79 |
- |
| 80 |
- if (ssl->enc_read_ctx == NULL || ssl->enc_read_ctx->cipher == NULL || |
| 81 |
--- |
| 82 |
-2.21.0 |
| 83 |
- |
Archives