aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Andree <matthias.andree@gmx.de>2021-12-05 21:39:14 +0100
committerMatthias Andree <matthias.andree@gmx.de>2021-12-05 21:39:14 +0100
commitb12117f4cb73aefdff64679a63cf96c987ce6bd6 (patch)
tree572dd9f718503b40cf785ea6c4f6a134486c33a2
parent36d4b3dd4f0bd6768c875f38b84afd4842760a2a (diff)
downloadfetchmail-b12117f4cb73aefdff64679a63cf96c987ce6bd6.tar.gz
fetchmail-b12117f4cb73aefdff64679a63cf96c987ce6bd6.tar.bz2
fetchmail-b12117f4cb73aefdff64679a63cf96c987ce6bd6.zip
Realign comments and variable names.
-rw-r--r--socket.c8
-rw-r--r--tls-aux.h2
2 files changed, 5 insertions, 5 deletions
diff --git a/socket.c b/socket.c
index fc8218bd..637c3df3 100644
--- a/socket.c
+++ b/socket.c
@@ -1283,15 +1283,15 @@ no_verify_load:
ERR_print_errors_fp(stderr);
}
-#if (OPENSSL_VERSION_NUMBER & 0xfffff000L) == 0x10002000
+ /* OpenSSL 1.x.y: 0xMNNFFPPSL: major minor fix patch status
+ * OpenSSL 3.0.z: 0xMNN00PPSL: synthesized */
+ /* 0xMNNFFPPsL 0xMNNFFPPsL */
+#if (OPENSSL_VERSION_NUMBER & 0xfffff000L) == 0x10002000L
#pragma message "enabling OpenSSL 1.0.2 X509_V_FLAG_TRUSTED_FIRST flag setter"
/* OpenSSL 1.0.2 and 1.0.2 only:
* work around Let's Encrypt Cross-Signing Certificate Expiry,
* https://www.openssl.org/blog/blog/2021/09/13/LetsEncryptRootCertExpire/
* Workaround #2 */
- /* OpenSSL 1.x.y: 0xMNNFFPPSL: major minor fix patch status
- * OpenSSL 3.0.z: 0xMNN00PPSL: synthesized */
- /* 0xMNNFFPPsL 0xMNNFFPPsL */
X509_VERIFY_PARAM_set_flags(param, X509_V_FLAG_TRUSTED_FIRST);
#endif
diff --git a/tls-aux.h b/tls-aux.h
index 0d6bac48..e5e594ab 100644
--- a/tls-aux.h
+++ b/tls-aux.h
@@ -1,7 +1,7 @@
#ifndef TLS_AUX_H
#define TLS_AUX_H 1
-#undef LIBWOLFSSL_VERSION_STRING
+#undef LIBWOLFSSL_VERSION_HEX
#include "config.h"
#include "fetchmail.h"