diff options
Diffstat (limited to 'sysutils/rsyslog8/files')
| -rw-r--r-- | sysutils/rsyslog8/files/patch-runtime_net__ossl.c | 18 | ||||
| -rw-r--r-- | sysutils/rsyslog8/files/patch-runtime_nsd__ossl.c | 16 |
2 files changed, 8 insertions, 26 deletions
diff --git a/sysutils/rsyslog8/files/patch-runtime_net__ossl.c b/sysutils/rsyslog8/files/patch-runtime_net__ossl.c deleted file mode 100644 index a16b3734ad98..000000000000 --- a/sysutils/rsyslog8/files/patch-runtime_net__ossl.c +++ /dev/null @@ -1,18 +0,0 @@ ---- runtime/net_ossl.c.orig 2025-03-05 18:14:51 UTC -+++ runtime/net_ossl.c -@@ -514,6 +514,7 @@ void net_ossl_lastOpenSSLErrorMsg - #if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER) - /* initialize tls config commands in openssl context - */ -+#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER) - rsRetVal net_ossl_apply_tlscgfcmd(net_ossl_t *pThis, uchar *tlscfgcmd) - { - DEFiRet; -@@ -630,6 +631,7 @@ finalize_it: - } - RETiRet; - } -+#endif - - - diff --git a/sysutils/rsyslog8/files/patch-runtime_nsd__ossl.c b/sysutils/rsyslog8/files/patch-runtime_nsd__ossl.c index cc4fbf8037d8..8fd03819cdb5 100644 --- a/sysutils/rsyslog8/files/patch-runtime_nsd__ossl.c +++ b/sysutils/rsyslog8/files/patch-runtime_nsd__ossl.c @@ -1,11 +1,11 @@ ---- runtime/nsd_ossl.c.orig 2025-06-10 09:49:19 UTC +--- runtime/nsd_ossl.c.orig 2025-09-05 13:46:02 UTC +++ runtime/nsd_ossl.c -@@ -854,7 +854,7 @@ osslPostHandshakeCheck(nsd_ossl_t *pNsd) - if (SSL_get_shared_ciphers(pNsd->pNetOssl->ssl,szDbg, sizeof szDbg) != NULL) - dbgprintf("osslPostHandshakeCheck: Debug Shared ciphers = %s\n", szDbg); +@@ -803,7 +803,7 @@ rsRetVal osslPostHandshakeCheck(nsd_ossl_t *pNsd) { + if (SSL_get_shared_ciphers(pNsd->pNetOssl->ssl, szDbg, sizeof szDbg) != NULL) + dbgprintf("osslPostHandshakeCheck: Debug Shared ciphers = %s\n", szDbg); -- #if OPENSSL_VERSION_NUMBER >= 0x10002000L +-#if OPENSSL_VERSION_NUMBER >= 0x10002000L +#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER) - if(SSL_get_shared_curve(pNsd->pNetOssl->ssl, -1) == 0) { - // This is not a failure - LogMsg(0, RS_RET_NO_ERRCODE, LOG_INFO, "nsd_ossl: " + if (SSL_get_shared_curve(pNsd->pNetOssl->ssl, -1) == 0) { + // This is not a failure + LogMsg(0, RS_RET_NO_ERRCODE, LOG_INFO, |