1170198d65
* gnu/packages/networking.scm (amule): New public variable. * gnu/packages/patches/amule_crypto-6.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. Signed-off-by: Ludovic Courtès <ludo@gnu.org>
46 lines
1.8 KiB
Diff
46 lines
1.8 KiB
Diff
From d1d1368c7909ffd8423730afaa811ce7b6a3a8aa Mon Sep 17 00:00:00 2001
|
|
From: Tommy Jerry Mairo <tommy.mairo@gmail.com>
|
|
Date: Sun, 4 Feb 2018 12:42:00 -0800
|
|
Subject: [PATCH 1/2] Bugfix: API mismatch with crypto++ 6.0.0
|
|
|
|
---
|
|
src/ClientCreditsList.cpp | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/src/ClientCreditsList.cpp b/src/ClientCreditsList.cpp
|
|
index 3bea9fe2d..a7ae1e34c 100644
|
|
--- a/src/ClientCreditsList.cpp
|
|
+++ b/src/ClientCreditsList.cpp
|
|
@@ -312,7 +312,7 @@ void CClientCreditsList::InitalizeCrypting()
|
|
// calculate and store public key
|
|
CryptoPP::RSASSA_PKCS1v15_SHA_Verifier pubkey(*static_cast<CryptoPP::RSASSA_PKCS1v15_SHA_Signer *>(m_pSignkey));
|
|
CryptoPP::ArraySink asink(m_abyMyPublicKey, 80);
|
|
- pubkey.DEREncode(asink);
|
|
+ pubkey.AccessMaterial().Save(asink);
|
|
m_nMyPublicKeyLen = asink.TotalPutLength();
|
|
asink.MessageEnd();
|
|
} catch (const CryptoPP::Exception& e) {
|
|
|
|
From 88ba0ac952b78382445f2fff73c6792c0474dc62 Mon Sep 17 00:00:00 2001
|
|
From: Tommy Jerry Mairo <tommy.mairo@gmail.com>
|
|
Date: Wed, 21 Mar 2018 11:56:28 -0700
|
|
Subject: [PATCH 2/2] Update: Change AccessMaterial to GetMaterial
|
|
|
|
---
|
|
src/ClientCreditsList.cpp | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/src/ClientCreditsList.cpp b/src/ClientCreditsList.cpp
|
|
index a7ae1e34c..69e881fd8 100644
|
|
--- a/src/ClientCreditsList.cpp
|
|
+++ b/src/ClientCreditsList.cpp
|
|
@@ -312,7 +312,7 @@ void CClientCreditsList::InitalizeCrypting()
|
|
// calculate and store public key
|
|
CryptoPP::RSASSA_PKCS1v15_SHA_Verifier pubkey(*static_cast<CryptoPP::RSASSA_PKCS1v15_SHA_Signer *>(m_pSignkey));
|
|
CryptoPP::ArraySink asink(m_abyMyPublicKey, 80);
|
|
- pubkey.AccessMaterial().Save(asink);
|
|
+ pubkey.GetMaterial().Save(asink);
|
|
m_nMyPublicKeyLen = asink.TotalPutLength();
|
|
asink.MessageEnd();
|
|
} catch (const CryptoPP::Exception& e) {
|