dfe0a0edbc
Applied a patch merged upstream that adds support to openssl 1.1.0, and added a patch, just submitted upstream, that enables compilation with openssl 1.1.0 built without deprecated API. Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
44 lines
1.6 KiB
Diff
44 lines
1.6 KiB
Diff
From 2d585baa473314f79d492c0876b3bbf96758562c 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 +++++++++-
|
|
1 file changed, 9 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/main.c b/main.c
|
|
index d275e6a..51bfb1d 100755
|
|
--- 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;
|
|
--
|
|
2.16.4
|
|
|