commit f159252ab2ec285f1266e79209644b6aec455b09
author Jean-Paul Calderone <exarkun@divmod.com> Sat Jun 27 11:10:43 2009 -0400
committer Jean-Paul Calderone <exarkun@divmod.com> Sat Jun 27 11:10:43 2009 -0400
tree 84407849d79241e03b6977acad236e3d20685c57
parent 2cd7a923af4dba7355fc0ec1960a74da6c2716ff

convert X509Req to a type that can be instantiated

src/crypto/crypto.c

diff --git a/src/crypto/crypto.c b/src/crypto/crypto.c
index 43c8c90..a933dce 100644
--- a/src/crypto/crypto.c
+++ b/src/crypto/crypto.c
@@ -515,23 +515,6 @@
 }
 
 
-static char crypto_X509Req_doc[] = "\n\
-The factory function inserted in the module dictionary to create X509Req\n\
-objects\n\
-\n\
-@returns: The X509Req object\n\
-";
-
-static PyObject *
-crypto_X509Req(PyObject *spam, PyObject *args)
-{
-    if (!PyArg_ParseTuple(args, ":X509Req"))
-        return NULL;
-
-    return (PyObject *)crypto_X509Req_New(X509_REQ_new(), 1);
-}
-
-
 static char crypto_X509Extension_doc[] = "\n\
 The factory function inserted in the module dictionary to create\n\
 X509Extension objects.\n\
@@ -620,7 +603,6 @@
     { "load_pkcs7_data", (PyCFunction)crypto_load_pkcs7_data, METH_VARARGS, crypto_load_pkcs7_data_doc },
     { "load_pkcs12", (PyCFunction)crypto_load_pkcs12, METH_VARARGS, crypto_load_pkcs12_doc },
     /* Factory functions */
-    { "X509Req", (PyCFunction)crypto_X509Req, METH_VARARGS, crypto_X509Req_doc },
     { "X509Extension", (PyCFunction)crypto_X509Extension, METH_VARARGS, crypto_X509Extension_doc },
     { "NetscapeSPKI", (PyCFunction)crypto_NetscapeSPKI, METH_VARARGS, crypto_NetscapeSPKI_doc },
     { "X509_verify_cert_error_string", (PyCFunction)crypto_X509_verify_cert_error_string, METH_VARARGS, crypto_X509_verify_cert_error_string_doc },
@@ -750,7 +732,7 @@
         goto error;
     if (!init_crypto_x509store(dict))
         goto error;
-    if (!init_crypto_x509req(dict))
+    if (!init_crypto_x509req(module))
         goto error;
     if (!init_crypto_pkey(module))
         goto error;