53 lines
2.1 KiB
Diff
53 lines
2.1 KiB
Diff
|
diff -urNp a/snmplib/transports/snmpTLSBaseDomain.c b/snmplib/transports/snmpTLSBaseDomain.c
|
||
|
|
--- a/snmplib/transports/snmpTLSBaseDomain.c 2021-05-18 11:15:09.247472175 +0200
|
||
|
|
+++ b/snmplib/transports/snmpTLSBaseDomain.c 2021-05-24 09:39:29.297494727 +0200
|
||
|
|
@@ -54,17 +54,6 @@ netsnmp_feature_require(cert_util);
|
||
|
|
|
||
|
|
int openssl_local_index;
|
||
|
|
|
||
|
|
-#ifndef HAVE_ERR_GET_ERROR_ALL
|
||
|
|
-/* A backport of the OpenSSL 1.1.1e ERR_get_error_all() function. */
|
||
|
|
-static unsigned long ERR_get_error_all(const char **file, int *line,
|
||
|
|
- const char **func,
|
||
|
|
- const char **data, int *flags)
|
||
|
|
-{
|
||
|
|
- *func = NULL;
|
||
|
|
- return ERR_get_error_line_data(file, line, data, flags);
|
||
|
|
-}
|
||
|
|
-#endif
|
||
|
|
-
|
||
|
|
/* this is called during negotiation */
|
||
|
|
int verify_callback(int ok, X509_STORE_CTX *ctx) {
|
||
|
|
int err, depth;
|
||
|
|
@@ -1218,14 +1207,14 @@ void _openssl_log_error(int rc, SSL *con
|
||
|
|
}
|
||
|
|
|
||
|
|
/* other errors */
|
||
|
|
- while ((numerical_reason =
|
||
|
|
+/* while ((numerical_reason =
|
||
|
|
ERR_get_error_all(&file, &line, &func, &data, &flags)) != 0) {
|
||
|
|
snmp_log(LOG_ERR, "%s (file %s, func %s, line %d)\n",
|
||
|
|
- ERR_error_string(numerical_reason, NULL), file, func, line);
|
||
|
|
+ ERR_error_string(numerical_reason, NULL), file, func, line);*/
|
||
|
|
|
||
|
|
/* if we have a text translation: */
|
||
|
|
- if (data && (flags & ERR_TXT_STRING)) {
|
||
|
|
- snmp_log(LOG_ERR, " Textual Error: %s\n", data);
|
||
|
|
+/* if (data && (flags & ERR_TXT_STRING)) {
|
||
|
|
+ snmp_log(LOG_ERR, " Textual Error: %s\n", data);*/
|
||
|
|
/*
|
||
|
|
* per openssl man page: If it has been allocated by
|
||
|
|
* OPENSSL_malloc(), *flags&ERR_TXT_MALLOCED is true.
|
||
|
|
@@ -1234,9 +1223,9 @@ void _openssl_log_error(int rc, SSL *con
|
||
|
|
* wants a const char **, but returns something that we might
|
||
|
|
* need to free??
|
||
|
|
*/
|
||
|
|
- if (flags & ERR_TXT_MALLOCED)
|
||
|
|
+/* if (flags & ERR_TXT_MALLOCED)
|
||
|
|
OPENSSL_free(NETSNMP_REMOVE_CONST(void *, data)); }
|
||
|
|
- }
|
||
|
|
+ }*/
|
||
|
|
|
||
|
|
snmp_log(LOG_ERR, "---- End of OpenSSL Errors ----\n");
|
||
|
|
}
|