* [gentoo-commits] repo/proj/libressl:master commit in: net-misc/stunnel/files/
@ 2024-11-12 22:25 orbea
0 siblings, 0 replies; 3+ messages in thread
From: orbea @ 2024-11-12 22:25 UTC (permalink / raw
To: gentoo-commits
commit: 1ccf67d6469aa5773cdb68794de1f9a1f6192966
Author: orbea <orbea <AT> riseup <DOT> net>
AuthorDate: Tue Nov 12 22:15:59 2024 +0000
Commit: orbea <orbea <AT> riseup <DOT> net>
CommitDate: Tue Nov 12 22:15:59 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=1ccf67d6
net-misc/stunnel: fix for libressl 4.0.0
Signed-off-by: orbea <orbea <AT> riseup.net>
net-misc/stunnel/files/stunnel-5.59-libressl.patch | 12 ++++++++++++
net-misc/stunnel/files/stunnel-5.65-libressl.patch | 12 ++++++++++++
net-misc/stunnel/files/stunnel-5.68-libressl.patch | 13 +++++++++++++
net-misc/stunnel/files/stunnel-5.71-libressl.patch | 13 +++++++++++++
4 files changed, 50 insertions(+)
diff --git a/net-misc/stunnel/files/stunnel-5.59-libressl.patch b/net-misc/stunnel/files/stunnel-5.59-libressl.patch
index 1e61881..5950745 100644
--- a/net-misc/stunnel/files/stunnel-5.59-libressl.patch
+++ b/net-misc/stunnel/files/stunnel-5.59-libressl.patch
@@ -99,6 +99,18 @@ Index: src/ctx.c
OSSL_HANDSHAKE_STATE state=SSL_get_state(ssl);
#else
int state=SSL_get_state((SSL *)ssl);
+@@ -1575,7 +1575,10 @@ NOEXPORT void info_callback(const SSL *ssl, int where, int ret) {
+ if(state==TLS_ST_SR_CLNT_HELLO) {
+ #else
+ if(state==SSL3_ST_SR_CLNT_HELLO_A
+- || state==SSL23_ST_SR_CLNT_HELLO_A) {
++#if !defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER < 0x4000000fL
++ || state==SSL23_ST_SR_CLNT_HELLO_A
++#endif
++ ) {
+ #endif
+ /* client hello received after initial handshake,
+ * this means renegotiation -> mark it */
Index: src/options.c
--- a/src/options.c.orig
+++ b/src/options.c
diff --git a/net-misc/stunnel/files/stunnel-5.65-libressl.patch b/net-misc/stunnel/files/stunnel-5.65-libressl.patch
index ac878f6..f00bc1c 100644
--- a/net-misc/stunnel/files/stunnel-5.65-libressl.patch
+++ b/net-misc/stunnel/files/stunnel-5.65-libressl.patch
@@ -102,6 +102,18 @@ index a2202b7..a39ee4c 100644
OSSL_HANDSHAKE_STATE state=SSL_get_state(ssl);
#else
int state=SSL_get_state((SSL *)ssl);
+@@ -1575,7 +1575,10 @@ NOEXPORT void info_callback(const SSL *ssl, int where, int ret) {
+ if(state==TLS_ST_SR_CLNT_HELLO) {
+ #else
+ if(state==SSL3_ST_SR_CLNT_HELLO_A
+- || state==SSL23_ST_SR_CLNT_HELLO_A) {
++#if !defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER < 0x4000000fL
++ || state==SSL23_ST_SR_CLNT_HELLO_A
++#endif
++ ) {
+ #endif
+ /* client hello received after initial handshake,
+ * this means renegotiation -> mark it */
diff --git a/src/options.c b/src/options.c
index 9ac9c7e..dfcf8b2 100644
--- a/src/options.c
diff --git a/net-misc/stunnel/files/stunnel-5.68-libressl.patch b/net-misc/stunnel/files/stunnel-5.68-libressl.patch
index 7bae42f..7dfef31 100644
--- a/net-misc/stunnel/files/stunnel-5.68-libressl.patch
+++ b/net-misc/stunnel/files/stunnel-5.68-libressl.patch
@@ -124,6 +124,19 @@ index 6a42a6b..90d6273 100644
OSSL_HANDSHAKE_STATE state=SSL_get_state(ssl);
#else
int state=SSL_get_state((SSL *)ssl);
+@@ -1622,8 +1622,11 @@ NOEXPORT void info_callback(const SSL *ssl, int where, int ret) {
+ if(state==TLS_ST_SR_CLNT_HELLO) {
+ #else
+ if(state==SSL3_ST_SR_CLNT_HELLO_A
+- || state==SSL23_ST_SR_CLNT_HELLO_A) {
++#if !defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER < 0x4000000fL
++ || state==SSL23_ST_SR_CLNT_HELLO_A
+ #endif
++#endif
++ ) {
+ /* client hello received after initial handshake,
+ * this means renegotiation -> mark it */
+ c->reneg_state=RENEG_DETECTED;
diff --git a/src/prototypes.h b/src/prototypes.h
index 0ecd719..1084ce2 100644
--- a/src/prototypes.h
diff --git a/net-misc/stunnel/files/stunnel-5.71-libressl.patch b/net-misc/stunnel/files/stunnel-5.71-libressl.patch
index cd29227..0016560 100644
--- a/net-misc/stunnel/files/stunnel-5.71-libressl.patch
+++ b/net-misc/stunnel/files/stunnel-5.71-libressl.patch
@@ -114,6 +114,19 @@ Rebased from an OpenBSD patch.
OSSL_HANDSHAKE_STATE state=SSL_get_state(ssl);
#else
int state=SSL_get_state((SSL *)ssl);
+@@ -1622,8 +1622,11 @@ NOEXPORT void info_callback(const SSL *ssl, int where, int ret) {
+ if(state==TLS_ST_SR_CLNT_HELLO) {
+ #else
+ if(state==SSL3_ST_SR_CLNT_HELLO_A
+- || state==SSL23_ST_SR_CLNT_HELLO_A) {
++#if !defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER < 0x4000000fL
++ || state==SSL23_ST_SR_CLNT_HELLO_A
+ #endif
++#endif
++ ) {
+ /* client hello received after initial handshake,
+ * this means renegotiation -> mark it */
+ c->reneg_state=RENEG_DETECTED;
--- a/src/ocsp.c
+++ b/src/ocsp.c
@@ -108,7 +108,7 @@ int ocsp_init(SERVICE_OPTIONS *section) {
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/proj/libressl:master commit in: net-misc/stunnel/files/
@ 2024-11-12 22:30 orbea
0 siblings, 0 replies; 3+ messages in thread
From: orbea @ 2024-11-12 22:30 UTC (permalink / raw
To: gentoo-commits
commit: d30e6feaf21d65a8c13c83f8ce8ccba6bd398570
Author: orbea <orbea <AT> riseup <DOT> net>
AuthorDate: Tue Nov 12 22:29:08 2024 +0000
Commit: orbea <orbea <AT> riseup <DOT> net>
CommitDate: Tue Nov 12 22:29:08 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=d30e6fea
net-misc/stunnel fix patch
Signed-off-by: orbea <orbea <AT> riseup.net>
net-misc/stunnel/files/stunnel-5.68-libressl.patch | 5 ++---
net-misc/stunnel/files/stunnel-5.71-libressl.patch | 14 ++------------
2 files changed, 4 insertions(+), 15 deletions(-)
diff --git a/net-misc/stunnel/files/stunnel-5.68-libressl.patch b/net-misc/stunnel/files/stunnel-5.68-libressl.patch
index 7dfef31..ca4ae84 100644
--- a/net-misc/stunnel/files/stunnel-5.68-libressl.patch
+++ b/net-misc/stunnel/files/stunnel-5.68-libressl.patch
@@ -124,19 +124,18 @@ index 6a42a6b..90d6273 100644
OSSL_HANDSHAKE_STATE state=SSL_get_state(ssl);
#else
int state=SSL_get_state((SSL *)ssl);
-@@ -1622,8 +1622,11 @@ NOEXPORT void info_callback(const SSL *ssl, int where, int ret) {
+@@ -1622,7 +1622,10 @@ NOEXPORT void info_callback(const SSL *ssl, int where, int ret) {
if(state==TLS_ST_SR_CLNT_HELLO) {
#else
if(state==SSL3_ST_SR_CLNT_HELLO_A
- || state==SSL23_ST_SR_CLNT_HELLO_A) {
+#if !defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER < 0x4000000fL
+ || state==SSL23_ST_SR_CLNT_HELLO_A
- #endif
+#endif
+ ) {
+ #endif
/* client hello received after initial handshake,
* this means renegotiation -> mark it */
- c->reneg_state=RENEG_DETECTED;
diff --git a/src/prototypes.h b/src/prototypes.h
index 0ecd719..1084ce2 100644
--- a/src/prototypes.h
diff --git a/net-misc/stunnel/files/stunnel-5.71-libressl.patch b/net-misc/stunnel/files/stunnel-5.71-libressl.patch
index 0016560..25ef50c 100644
--- a/net-misc/stunnel/files/stunnel-5.71-libressl.patch
+++ b/net-misc/stunnel/files/stunnel-5.71-libressl.patch
@@ -105,28 +105,18 @@ Rebased from an OpenBSD patch.
typedef struct {
void *session_authenticated;
-@@ -1621,7 +1621,7 @@ NOEXPORT void info_callback(const SSL *ssl, int where, int ret) {
- CLI *c;
- SSL_CTX *ctx;
- const char *state_string;
--#if OPENSSL_VERSION_NUMBER>=0x10100000L
-+#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
- OSSL_HANDSHAKE_STATE state=SSL_get_state(ssl);
- #else
- int state=SSL_get_state((SSL *)ssl);
-@@ -1622,8 +1622,11 @@ NOEXPORT void info_callback(const SSL *ssl, int where, int ret) {
+@@ -1622,7 +1622,10 @@ NOEXPORT void info_callback(const SSL *ssl, int where, int ret) {
if(state==TLS_ST_SR_CLNT_HELLO) {
#else
if(state==SSL3_ST_SR_CLNT_HELLO_A
- || state==SSL23_ST_SR_CLNT_HELLO_A) {
+#if !defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER < 0x4000000fL
+ || state==SSL23_ST_SR_CLNT_HELLO_A
- #endif
+#endif
+ ) {
+ #endif
/* client hello received after initial handshake,
* this means renegotiation -> mark it */
- c->reneg_state=RENEG_DETECTED;
--- a/src/ocsp.c
+++ b/src/ocsp.c
@@ -108,7 +108,7 @@ int ocsp_init(SERVICE_OPTIONS *section) {
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/proj/libressl:master commit in: net-misc/stunnel/files/
@ 2024-11-12 22:33 orbea
0 siblings, 0 replies; 3+ messages in thread
From: orbea @ 2024-11-12 22:33 UTC (permalink / raw
To: gentoo-commits
commit: a35c3c315b26b957605f57737874c8a372edade3
Author: orbea <orbea <AT> riseup <DOT> net>
AuthorDate: Tue Nov 12 22:32:51 2024 +0000
Commit: orbea <orbea <AT> riseup <DOT> net>
CommitDate: Tue Nov 12 22:32:51 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=a35c3c31
net-misc/stunnel: fix patch again...
Signed-off-by: orbea <orbea <AT> riseup.net>
net-misc/stunnel/files/stunnel-5.71-libressl.patch | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/net-misc/stunnel/files/stunnel-5.71-libressl.patch b/net-misc/stunnel/files/stunnel-5.71-libressl.patch
index 25ef50c..a7fe95b 100644
--- a/net-misc/stunnel/files/stunnel-5.71-libressl.patch
+++ b/net-misc/stunnel/files/stunnel-5.71-libressl.patch
@@ -105,6 +105,16 @@ Rebased from an OpenBSD patch.
typedef struct {
void *session_authenticated;
+@@ -1621,7 +1621,7 @@ NOEXPORT void info_callback(const SSL *ssl, int where, int ret) {
+ CLI *c;
+ SSL_CTX *ctx;
+ const char *state_string;
+-#if OPENSSL_VERSION_NUMBER>=0x10100000L
++#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+ OSSL_HANDSHAKE_STATE state=SSL_get_state(ssl);
+ #else
+ int state=SSL_get_state((SSL *)ssl);
+@@ -1622,8 +1622,11 @@ NOEXPORT void info_callback(const SSL *ssl, int where, int ret) {
@@ -1622,7 +1622,10 @@ NOEXPORT void info_callback(const SSL *ssl, int where, int ret) {
if(state==TLS_ST_SR_CLNT_HELLO) {
#else
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-11-12 22:33 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-11-12 22:25 [gentoo-commits] repo/proj/libressl:master commit in: net-misc/stunnel/files/ orbea
-- strict thread matches above, loose matches on Subject: below --
2024-11-12 22:30 orbea
2024-11-12 22:33 orbea
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox