commit 5d441aae8ce2364971902e659e723d2946fb9709
author Jean-Paul Calderone <exarkun@divmod.com> Sat Oct 02 18:34:52 2010 -0400
committer Jean-Paul Calderone <exarkun@divmod.com> Sat Oct 02 18:34:52 2010 -0400
tree b34ca5b5787c6b0c899aa1131239f71ed355e090
parent 22cb312d9ab42ac8cc315e5745d669b11646f6af

Make the digest name to the verify function text instead of bytes, matching up with digest names elsewhere.

OpenSSL/crypto/crl.c

diff --git a/OpenSSL/crypto/crl.c b/OpenSSL/crypto/crl.c
index 83691fb..bc76f22 100644
--- a/OpenSSL/crypto/crl.c
+++ b/OpenSSL/crypto/crl.c
@@ -116,7 +116,10 @@
 @type cert: L{X509}\n\
 @param key: Used to sign CRL.\n\
 @type key: L{PKey}\n\
-@return: None\n\
+@param type: The export format, either L{FILETYPE_PEM}, L{FILETYPE_ASN1}, or L{FILETYPE_TEXT}.\n\
+@param days: The number of days until the next update of this CRL.\n\
+@type days: L{int}\n\
+@return: L{str}\n\
 ";
 static PyObject *
 crypto_CRL_export(crypto_CRLObj *self, PyObject *args, PyObject *keywds) {

OpenSSL/crypto/crypto.c

diff --git a/OpenSSL/crypto/crypto.c b/OpenSSL/crypto/crypto.c
index a81773d..1a122b2 100644
--- a/OpenSSL/crypto/crypto.c
+++ b/OpenSSL/crypto/crypto.c
@@ -625,7 +625,7 @@
     unsigned char sig_buf[512];
 
     if (!PyArg_ParseTuple(
-            args, "O!" BYTESTRING_FMT BYTESTRING_FMT ":sign", &crypto_PKey_Type,
+            args, "O!" BYTESTRING_FMT "s:sign", &crypto_PKey_Type,
             &pkey, &data, &digest_name)) {
         return NULL;
     }
@@ -671,7 +671,7 @@
     EVP_PKEY *pkey;
 
 #ifdef PY3
-    if (!PyArg_ParseTuple(args, "O!y#yy:verify", &crypto_X509_Type, &cert, &signature, &sig_len, &data, &digest_name)) {
+    if (!PyArg_ParseTuple(args, "O!" BYTESTRING_FMT "#" BYTESTRING_FMT "s:verify", &crypto_X509_Type, &cert, &signature, &sig_len, &data, &digest_name)) {
 #else
     if (!PyArg_ParseTuple(args, "O!t#ss:verify", &crypto_X509_Type, &cert, &signature, &sig_len, &data, &digest_name)) {
 #endif