b1cbd93bcd
The crude loop I wrote to come up with this changeset:
find -L package/feeds/packages/ -name patches | \
sed 's/patches$/refresh/' | sort | xargs make
Signed-off-by: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
(cherry picked from commit 5d8d4fbbcb)
Signed-off-by: Jeffery To <jeffery.to@gmail.com>
38 lines
1.1 KiB
Diff
38 lines
1.1 KiB
Diff
--- a/src/gssl/gssl_openssl.cpp
|
|
+++ b/src/gssl/gssl_openssl.cpp
|
|
@@ -51,10 +51,12 @@ GSsl::OpenSSL::LibraryImp::LibraryImp( G
|
|
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(int,rc) ;
|
|
OpenSSL_add_all_digests() ;
|
|
+#endif
|
|
+ int rc = RAND_status() ; G_IGNORE_VARIABLE(int,rc) ;
|
|
|
|
// allocate a slot for a pointer from SSL to ProtocolImp
|
|
m_index = SSL_get_ex_new_index( 0 , nullptr , nullptr , nullptr , nullptr ) ;
|
|
@@ -72,15 +74,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();
|
|
+#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
|