summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDwayne C. Litzenberger <dlitz@dlitz.net>2009-12-13 14:43:48 -0500
committerDwayne C. Litzenberger <dlitz@dlitz.net>2009-12-13 14:47:26 -0500
commitf05263c70f66dc4ee955b3ddcc02e5958070a5ff (patch)
tree36cdadb08578d44732786aadc343f052ff0fdb2b
parent7ac1798a27bdccfedfd8c352953a9122cc2e6a62 (diff)
downloadpycrypto-f05263c70f66dc4ee955b3ddcc02e5958070a5ff.tar.gz
Fix building PyCrypto on Win64 using MS Visual Studio 9.0.
Thanks to Nevins Bartolomeo (https://launchpad.net/~nevins-bartolomeo) for contributing this fix.
-rw-r--r--ACKS1
-rw-r--r--ChangeLog7
-rw-r--r--src/block_template.c3
3 files changed, 10 insertions, 1 deletions
diff --git a/ACKS b/ACKS
index dcee84c..94f8bdb 100644
--- a/ACKS
+++ b/ACKS
@@ -13,6 +13,7 @@ Please let me know if your name isn't here and should be!
- Dwayne C. Litzenberger
+Nevins Bartolomeo
Tim Berners-Lee
Ian Bicking
Joris Bontje
diff --git a/ChangeLog b/ChangeLog
index 8b612a8..9f6bcd3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2.1.0beta2
+==========
+
+ * Fix building PyCrypto on Win64 using MS Visual Studio 9.
+ (Thanks: Nevins Bartolomeo.)
+
+
2.1.0beta1
==========
diff --git a/src/block_template.c b/src/block_template.c
index 0448044..9ce2de6 100644
--- a/src/block_template.c
+++ b/src/block_template.c
@@ -431,8 +431,9 @@ ALG_Encrypt(ALGobject *self, PyObject *args)
self->IV);
ctr->inc_func(ctr);
} else {
+ PyObject *ctr;
Py_BLOCK_THREADS;
- PyObject *ctr = PyObject_CallObject(self->counter, NULL);
+ ctr = PyObject_CallObject(self->counter, NULL);
if (ctr == NULL) {
free(buffer);
return NULL;