LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #243 from djlucas/master 

Don't use SSL_load_error_strings() and friends for OpenSSL-1.1.0.
pull/219/merge
Extra Fu 2018-10-16 08:26:19 -04:00 committed by GitHub
parent 659df2d10e c8f7df402c
commit 7cae529ee4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
UI/MailPartViewers/UIxMailPartSignedViewer.m
View File

@ -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 */
}
}