Merge lp:~ohe/pyopenssl/crl-comp into lp:~exarkun/pyopenssl/trunk

[Olivier Hervieu]

Add new method to get the issuer of a CRL (very usefull to for OCSP request handling).
Test included.

[Jean-Paul Calderone (exarkun)]

Hi, thanks for your contribution. Looking at the man page for X509_NAME_oneline I see this warning:

  The functions X509_NAME_oneline() and X509_NAME_print() are legacy functions which produce a non standard output
  form, they don't handle multi character fields and have various quirks and inconsistencies. Their use is strongly
  discouraged in new applications.

It sounds like instead X509_NAME_print_ex or X509_NAME_print should be used instead. You can find an example of how to use these BIO-based functions to get a char* in crypto_CRL_export.

Also, all new APIs should be documented in doc/api/.

Thanks again.

review: Needs Fixing

Unmerged revisions

140. By Olivier Hervieu on 2010-11-08

Add a new get_issuer method on CRL object. Returns the CRL's issuer as string.

=== modified file 'OpenSSL/crypto/crl.c'
--- OpenSSL/crypto/crl.c	2010-10-02 22:34:52 +0000
+++ OpenSSL/crypto/crl.c	2010-11-08 21:56:43 +0000
@@ -2,7 +2,6 @@
 #define crypto_MODULE
 #include "crypto.h"
 
-
 static X509_REVOKED * X509_REVOKED_dup(X509_REVOKED *orig) {
     X509_REVOKED *dupe = NULL;
 
@@ -192,6 +191,38 @@
     return self;
 }
 
+static char crypto_CRL_get_issuer_doc[] = "\n\
+Return the issuer of a CRL structure\n\
+\n\
+@return: The issuer as a string\n\
+";
+static PyObject *
+crypto_CRL_get_issuer(crypto_CRLObj *self, PyObject *args) {
+
+    /*
+     * Is this long enough? Tthere's a old X500 limitation for dn size
+     * at 256 chars. Perhaps we have to modify this.
+     * One more thing, openssl has the same buffer len, see
+     * X509_CRL_print method from t_crl.c
+     */
+    char issuer_buff[256];
+    PyObject *issuer_str = NULL;
+
+    if (!PyArg_ParseTuple(args, ":get_issuer")) {
+        return NULL;
+    }
+    if (self->crl == NULL) {
+        Py_INCREF(Py_None);
+        return Py_None;
+    } else {
+        X509_NAME_oneline(X509_CRL_get_issuer(self->crl), issuer_buff, 256);
+    }
+
+    issuer_str = PyBytes_FromStringAndSize(issuer_buff, strlen(issuer_buff));
+    return issuer_str;
+}
+
+
 /*
  * ADD_METHOD(name) expands to a correct PyMethodDef declaration
  *   {  'name', (PyCFunction)crypto_CRL_name, METH_VARARGS, crypto_CRL_name_doc }
@@ -204,12 +235,12 @@
 static PyMethodDef crypto_CRL_methods[] = {
     ADD_KW_METHOD(add_revoked),
     ADD_METHOD(get_revoked),
+    ADD_METHOD(get_issuer),
     ADD_KW_METHOD(export),
     { NULL, NULL }
 };
 #undef ADD_METHOD
 
-
 static void
 crypto_CRL_dealloc(crypto_CRLObj *self) {
     X509_CRL_free(self->crl);
@@ -230,7 +261,7 @@
     if (!PyArg_ParseTuple(args, ":CRL")) {
         return NULL;
     }
-    
+
     return (PyObject *)crypto_CRL_New(X509_CRL_new());
 }
 
 
=== modified file 'OpenSSL/test/test_crypto.py'
--- OpenSSL/test/test_crypto.py	2010-10-14 02:23:30 +0000
+++ OpenSSL/test/test_crypto.py	2010-11-08 21:56:43 +0000
@@ -2382,6 +2382,8 @@
         self.assertEqual(revs[0].get_reason(), None)
         self.assertEqual(revs[1].get_serial(), b('0100'))
         self.assertEqual(revs[1].get_reason(), b('Superseded'))
+        self.assertEqual(crl.get_issuer(),
+                        b('/C=US/ST=IL/L=Chicago/O=Testing/CN=Testing Root CA'))
 
         der = _runopenssl(crlData, "crl", "-outform", "DER")
         crl = load_crl(FILETYPE_ASN1, der)