diff options
| author | Rosen Penev <rosenp@gmail.com> | 2021-03-20 15:11:04 -0700 |
|---|---|---|
| committer | Rosen Penev <rosenp@gmail.com> | 2021-03-21 00:12:01 -0700 |
| commit | dea0c273554f2030d95a39dd7ea3bc22016c394a (patch) | |
| tree | 4d9b03f0bafd5098988bc8a52965ec45adfda927 /libs | |
| parent | 4e387996f0a4107b942ad2b351565d13c4c47868 (diff) | |
uw-imap: fix no deprecated API OpenSSL
The previous patch was for OpenSSL 1.0.2.
Signed-off-by: Rosen Penev <rosenp@gmail.com>
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/uw-imap/Makefile | 2 | ||||
| -rw-r--r-- | libs/uw-imap/patches/020-deprecated-openssl.patch | 52 |
2 files changed, 53 insertions, 1 deletions
diff --git a/libs/uw-imap/Makefile b/libs/uw-imap/Makefile index 75a6c2875..5af93a53a 100644 --- a/libs/uw-imap/Makefile +++ b/libs/uw-imap/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=uw-imap PKG_VERSION:=2007f -PKG_RELEASE:=4 +PKG_RELEASE:=5 PKG_SOURCE:=imap-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:= \ diff --git a/libs/uw-imap/patches/020-deprecated-openssl.patch b/libs/uw-imap/patches/020-deprecated-openssl.patch index cd4d0f4e1..672b26aac 100644 --- a/libs/uw-imap/patches/020-deprecated-openssl.patch +++ b/libs/uw-imap/patches/020-deprecated-openssl.patch @@ -8,3 +8,55 @@ #undef crypt #define SSLBUFLEN 8192 +@@ -90,6 +91,11 @@ static char *start_tls = NIL; /* non-NIL + + static int sslonceonly = 0; + ++#if OPENSSL_API_COMPAT >= 0x10100000L ++#define SSL_CTX_need_tmp_RSA(ctx) 0 ++#define SSL_CTX_set_tmp_rsa_callback(ctx, cb) while(0) (cb)(NULL, 0, 0) ++#endif ++ + void ssl_onceonlyinit (void) + { + if (!sslonceonly++) { /* only need to call it once */ +@@ -114,7 +120,6 @@ void ssl_onceonlyinit (void) + /* apply runtime linkage */ + mail_parameters (NIL,SET_SSLDRIVER,(void *) &ssldriver); + mail_parameters (NIL,SET_SSLSTART,(void *) ssl_start); +- SSL_library_init (); /* add all algorithms */ + } + } + +@@ -220,9 +225,7 @@ static char *ssl_start_work (SSLSTREAM * + (sslclientkey_t) mail_parameters (NIL,GET_SSLCLIENTKEY,NIL); + if (ssl_last_error) fs_give ((void **) &ssl_last_error); + ssl_last_host = host; +- if (!(stream->context = SSL_CTX_new ((flags & NET_TLSCLIENT) ? +- TLSv1_client_method () : +- SSLv23_client_method ()))) ++ if (!(stream->context = SSL_CTX_new (TLS_client_method()))) + return "SSL context failed"; + SSL_CTX_set_options (stream->context,0); + /* disable certificate validation? */ +@@ -695,9 +698,6 @@ void ssl_server_init (char *server) + SSLSTREAM *stream = (SSLSTREAM *) memset (fs_get (sizeof (SSLSTREAM)),0, + sizeof (SSLSTREAM)); + ssl_onceonlyinit (); /* make sure algorithms added */ +- ERR_load_crypto_strings (); +- SSL_load_error_strings (); +- /* build specific certificate/key file names */ + sprintf (cert,"%s/%s-%s.pem",SSL_CERT_DIRECTORY,server,tcp_serveraddr ()); + sprintf (key,"%s/%s-%s.pem",SSL_KEY_DIRECTORY,server,tcp_serveraddr ()); + /* use non-specific name if no specific cert */ +@@ -708,9 +708,7 @@ void ssl_server_init (char *server) + if (stat (key,&sbuf)) strcpy (key,cert); + } + /* create context */ +- if (!(stream->context = SSL_CTX_new (start_tls ? +- TLSv1_server_method () : +- SSLv23_server_method ()))) ++ if (!(stream->context = SSL_CTX_new (TLS_server_method()))) + syslog (LOG_ALERT,"Unable to create SSL context, host=%.80s", + tcp_clienthost ()); + else { /* set context options */ |