commit 38a05c8ac4c1b83c0c1efab0dd3c34939dd5a6dc
author Rick Dean <rick@fdd.com> Sat Jul 18 01:41:30 2009 -0500
committer Rick Dean <rick@fdd.com> Sat Jul 18 01:41:30 2009 -0500
tree 0add75f170c42ecd908d1e65920e8211bf9a1dc9
parent 864e15e36cf469419886b725acd0c48aa1031813

Implemented some of the PKCS12 fixups requested by JP.

src/crypto/pkcs12.c

diff --git a/src/crypto/pkcs12.c b/src/crypto/pkcs12.c
index 2bf04c0..e5854d9 100644
--- a/src/crypto/pkcs12.c
+++ b/src/crypto/pkcs12.c
@@ -43,7 +43,7 @@
 @type cert: L{X509}\n\
 @return: X509 object containing the certificate\n\
 ";
-static crypto_PKCS12Obj *
+static PyObject *
 crypto_PKCS12_set_certificate(crypto_PKCS12Obj *self, PyObject *args, PyObject *keywds)
 {
     PyObject *cert = NULL;
@@ -64,8 +64,8 @@
     }
     self->cert = cert;
 
-    Py_INCREF(self);
-    return self;
+    Py_INCREF(Py_None);
+    return Py_None;
 }
 
 static char crypto_PKCS12_get_privatekey_doc[] = "\n\
@@ -73,7 +73,6 @@
 \n\
 @returns: PKey object containing the private key\n\
 ";
-//static PyObject *
 static crypto_PKeyObj *
 crypto_PKCS12_get_privatekey(crypto_PKCS12Obj *self, PyObject *args)
 {
@@ -91,7 +90,7 @@
 @type pkey: L{PKey}\n\
 @return: None\n\
 ";
-static crypto_PKCS12Obj *
+static PyObject *
 crypto_PKCS12_set_privatekey(crypto_PKCS12Obj *self, PyObject *args, PyObject *keywds)
 {
     PyObject *pkey = NULL;
@@ -112,8 +111,8 @@
     }
     self->key = pkey;
 
-    Py_INCREF(self);
-    return self;
+    Py_INCREF(Py_None);
+    return Py_None;
 }
 
 static char crypto_PKCS12_get_ca_certificates_doc[] = "\n\
@@ -139,7 +138,7 @@
 @type cacerts: Sequence of L{X509}\n\
 @return: None\n\
 ";
-static crypto_PKCS12Obj *
+static PyObject *
 crypto_PKCS12_set_ca_certificates(crypto_PKCS12Obj *self, PyObject *args, PyObject *keywds)
 {
     PyObject *cacerts;
@@ -173,8 +172,8 @@
     }
     self->cacerts = cacerts;
 
-    Py_INCREF(self);
-    return self;
+    Py_INCREF(Py_None);
+    return Py_None;
 }
 
 static char crypto_PKCS12_export_doc[] = "\n\