commit add7bf043905420f8f4d7e7c04d138b8418df173
author Jean-Paul Calderone <exarkun@divmod.com> Sun Aug 22 17:38:30 2010 -0400
committer Jean-Paul Calderone <exarkun@divmod.com> Sun Aug 22 17:38:30 2010 -0400
tree 84180d8c4123cc1e42bd8d3ca4dba176ee54e19e
parent 07640f1c9a1cfecbad1ca51563c0b585eaf96adc

Fix the PKCS12 str/unicode usage in tests

OpenSSL/crypto/pkcs12.c

diff --git a/OpenSSL/crypto/pkcs12.c b/OpenSSL/crypto/pkcs12.c
index 18c0970..adb0c8d 100644
--- a/OpenSSL/crypto/pkcs12.c
+++ b/OpenSSL/crypto/pkcs12.c
@@ -203,7 +203,7 @@
         return NULL;
 
     if (name != Py_None && ! PyBytes_CheckExact(name)) {
-        PyErr_SetString(PyExc_TypeError, "name must be a str or None");
+        PyErr_SetString(PyExc_TypeError, "name must be a byte string or None");
         return NULL;
     }
 
@@ -367,7 +367,8 @@
          *  certificate. */
         alias_str = X509_alias_get0(cert, &alias_len);
         if (alias_str) {
-            if (!(self->friendlyname = Py_BuildValue("s#", alias_str, alias_len))) {
+            self->friendlyname = Py_BuildValue(FMT("#"), alias_str, alias_len);
+            if (!self->friendlyname) {
                 /*
                  * XXX Untested
                  */

OpenSSL/crypto/revoked.c

diff --git a/OpenSSL/crypto/revoked.c b/OpenSSL/crypto/revoked.c
index fd9a545..e043330 100644
--- a/OpenSSL/crypto/revoked.c
+++ b/OpenSSL/crypto/revoked.c
@@ -228,12 +228,6 @@
 @return: None\n\
 ";
 
-#ifdef PY3
-#define FMT(name) ("y" name)
-#else
-#define FMT(name) ("s" name)
-#endif
-
 static PyObject*
 crypto_Revoked_set_rev_date(crypto_RevokedObj *self, PyObject *args) {
     return _set_asn1_time(

OpenSSL/crypto/x509.c

diff --git a/OpenSSL/crypto/x509.c b/OpenSSL/crypto/x509.c
index 91550ca..3cd3145 100644
--- a/OpenSSL/crypto/x509.c
+++ b/OpenSSL/crypto/x509.c
@@ -365,12 +365,6 @@
 @return: None\n\
 ";
 
-#ifdef PY3
-#define FMT(name) ("y" name)
-#else
-#define FMT(name) ("s" name)
-#endif
-
 static PyObject*
 crypto_X509_set_notBefore(crypto_X509Obj *self, PyObject *args)
 {
@@ -397,8 +391,6 @@
             FMT(":set_notAfter"), X509_get_notAfter(self->x509), args);
 }
 
-#undef FMT
-
 PyObject*
 _get_asn1_time(char *format, ASN1_TIME* timestamp, PyObject *args)
 {