Bug#988961: unblock: python-libnacl/1.7.2-3
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
X-Debbugs-Cc: Colin Watson <cjwatson@debian.org>
Please unblock package python-libnacl
python-libnacl (1.7.2-3) unstable; urgency=medium
* Team upload.
* Patch: Fix crypto_kdf_derive_from_key() on 32-bit platforms.
(Closes: #988102)
-- Stefano Rivera <stefanor@debian.org> Fri, 21 May 2021 16:35:48 -0400
[ Reason ]
Fixes a crash on 32bit platforms.
[ Impact ]
libnacl's KDF is broken on 32bit platforms.
[ Tests ]
The test suite covers the affected code. Test-built (running the test
suite) on i386 and armhf.
[ Risks ]
Trivial change.
Patch is carried by Gentoo, too.
[ Checklist ]
[x] all changes are documented in the d/changelog
[x] I reviewed all changes and I approve them
[x] attach debdiff against the package in testing
unblock python-libnacl/1.7.2-3
diff -Nru python-libnacl-1.7.2/debian/changelog python-libnacl-1.7.2/debian/changelog
--- python-libnacl-1.7.2/debian/changelog 2020-11-14 08:40:57.000000000 -0400
+++ python-libnacl-1.7.2/debian/changelog 2021-05-21 16:35:48.000000000 -0400
@@ -1,3 +1,11 @@
+python-libnacl (1.7.2-3) unstable; urgency=medium
+
+ * Team upload.
+ * Patch: Fix crypto_kdf_derive_from_key() on 32-bit platforms.
+ (Closes: #988102)
+
+ -- Stefano Rivera <stefanor@debian.org> Fri, 21 May 2021 16:35:48 -0400
+
python-libnacl (1.7.2-2) unstable; urgency=medium
* Add Breaks: python3-duniterpy (<< 0.60.1) (see #974655).
diff -Nru python-libnacl-1.7.2/debian/.gitignore python-libnacl-1.7.2/debian/.gitignore
--- python-libnacl-1.7.2/debian/.gitignore 2020-11-14 08:40:57.000000000 -0400
+++ python-libnacl-1.7.2/debian/.gitignore 1969-12-31 20:00:00.000000000 -0400
@@ -1,6 +0,0 @@
-*.debhelper*
-*.substvars
-debhelper-build-stamp
-files
-python-libnacl
-python3-libnacl
diff -Nru python-libnacl-1.7.2/debian/patches/32bit-kdf.patch python-libnacl-1.7.2/debian/patches/32bit-kdf.patch
--- python-libnacl-1.7.2/debian/patches/32bit-kdf.patch 1969-12-31 20:00:00.000000000 -0400
+++ python-libnacl-1.7.2/debian/patches/32bit-kdf.patch 2021-05-21 16:35:48.000000000 -0400
@@ -0,0 +1,24 @@
+From: =?utf-8?b?TWljaGHFgiBHw7Nybnk=?= <mgorny@gentoo.org>
+Date: Fri, 21 May 2021 16:25:27 -0400
+Subject: Fix crypto_kdf_derive_from_key() on 32-bit platforms
+
+Bug-Upstream: https://github.com/saltstack/libnacl/issues/126
+Bug-Debian: https://bugs.debian.org/988102
+Forwarded: https://github.com/saltstack/libnacl/pull/130
+---
+ libnacl/__init__.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libnacl/__init__.py b/libnacl/__init__.py
+index 98a53d9..f799b23 100644
+--- a/libnacl/__init__.py
++++ b/libnacl/__init__.py
+@@ -1195,7 +1195,7 @@ def crypto_kdf_derive_from_key(subkey_size, subkey_id, context, master_key):
+ """
+ size = int(subkey_size)
+ buf = ctypes.create_string_buffer(size)
+- nacl.crypto_kdf_derive_from_key(buf, subkey_size, subkey_id, context, master_key)
++ nacl.crypto_kdf_derive_from_key(buf, subkey_size, ctypes.c_ulonglong(subkey_id), context, master_key)
+ return buf.raw
+
+
diff -Nru python-libnacl-1.7.2/debian/patches/series python-libnacl-1.7.2/debian/patches/series
--- python-libnacl-1.7.2/debian/patches/series 1969-12-31 20:00:00.000000000 -0400
+++ python-libnacl-1.7.2/debian/patches/series 2021-05-21 16:35:48.000000000 -0400
@@ -0,0 +1 @@
+32bit-kdf.patch
Reply to: