summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--setup.py14
-rw-r--r--src/IDEA.c5
-rw-r--r--src/RIPEMD.c6
4 files changed, 28 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 73b101d..7b69f8c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,16 @@
+1.9alpha4
+=========
+
+ * Fix compilation problem on Windows.
+
+
1.9alpha3
=========
* Fix a ref-counting bug that caused core dumps.
(Reported by Piers Lauder and an anonymous SF poster.)
-
+
1.9alpha2
=========
diff --git a/setup.py b/setup.py
index 6bdf8dd..e88bcdb 100644
--- a/setup.py
+++ b/setup.py
@@ -1,8 +1,14 @@
#! /usr/bin/env python
from distutils.core import setup, Extension
+import sys
+if sys.platform == 'win32':
+ HTONS_LIBS = ['ws2_32']
+else:
+ HTONS_LIBS = []
+
setup(name="pycrypto",
- version="1.9a3",
+ version="1.9a4",
description="Cryptographic modules for Python.",
author="A.M. Kuchling",
author_email="akuchlin@mems-exchange.org",
@@ -21,7 +27,8 @@ setup(name="pycrypto",
sources=["src/MD4.c"]),
Extension("Crypto.Hash.RIPEMD",
include_dirs=['src/'],
- sources=["src/RIPEMD.c"]),
+ sources=["src/RIPEMD.c"],
+ libraries=HTONS_LIBS),
# Block encryption algorithms
Extension("Crypto.Cipher.AES",
@@ -44,7 +51,8 @@ setup(name="pycrypto",
sources=["src/DES3.c"]),
Extension("Crypto.Cipher.IDEA",
include_dirs=['src/'],
- sources=["src/IDEA.c"]),
+ sources=["src/IDEA.c"],
+ libraries=HTONS_LIBS),
Extension("Crypto.Cipher.RC5",
include_dirs=['src/'],
sources=["src/RC5.c"]),
diff --git a/src/IDEA.c b/src/IDEA.c
index 5946f9f..01e16f2 100644
--- a/src/IDEA.c
+++ b/src/IDEA.c
@@ -10,9 +10,12 @@
*
*/
-
+#ifdef MS_WINDOWS
+#include <winsock2.h>
+#else
#include <sys/param.h>
#include <netinet/in.h>
+#endif
#define MODULE_NAME IDEA
#define BLOCK_SIZE 8
diff --git a/src/RIPEMD.c b/src/RIPEMD.c
index 62e13f9..59d48b1 100644
--- a/src/RIPEMD.c
+++ b/src/RIPEMD.c
@@ -16,8 +16,14 @@
\********************************************************************/
#include <string.h>
+
+#ifdef MS_WINDOWS
+#include <winsock2.h>
+#else
#include <sys/param.h>
#include <netinet/in.h>
+#endif
+
#include "Python.h"
#define MODULE_NAME RIPEMD