cubixle/packages
1
0
Fork 0
mirror of https://github.com/novatiq/packages.git synced 2026-04-30 07:28:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

emailrelay: Update to 2.0

Browse Source 
Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
Rosen Penev
2018-07-28 15:31:42 -07:00
parent 688014e89e
commit 213f482d30
3 changed files with 56 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mail/emailrelay/patches/010-openssl-1.1.patch
+43
View File
@@ -0,0 +1,43 @@
diff --git a/src/gssl/gssl_openssl.cpp b/src/gssl/gssl_openssl.cpp
index 0e9b73b..49927db 100644
--- a/src/gssl/gssl_openssl.cpp
+++ b/src/gssl/gssl_openssl.cpp
@@ -52,10 +52,14 @@ GSsl::OpenSSL::LibraryImp::LibraryImp( G::StringArray & library_config , Library
m_verbose(verbose) ,
m_config(library_config)
{
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
SSL_load_error_strings() ;
SSL_library_init() ;
- int rc = RAND_status() ; G_IGNORE_VARIABLE(rc) ;
OpenSSL_add_all_digests() ;
+#else
+ OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS, NULL) ;
+#endif
+ int rc = RAND_status() ; G_IGNORE_VARIABLE(rc) ;
// allocate a slot for a pointer from SSL to ProtocolImp
m_index = SSL_get_ex_new_index( 0 , nullptr , nullptr , nullptr , nullptr ) ;
@@ -73,15 +77,21 @@ GSsl::OpenSSL::LibraryImp::~LibraryImp()
void GSsl::OpenSSL::LibraryImp::cleanup()
{
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
// ffs...
ERR_free_strings() ;
RAND_cleanup() ;
- CRYPTO_cleanup_all_ex_data();
+ CRYPTO_cleanup_all_ex_data() ;
+#endif
}
std::string GSsl::OpenSSL::LibraryImp::sid()
{
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
return G::Str::printable( SSLeay_version(SSLEAY_VERSION) ) ;
+#else
+ return G::Str::printable( OpenSSL_version(OPENSSL_VERSION) ) ;
+#endif
}
std::string GSsl::OpenSSL::LibraryImp::id() const
mail/emailrelay/patches/010-ssl3-fix.patch
-13
View File
@@ -1,13 +0,0 @@
--- a/src/gssl/gssl_openssl.cpp
+++ b/src/gssl/gssl_openssl.cpp
@@ -292,8 +292,10 @@ GSsl::Context::Context( const std::strin
{
if( (flags&3U) == 2U )
m_ssl_ctx = SSL_CTX_new(SSLv23_method()) ;
+#ifdef SSL3_SUPPORT
else if( (flags&3U) == 3U )
m_ssl_ctx = SSL_CTX_new(SSLv3_method()) ;
+#endif
else
m_ssl_ctx = SSL_CTX_new(TLSv1_method()) ;