summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Deutschmann <whissi@gentoo.org>2018-10-01 18:59:43 +0200
committerThomas Deutschmann <whissi@gentoo.org>2018-10-01 18:59:43 +0200
commit66ca2f7ff2c8a8f51193d5d75d7f1cc0b77e5a44 (patch)
tree315e53ddff7a904ed04cc3583b4d438f3bf881f6 /dev-python/pycryptopp/files
parentsys-fs/mtools: bump to v4.0.19 (diff)
downloadgentoo-66ca2f7ff2c8a8f51193d5d75d7f1cc0b77e5a44.tar.gz
gentoo-66ca2f7ff2c8a8f51193d5d75d7f1cc0b77e5a44.tar.bz2
gentoo-66ca2f7ff2c8a8f51193d5d75d7f1cc0b77e5a44.zip
dev-python/pycryptopp: fix building with crypto++-7+
Closes: https://bugs.gentoo.org/654614 Signed-off-by: Thomas Deutschmann <whissi@gentoo.org> Package-Manager: Portage-2.3.50, Repoman-2.3.11
Diffstat (limited to 'dev-python/pycryptopp/files')
-rw-r--r--dev-python/pycryptopp/files/pycryptopp-0.7.1-abi-change.patch55
1 files changed, 55 insertions, 0 deletions
diff --git a/dev-python/pycryptopp/files/pycryptopp-0.7.1-abi-change.patch b/dev-python/pycryptopp/files/pycryptopp-0.7.1-abi-change.patch
new file mode 100644
index 000000000000..d6edd2ecc630
--- /dev/null
+++ b/dev-python/pycryptopp/files/pycryptopp-0.7.1-abi-change.patch
@@ -0,0 +1,55 @@
+https://github.com/tahoe-lafs/pycryptopp/issues/42
+
+--- old/src/pycryptopp/cipher/aesmodule.cpp
++++ old/src/pycryptopp/cipher/aesmodule.cpp
+@@ -20,6 +20,8 @@
+ #include <src-cryptopp/aes.h>
+ #endif
+
++typedef unsigned char byte;
++
+ static const char*const aes___doc__ = "_aes counter mode cipher\n\
+ You are advised to run aes.start_up_self_test() after importing this module.";
+
+--- old/src/pycryptopp/cipher/xsalsa20module.cpp
++++ old/src/pycryptopp/cipher/xsalsa20module.cpp
+@@ -16,6 +16,8 @@
+ #include <src-cryptopp/salsa.h>
+ #endif
+
++typedef unsigned char byte;
++
+ static const char* const xsalsa20__doc__ = "_xsalsa20 cipher";
+
+ static PyObject *xsalsa20_error;
+--- old/src/pycryptopp/hash/sha256module.cpp
++++ old/src/pycryptopp/hash/sha256module.cpp
+@@ -21,6 +21,8 @@
+ #include <src-cryptopp/filters.h>
+ #endif
+
++typedef unsigned char byte;
++
+ static const char*const sha256___doc__ = "_sha256 hash function";
+
+ static PyObject *sha256_error;
+--- old/src/pycryptopp/publickey/rsamodule.cpp
++++ old/src/pycryptopp/publickey/rsamodule.cpp
+@@ -87,7 +87,7 @@
+ VerifyingKey_serialize(VerifyingKey *self, PyObject *dummy) {
+ std::string outstr;
+ StringSink ss(outstr);
+- self->k->DEREncode(ss);
++ self->k->GetMaterial().Save(ss);
+ PyStringObject* result = reinterpret_cast<PyStringObject*>(PyString_FromStringAndSize(outstr.c_str(), outstr.size()));
+ if (!result)
+ return NULL;
+@@ -216,7 +216,7 @@
+ SigningKey_serialize(SigningKey *self, PyObject *dummy) {
+ std::string outstr;
+ StringSink ss(outstr);
+- self->k->DEREncode(ss);
++ self->k->GetMaterial().Save(ss);
+ PyStringObject* result = reinterpret_cast<PyStringObject*>(PyString_FromStringAndSize(outstr.c_str(), outstr.size()));
+ if (!result)
+ return NULL;