| b.liu | e958203 | 2025-04-17 19:18:16 +0800 | [diff] [blame^] | 1 | From cc9dbd4bcd9ab3133d771c94c0466356703276a8 Mon Sep 17 00:00:00 2001 |
| 2 | From: Eneas U de Queiroz <cote2004-github@yahoo.com> |
| 3 | Date: Fri, 8 Jun 2018 14:41:23 -0300 |
| 4 | Subject: [PATCH] Removed API deprecated by OpenSSL 1.1.0 |
| 5 | |
| 6 | Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com> |
| 7 | --- |
| 8 | main.c | 10 +++++++++- |
| 9 | utils.c | 6 +++++- |
| 10 | 2 files changed, 14 insertions(+), 2 deletions(-) |
| 11 | |
| 12 | --- a/main.c |
| 13 | +++ b/main.c |
| 14 | @@ -91,7 +91,11 @@ static void usage(void) |
| 15 | (void) printf(" Copyright: %.1024s\n\n",NO_SPAM_STATEMENT); |
| 16 | #ifdef HAVE_OPENSSL |
| 17 | (void) fprintf(stdout," (Compiled with OpenSSL version: %s)\n", |
| 18 | +# if OPENSSL_VERSION_NUMBER < 0x10100000L |
| 19 | SSLeay_version(SSLEAY_VERSION)); |
| 20 | +# else |
| 21 | + OpenSSL_version(OPENSSL_VERSION)); |
| 22 | +# endif |
| 23 | #else |
| 24 | (void) fprintf(stdout," (Not compiled with OpenSSL)\n"); |
| 25 | #endif /* HAVE_OPENSSL */ |
| 26 | @@ -1056,9 +1060,13 @@ int main(int argc,char **argv) |
| 27 | (void) fprintf(stderr,"mailsend Version: %.1024s\n",MAILSEND_VERSION); |
| 28 | #ifdef HAVE_OPENSSL |
| 29 | (void) fprintf(stderr,"Compiled with OpenSSL: %s\n", |
| 30 | +# if OPENSSL_VERSION_NUMBER < 0x10100000L |
| 31 | SSLeay_version(SSLEAY_VERSION)); |
| 32 | +# else |
| 33 | + OpenSSL_version(OPENSSL_VERSION)); |
| 34 | +# endif |
| 35 | #else |
| 36 | - (void) fprintf(stderr,"Not Compiled OpenSSL, some auth methods will be unavailable\n"); |
| 37 | + (void) fprintf(stderr,"Not Compiled with OpenSSL, some auth methods will be unavailable\n"); |
| 38 | #endif /* ! HAVE_OPENSSL */ |
| 39 | rc = 0; |
| 40 | goto ExitProcessing; |
| 41 | --- a/utils.c |
| 42 | +++ b/utils.c |
| 43 | @@ -440,10 +440,12 @@ void initialize_openssl(char *cipher) |
| 44 | static const char rnd_seed[]="my huge entropy for rng.. blah"; |
| 45 | SSL_CTX *ssl_ctx=(SSL_CTX *) NULL; |
| 46 | SSL *ssl=NULL; |
| 47 | +#if OPENSSL_VERSION_NUMBER < 0x10100000L |
| 48 | SSL_library_init(); |
| 49 | SSL_load_error_strings(); |
| 50 | - RAND_seed(rnd_seed,sizeof(rnd_seed)); |
| 51 | OpenSSL_add_all_algorithms(); |
| 52 | +#endif |
| 53 | + RAND_seed(rnd_seed,sizeof(rnd_seed)); |
| 54 | ssl_ctx=SSL_CTX_new(SSLv23_client_method()); |
| 55 | if (ssl_ctx == NULL) |
| 56 | { |
| 57 | @@ -825,7 +827,9 @@ char *encode_cram_md5(char *challenge,ch |
| 58 | return(NULL); |
| 59 | |
| 60 | showVerbose("Server Challenge: %s\n",challenge); |
| 61 | +#if OPENSSL_VERSION_NUMBER < 0x10100000L |
| 62 | OpenSSL_add_all_digests(); |
| 63 | +#endif |
| 64 | |
| 65 | /* decode the challenge */ |
| 66 | data=mutils_decode_base64((unsigned char *) challenge,strlen(challenge),&data_len); |