summaryrefslogtreecommitdiffstats
path: root/python/python-axolotl-curve25519
diff options
context:
space:
mode:
Diffstat (limited to 'python/python-axolotl-curve25519')
-rw-r--r--python/python-axolotl-curve25519/patches/2bd1f5556fed92afb4efc2a95846a1c0f8332baf.patch43
-rw-r--r--python/python-axolotl-curve25519/patches/87303fb7cffc99c13895c9888b270b740a7245d0.patch40
-rw-r--r--python/python-axolotl-curve25519/patches/e31fe347051e8dd051514398c56a816a3a71f8a4.patch22
-rw-r--r--python/python-axolotl-curve25519/python-axolotl-curve25519.SlackBuild8
-rw-r--r--python/python-axolotl-curve25519/python-axolotl-curve25519.info6
5 files changed, 5 insertions, 114 deletions
diff --git a/python/python-axolotl-curve25519/patches/2bd1f5556fed92afb4efc2a95846a1c0f8332baf.patch b/python/python-axolotl-curve25519/patches/2bd1f5556fed92afb4efc2a95846a1c0f8332baf.patch
deleted file mode 100644
index 1e0af50bac..0000000000
--- a/python/python-axolotl-curve25519/patches/2bd1f5556fed92afb4efc2a95846a1c0f8332baf.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 2bd1f5556fed92afb4efc2a95846a1c0f8332baf Mon Sep 17 00:00:00 2001
-From: Josue Ortega <josueortega@debian.org.gt>
-Date: Sun, 15 Feb 2015 15:28:36 -0600
-Subject: [PATCH] Fixed prototype definition
-
----
- curve/ed25519/additions/zeroize.c | 4 ++--
- curve/ed25519/additions/zeroize.h | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/curve/ed25519/additions/zeroize.c b/curve/ed25519/additions/zeroize.c
-index 37c1f70..be4a8e3 100644
---- a/curve/ed25519/additions/zeroize.c
-+++ b/curve/ed25519/additions/zeroize.c
-@@ -3,14 +3,14 @@
- void zeroize(unsigned char* b, size_t len)
- {
- size_t count = 0;
-- unsigned long retval = 0;
-+ //unsigned long retval = 0;
- volatile unsigned char *p = b;
-
- for (count = 0; count < len; count++)
- p[count] = 0;
- }
-
--void zeroize_stack()
-+void zeroize_stack(void)
- {
- unsigned char m[ZEROIZE_STACK_SIZE];
- zeroize(m, sizeof m);
-diff --git a/curve/ed25519/additions/zeroize.h b/curve/ed25519/additions/zeroize.h
-index 80fcffb..7949924 100644
---- a/curve/ed25519/additions/zeroize.h
-+++ b/curve/ed25519/additions/zeroize.h
-@@ -7,6 +7,6 @@
-
- void zeroize(unsigned char* b, size_t len);
-
--void zeroize_stack();
-+void zeroize_stack(void);
-
- #endif
diff --git a/python/python-axolotl-curve25519/patches/87303fb7cffc99c13895c9888b270b740a7245d0.patch b/python/python-axolotl-curve25519/patches/87303fb7cffc99c13895c9888b270b740a7245d0.patch
deleted file mode 100644
index 4e172f7d40..0000000000
--- a/python/python-axolotl-curve25519/patches/87303fb7cffc99c13895c9888b270b740a7245d0.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 87303fb7cffc99c13895c9888b270b740a7245d0 Mon Sep 17 00:00:00 2001
-From: Josue Ortega <josueortega@debian.org.gt>
-Date: Sun, 15 Feb 2015 15:29:41 -0600
-Subject: [PATCH] Fixed differ in signedness [-Wpointer-sign] warning
-
----
- curve25519module.c | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/curve25519module.c b/curve25519module.c
-index 4c8ec96..f4bd3d7 100644
---- a/curve25519module.c
-+++ b/curve25519module.c
-@@ -47,7 +47,8 @@ calculateSignature(PyObject *self, PyObject *args)
- return NULL;
- }
-
-- curve25519_sign(signature, privatekey, message, messagelen, random);
-+ curve25519_sign((unsigned char *)signature, (unsigned char *)privatekey,
-+ (unsigned char *)message, messagelen, (unsigned char *)random);
-
- return PyBytes_FromStringAndSize((char *)signature, 64);
- }
-@@ -73,7 +74,8 @@ verifySignature(PyObject *self, PyObject *args)
- return NULL;
- }
-
-- int result = curve25519_verify(signature, publickey, message, messagelen);
-+ int result = curve25519_verify((unsigned char *)signature, (unsigned char *)publickey,
-+ (unsigned char *)message, messagelen);
-
- return Py_BuildValue("i", result);
-
-@@ -173,4 +175,4 @@ curve25519_functions[] = {
- (void)Py_InitModule("axolotl_curve25519", curve25519_functions);
- }
-
--#endif
-\ No newline at end of file
-+#endif
diff --git a/python/python-axolotl-curve25519/patches/e31fe347051e8dd051514398c56a816a3a71f8a4.patch b/python/python-axolotl-curve25519/patches/e31fe347051e8dd051514398c56a816a3a71f8a4.patch
deleted file mode 100644
index c6113a6358..0000000000
--- a/python/python-axolotl-curve25519/patches/e31fe347051e8dd051514398c56a816a3a71f8a4.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From e31fe347051e8dd051514398c56a816a3a71f8a4 Mon Sep 17 00:00:00 2001
-From: Josue Ortega <josueortega@debian.org.gt>
-Date: Sun, 15 Feb 2015 15:27:54 -0600
-Subject: [PATCH] Removed unused variable
-
----
- curve/ed25519/additions/curve_sigs.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/curve/ed25519/additions/curve_sigs.c b/curve/ed25519/additions/curve_sigs.c
-index 51f2052..fa78eaf 100644
---- a/curve/ed25519/additions/curve_sigs.c
-+++ b/curve/ed25519/additions/curve_sigs.c
-@@ -7,7 +7,7 @@ void curve25519_keygen(unsigned char* curve25519_pubkey_out,
- const unsigned char* curve25519_privkey_in)
- {
- ge_p3 ed; /* Ed25519 pubkey point */
-- fe ed_y, ed_y_plus_one, one_minus_ed_y, inv_one_minus_ed_y;
-+ fe ed_y_plus_one, one_minus_ed_y, inv_one_minus_ed_y;
- fe mont_x;
-
- /* Perform a fixed-base multiplication of the Edwards base point,
diff --git a/python/python-axolotl-curve25519/python-axolotl-curve25519.SlackBuild b/python/python-axolotl-curve25519/python-axolotl-curve25519.SlackBuild
index 60e2a4f9f1..846851d5a7 100644
--- a/python/python-axolotl-curve25519/python-axolotl-curve25519.SlackBuild
+++ b/python/python-axolotl-curve25519/python-axolotl-curve25519.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for python-axolotl-curve25519
-# Copyright 2016-2017 Andrew Clemons, Wellington New Zealand
+# Copyright 2016-2018 Andrew Clemons, Wellington New Zealand
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=python-axolotl-curve25519
-VERSION=${VERSION:-0.1}
+VERSION=${VERSION:-0.4.1.post2}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -63,10 +63,6 @@ rm -rf $PRGNAM-$VERSION
tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
cd $PRGNAM-$VERSION
-for sha1 in e31fe347051e8dd051514398c56a816a3a71f8a4 2bd1f5556fed92afb4efc2a95846a1c0f8332baf 87303fb7cffc99c13895c9888b270b740a7245d0 ; do
- patch -p1 < "$CWD/patches/$sha1.patch"
-done
-
chown -R root:root .
find -L . \
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
diff --git a/python/python-axolotl-curve25519/python-axolotl-curve25519.info b/python/python-axolotl-curve25519/python-axolotl-curve25519.info
index 6b8d5adb4a..b8f34cffd0 100644
--- a/python/python-axolotl-curve25519/python-axolotl-curve25519.info
+++ b/python/python-axolotl-curve25519/python-axolotl-curve25519.info
@@ -1,8 +1,8 @@
PRGNAM="python-axolotl-curve25519"
-VERSION="0.1"
+VERSION="0.4.1.post2"
HOMEPAGE="https://github.com/tgalal/python-axolotl-curve25519"
-DOWNLOAD="https://pypi.python.org/packages/69/e0/9605cac4c83c12d0bef5c2e9992f0bcbce4fae9a252899d545ccb7dc8717/python-axolotl-curve25519-0.1.tar.gz"
-MD5SUM="f28d902df9044f0bf86a35a4bd2ec092"
+DOWNLOAD="https://pypi.python.org/packages/59/ca/c8111718bcc8da18e9b9868e784293232a58c57159a5ea18f00ee967258f/python-axolotl-curve25519-0.4.1.post2.tar.gz"
+MD5SUM="ce62cbf7277a20446c2aa1c803ecf3e3"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""