apply pyOpenSSL-0.8.patch from Marc-Andre Lemburg
diff --git a/src/crypto/x509name.c b/src/crypto/x509name.c
index d304591..5402b3d 100644
--- a/src/crypto/x509name.c
+++ b/src/crypto/x509name.c
@@ -13,7 +13,7 @@
#define crypto_MODULE
#include "crypto.h"
-static PyMethodDef crypto_X509Name_methods[];
+static PyMethodDef crypto_X509Name_methods[4];
/*
* Constructor for X509Name, never called by Python code directly
@@ -102,8 +102,9 @@
}
/* Add the new entry */
- if (!X509_NAME_add_entry_by_NID(name, nid, MBSTRING_UTF8, utf8string,
- -1, -1, 0))
+ if (!X509_NAME_add_entry_by_NID(name, nid, MBSTRING_UTF8,
+ (unsigned char *)utf8string,
+ -1, -1, 0))
{
exception_from_error_queue();
return -1;
@@ -193,9 +194,8 @@
return -1;
} else if (result > 0) {
return 1;
- } else if (result == 0) {
+ } else
return 0;
- }
}
/*
@@ -318,7 +318,7 @@
tuple = PyTuple_New(2);
PyTuple_SetItem(tuple, 0, PyString_FromString(OBJ_nid2sn(nid)));
- PyTuple_SetItem(tuple, 1, PyString_FromStringAndSize(str, l));
+ PyTuple_SetItem(tuple, 1, PyString_FromStringAndSize((char *)str, l));
PyList_SetItem(list, i, tuple);
}