commit 3fe7f67111c6e059e4d5ecaa0de0cd60fb45c2b0
author Jean-Paul Calderone <exarkun@divmod.com> Wed Aug 11 23:55:10 2010 -0400
committer Jean-Paul Calderone <exarkun@divmod.com> Wed Aug 11 23:55:10 2010 -0400
tree 0fa1e785df7782dcf022987033b8ab27f7e6adfe
parent 7382c831ab4de44e00abfe70a8d75d89784c834b

Fix type definitions, module init return values, and unicode/bytes conversions

OpenSSL/crypto/x509name.c

diff --git a/OpenSSL/crypto/x509name.c b/OpenSSL/crypto/x509name.c
index 83f3c21..7cb7fed 100644
--- a/OpenSSL/crypto/x509name.c
+++ b/OpenSSL/crypto/x509name.c
@@ -152,7 +152,11 @@
 {
     int nid, len;
     char *utf8string;
-    char *name = _PyUnicode_AsString(nameobj);
+    char *name;
+#ifdef PY3
+    nameobj = PyUnicode_AsASCIIString(nameobj);
+#endif
+    name = PyBytes_AsString(nameobj);
 
     if ((nid = OBJ_txt2nid(name)) == NID_undef) {
         /*
@@ -456,7 +460,7 @@
 #undef ADD_METHOD
 
 PyTypeObject crypto_X509Name_Type = {
-    PyVarObject_HEAD_INIT(&PyType_Type, 0)
+    PyOpenSSL_HEAD_INIT(&PyType_Type, 0)
     "X509Name",
     sizeof(crypto_X509NameObj),
     0,