f0a167fc8c
- Update to 11.16 - Allow to select and remove invalid config file - Migrated all HTTPS requests to use libcurl (Linux, macOS) - Set keyboard focus on config panel after startup - Added computer name to log file trailer - Context menu instead of confirmation dialog for swap sides - Fixed config selection lost after auto-cleaning obsolete rows - Install app files with owner set to root (Linux) - Don't override keyboard shortcut "CTRL + W" (macOS) - Migrated key conversion routines deprecated in OpenSSL 3.0 - Boxed app icon to fit OS theme (macOS) - Fixed manual retry after automatic update check error - Fixed missing ampersands in middle grid tooltip - Changes from 11.15 - Play sound reminder when waiting for user confirmation - Enhanced crash diagnostics with known triggers - Defer reporting third-party incompatibilities until after crashing - Fixed Server 2019 not being detected for log file - Use native representation for modified config (macOS) - Improved WinMerge detection for external app integration - Changes from 11.14 - Authenticate (S)FTP connections using OpenSSL 3.0 - Fixed E_NOINTERFACE error after synchronization - Preempt crashes due to Nahimic Sonic Studio 3 - Hide main window when minimizing progress window (macOS) - Avoid second dock icon when minimizing progress window (macOS) - Add FreeFileSync-openssl-1.1.1.patch to fix build with openssl 1.1.1 - Update FreeFileSync-disable-in-app-updates.patch for version 11.16 - Rename FreeFileSync-Build.patch to FreeFileSync-build.patch - Rename FreeFileSync-icon_loader.patch to FreeFileSync-icon-loader.patch - Rename FreeFileSync-Resources.patch to FreeFileSync-resources.patch OBS-URL: https://build.opensuse.org/request/show/948470 OBS-URL: https://build.opensuse.org/package/show/network/FreeFileSync?expand=0&rev=53
53 lines
2.4 KiB
Diff
53 lines
2.4 KiB
Diff
Summary: Compile for libss-dev 1.1.1m
|
|
Author: bgstack15
|
|
Date: 2022-01-04
|
|
Version: 11.16
|
|
Message: Compile on Devuan Ceres with libssl-dev_1.1.1m-1
|
|
diff -aur 11.13/zen/open_ssl.cpp 11.14/zen/open_ssl.cpp
|
|
--- 11.16-0/zen/open_ssl.cpp 2022-01-04 10:04:34.135914294 -0500
|
|
+++ 11.16-1/zen/open_ssl.cpp 2022-01-04 10:29:12.544451067 -0500
|
|
@@ -201,7 +201,7 @@
|
|
|
|
//================================================================================
|
|
|
|
-std::string keyToStream(const EVP_PKEY* evp, RsaStreamType streamType, bool publicKey) //throw SysError
|
|
+std::string keyToStream(EVP_PKEY* evp, RsaStreamType streamType, bool publicKey) //throw SysError
|
|
{
|
|
//assert(::EVP_PKEY_get_base_id(evp) == EVP_PKEY_RSA);
|
|
|
|
@@ -210,7 +210,7 @@
|
|
case RsaStreamType::pkix:
|
|
{
|
|
//fix OpenSSL API inconsistencies:
|
|
- auto PEM_write_bio_PrivateKey2 = [](BIO* bio, const EVP_PKEY* key)
|
|
+ auto PEM_write_bio_PrivateKey2 = [](BIO* bio, EVP_PKEY* key)
|
|
{
|
|
return ::PEM_write_bio_PrivateKey(bio, //BIO* bp
|
|
key, //const EVP_PKEY* x
|
|
@@ -269,7 +269,7 @@
|
|
return {reinterpret_cast<const char*>(keyBuf), keyLen};
|
|
#else
|
|
//fix OpenSSL API inconsistencies:
|
|
- auto PEM_write_bio_RSAPrivateKey2 = [](BIO* bio, const RSA* rsa)
|
|
+ auto PEM_write_bio_RSAPrivateKey2 = [](BIO* bio, RSA* rsa)
|
|
{
|
|
return ::PEM_write_bio_RSAPrivateKey(bio, //BIO* bp
|
|
rsa, //const RSA* x
|
|
@@ -279,14 +279,14 @@
|
|
nullptr, //pem_password_cb* cb
|
|
nullptr); //void* u
|
|
};
|
|
- auto PEM_write_bio_RSAPublicKey2 = [](BIO* bio, const RSA* rsa) { return ::PEM_write_bio_RSAPublicKey(bio, rsa); };
|
|
+ auto PEM_write_bio_RSAPublicKey2 = [](BIO* bio, RSA* rsa) { return ::PEM_write_bio_RSAPublicKey(bio, rsa); };
|
|
|
|
BIO* bio = ::BIO_new(BIO_s_mem());
|
|
if (!bio)
|
|
throw SysError(formatLastOpenSSLError("BIO_new"));
|
|
ZEN_ON_SCOPE_EXIT(::BIO_free_all(bio));
|
|
|
|
- const RSA* rsa = ::EVP_PKEY_get0_RSA(evp); //unowned reference!
|
|
+ RSA* rsa = ::EVP_PKEY_get0_RSA(evp); //unowned reference!
|
|
if (!rsa)
|
|
throw SysError(formatLastOpenSSLError("EVP_PKEY_get0_RSA"));
|
|
|