| From cc9dbd4bcd9ab3133d771c94c0466356703276a8 Mon Sep 17 00:00:00 2001 |
| From: Eneas U de Queiroz <cote2004-github@yahoo.com> |
| Date: Fri, 8 Jun 2018 14:41:23 -0300 |
| Subject: [PATCH] Removed API deprecated by OpenSSL 1.1.0 |
| |
| Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com> |
| --- |
| main.c | 10 +++++++++- |
| utils.c | 6 +++++- |
| 2 files changed, 14 insertions(+), 2 deletions(-) |
| |
| --- a/main.c |
| +++ b/main.c |
| @@ -91,7 +91,11 @@ static void usage(void) |
| (void) printf(" Copyright: %.1024s\n\n",NO_SPAM_STATEMENT); |
| #ifdef HAVE_OPENSSL |
| (void) fprintf(stdout," (Compiled with OpenSSL version: %s)\n", |
| +# if OPENSSL_VERSION_NUMBER < 0x10100000L |
| SSLeay_version(SSLEAY_VERSION)); |
| +# else |
| + OpenSSL_version(OPENSSL_VERSION)); |
| +# endif |
| #else |
| (void) fprintf(stdout," (Not compiled with OpenSSL)\n"); |
| #endif /* HAVE_OPENSSL */ |
| @@ -1056,9 +1060,13 @@ int main(int argc,char **argv) |
| (void) fprintf(stderr,"mailsend Version: %.1024s\n",MAILSEND_VERSION); |
| #ifdef HAVE_OPENSSL |
| (void) fprintf(stderr,"Compiled with OpenSSL: %s\n", |
| +# if OPENSSL_VERSION_NUMBER < 0x10100000L |
| SSLeay_version(SSLEAY_VERSION)); |
| +# else |
| + OpenSSL_version(OPENSSL_VERSION)); |
| +# endif |
| #else |
| - (void) fprintf(stderr,"Not Compiled OpenSSL, some auth methods will be unavailable\n"); |
| + (void) fprintf(stderr,"Not Compiled with OpenSSL, some auth methods will be unavailable\n"); |
| #endif /* ! HAVE_OPENSSL */ |
| rc = 0; |
| goto ExitProcessing; |
| --- a/utils.c |
| +++ b/utils.c |
| @@ -440,10 +440,12 @@ void initialize_openssl(char *cipher) |
| static const char rnd_seed[]="my huge entropy for rng.. blah"; |
| SSL_CTX *ssl_ctx=(SSL_CTX *) NULL; |
| SSL *ssl=NULL; |
| +#if OPENSSL_VERSION_NUMBER < 0x10100000L |
| SSL_library_init(); |
| SSL_load_error_strings(); |
| - RAND_seed(rnd_seed,sizeof(rnd_seed)); |
| OpenSSL_add_all_algorithms(); |
| +#endif |
| + RAND_seed(rnd_seed,sizeof(rnd_seed)); |
| ssl_ctx=SSL_CTX_new(SSLv23_client_method()); |
| if (ssl_ctx == NULL) |
| { |
| @@ -825,7 +827,9 @@ char *encode_cram_md5(char *challenge,ch |
| return(NULL); |
| |
| showVerbose("Server Challenge: %s\n",challenge); |
| +#if OPENSSL_VERSION_NUMBER < 0x10100000L |
| OpenSSL_add_all_digests(); |
| +#endif |
| |
| /* decode the challenge */ |
| data=mutils_decode_base64((unsigned char *) challenge,strlen(challenge),&data_len); |