rsyslog/rsyslog
1
0
Fork 0
mirror of https://github.com/rsyslog/rsyslog.git synced 2025-12-16 21:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

openssl: added link to doc for gnutlsPriorityString error msg

Browse Source 
When openssl version is too old, a documention link will be added
to the error message now.

Also changed openssl too old check in testsuite
This commit is contained in:
Andre lorbach 2019-10-08 13:07:27 +02:00
parent 9edc8875b8
commit aa17c24570
4 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
runtime/nsd_ossl.c
View File

@ -1860,8 +1860,10 @@ SetGnutlsPriorityString(__attribute__((unused)) nsd_t *pNsd, __attribute__((unus
} }
#else #else
dbgprintf("gnutlsPriorityString: set to '%s'\n", gnutlsPriorityString); dbgprintf("gnutlsPriorityString: set to '%s'\n", gnutlsPriorityString);
LogError(0, RS_RET_SYS_ERR, "Warning: OpenSSL Version to old to set gnutlsPriorityString ('%s')" LogError(0, RS_RET_SYS_ERR, "Warning: OpenSSL Version too old to set gnutlsPriorityString ('%s')"
"by SSL_CONF_cmd API", gnutlsPriorityString); "by SSL_CONF_cmd API. For more see: "
"https://www.rsyslog.com/doc/master/configuration/modules/imtcp.html#gnutlsprioritystring",
gnutlsPriorityString);
#endif #endif
} }

4
tests/imtcp-tls-ossl-basic-tlscommands.sh
View File

@ -34,10 +34,10 @@ tcpflood --check-only -k "Protocol=ALL,-SSLv2,-SSLv3,-TLSv1,-TLSv1.1,-TLSv1.3" -
shutdown_when_empty shutdown_when_empty
wait_shutdown wait_shutdown
content_check --check-only "OpenSSL Version to old" content_check --check-only "OpenSSL Version too old"
ret=$? ret=$?
if [ $ret == 0 ]; then if [ $ret == 0 ]; then
echo "SKIP: OpenSSL Version to old" echo "SKIP: OpenSSL Version too old"
skip_test skip_test
else else
content_check "wrong version number" content_check "wrong version number"

4
tests/sndrcv_tls_ossl_certvalid_tlscommand.sh
View File

@ -59,10 +59,10 @@ wait_shutdown
# intent. So do not think something is wrong. The content_check below checks # intent. So do not think something is wrong. The content_check below checks
# these error codes. # these error codes.
content_check --check-only "OpenSSL Version to old" content_check --check-only "OpenSSL Version too old"
ret=$? ret=$?
if [ $ret == 0 ]; then if [ $ret == 0 ]; then
echo "SKIP: OpenSSL Version to old" echo "SKIP: OpenSSL Version too old"
skip_test skip_test
else else
content_check "wrong version number" content_check "wrong version number"

2
tests/tcpflood.c
View File

@ -1235,7 +1235,7 @@ initTLS(void)
printf("tcpflood: error, invalid value for -k: %s\n", customConfig); printf("tcpflood: error, invalid value for -k: %s\n", customConfig);
} }
#else #else
printf("tcpflood: error, OpenSSL Version to old, SSL_CONF_cmd API is not supported."); printf("tcpflood: error, OpenSSL Version too old, SSL_CONF_cmd API is not supported.");
#endif #endif
} }