From d339c145870a86c37509debe5d8fa145e192f390 Mon Sep 17 00:00:00 2001 From: "B. Stack" Date: Fri, 9 Feb 2024 21:09:54 -0500 Subject: ffs: major refresh on top of bastif dpkg --- freefilesync/debian/patches/ffs_openssl.patch | 52 --------------------------- 1 file changed, 52 deletions(-) delete mode 100644 freefilesync/debian/patches/ffs_openssl.patch (limited to 'freefilesync/debian/patches/ffs_openssl.patch') diff --git a/freefilesync/debian/patches/ffs_openssl.patch b/freefilesync/debian/patches/ffs_openssl.patch deleted file mode 100644 index 7097d33..0000000 --- a/freefilesync/debian/patches/ffs_openssl.patch +++ /dev/null @@ -1,52 +0,0 @@ -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(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")); - -- cgit