From c8f7df402c96b785f23cbed42e0c84aeafa1daef Mon Sep 17 00:00:00 2001 From: DJ Lucas Date: Sat, 13 Oct 2018 23:55:34 -0500 Subject: [PATCH] Don't use SSL_load_error_strings() and friends for OpenSSL-1.1.0. --- UI/MailPartViewers/UIxMailPartSignedViewer.m | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/UI/MailPartViewers/UIxMailPartSignedViewer.m b/UI/MailPartViewers/UIxMailPartSignedViewer.m index 9f00ba9c1..fc170e683 100644 --- a/UI/MailPartViewers/UIxMailPartSignedViewer.m +++ b/UI/MailPartViewers/UIxMailPartSignedViewer.m @@ -169,11 +169,20 @@ if (err) { - ERR_load_crypto_strings(); +#ifdef HAVE_GNUTLS + ERR_load_crypto_strings(); SSL_load_error_strings(); sslError = ERR_reason_error_string(err); validationMessage = [[self labelForKey: [NSString stringWithUTF8String: sslError ? sslError : "(no error information available)"]] retain]; - } +#elseif OPENSSL_VERSION_NUMBER < 0x10100000L + ERR_load_crypto_strings(); + SSL_load_error_strings(); + sslError = ERR_reason_error_string(err); + validationMessage = [[self labelForKey: [NSString stringWithUTF8String: sslError ? sslError]] retain]; +#else + validationMessage = [[self labelForKey: [NSString stringWithUTF8String: sslError ? sslError]] retain]; +#endif /* HAVE_GNUTLS */ + } }