M-x whitespace-cleanup
diff --git a/doc/pyOpenSSL.tex b/doc/pyOpenSSL.tex
index 19271ac..3d2ce8f 100644
--- a/doc/pyOpenSSL.tex
+++ b/doc/pyOpenSSL.tex
@@ -263,7 +263,7 @@
\begin{funcdesc}{load_pkcs12}{buffer\optional{, passphrase}}
Load pkcs12 data from the string \var{buffer}. If the pkcs12 structure is
encrypted, a \var{passphrase} must be included. The MAC is always
-checked and thus required.
+checked and thus required.
See also the man page for the C function \function{PKCS12_parse}.
\end{funcdesc}
diff --git a/src/crypto/pkcs12.c b/src/crypto/pkcs12.c
index 3f442b2..b8318d2 100644
--- a/src/crypto/pkcs12.c
+++ b/src/crypto/pkcs12.c
@@ -3,9 +3,9 @@
*
* Copyright (C) AB Strakt 2001, All rights reserved
*
- * Certificate transport (PKCS12) handling code,
+ * Certificate transport (PKCS12) handling code,
* mostly thin wrappers around OpenSSL.
- * See the file RATIONALE for a short explanation of why
+ * See the file RATIONALE for a short explanation of why
* this module was written.
*
* Reviewed 2001-07-23
@@ -14,8 +14,8 @@
#define crypto_MODULE
#include "crypto.h"
-/*
- * PKCS12 is a standard exchange format for digital certificates.
+/*
+ * PKCS12 is a standard exchange format for digital certificates.
* See e.g. the OpenSSL homepage http://www.openssl.org/ for more information
*/
@@ -49,11 +49,11 @@
PyObject *cert = NULL;
static char *kwlist[] = {"cert", NULL};
- if (!PyArg_ParseTupleAndKeywords(args, keywds, "O:set_certificate",
+ if (!PyArg_ParseTupleAndKeywords(args, keywds, "O:set_certificate",
kwlist, &cert))
return NULL;
- if (cert != Py_None && ! PyObject_IsInstance(cert, (PyObject *) &crypto_X509_Type)) {
+ if (cert != Py_None && ! PyObject_IsInstance(cert, (PyObject *) &crypto_X509_Type)) {
PyErr_SetString(PyExc_TypeError, "cert must be type X509 or None");
return NULL;
}
@@ -94,11 +94,11 @@
PyObject *pkey = NULL;
static char *kwlist[] = {"pkey", NULL};
- if (!PyArg_ParseTupleAndKeywords(args, keywds, "O:set_privatekey",
+ if (!PyArg_ParseTupleAndKeywords(args, keywds, "O:set_privatekey",
kwlist, &pkey))
return NULL;
- if (pkey != Py_None && ! PyObject_IsInstance(pkey, (PyObject *) &crypto_PKey_Type)) {
+ if (pkey != Py_None && ! PyObject_IsInstance(pkey, (PyObject *) &crypto_PKey_Type)) {
PyErr_SetString(PyExc_TypeError, "pkey must be type X509 or None");
return NULL;
}
@@ -141,7 +141,7 @@
static char *kwlist[] = {"cacerts", NULL};
int i, len; /* Py_ssize_t for Python 2.5+ */
- if (!PyArg_ParseTupleAndKeywords(args, keywds, "O:set_ca_certificates",
+ if (!PyArg_ParseTupleAndKeywords(args, keywds, "O:set_ca_certificates",
kwlist, &cacerts))
return NULL;
if (cacerts == Py_None) {
@@ -149,7 +149,7 @@
} else if ((len = PySequence_Length(cacerts)) >= 0) { /* is iterable */
cacerts = PySequence_Tuple(cacerts);
if(cacerts == NULL) {
- PyErr_SetString(PyExc_TypeError, "untupleable" /* failed to convert cacerts to a tuple */);
+ PyErr_SetString(PyExc_TypeError, "untupleable" /* failed to convert cacerts to a tuple */);
return NULL;
}
/* Check is's a simple list filled only with X509 objects. */
@@ -207,11 +207,11 @@
PyObject *name = NULL;
static char *kwlist[] = {"name", NULL};
- if (!PyArg_ParseTupleAndKeywords(args, keywds, "O:set_friendlyname",
+ if (!PyArg_ParseTupleAndKeywords(args, keywds, "O:set_friendlyname",
kwlist, &name))
return NULL;
- if (name != Py_None && ! PyString_CheckExact(name)) {
+ if (name != Py_None && ! PyString_CheckExact(name)) {
PyErr_SetString(PyExc_TypeError, "name must be a str or None");
return NULL;
}
@@ -244,14 +244,14 @@
char *temp, *passphrase = NULL, *friendly_name = NULL;
BIO *bio;
PKCS12 *p12;
- EVP_PKEY *pkey = NULL;
+ EVP_PKEY *pkey = NULL;
STACK_OF(X509) *cacerts = NULL;
X509 *x509 = NULL;
int iter = 0; /* defaults to PKCS12_DEFAULT_ITER */
- int maciter = 0;
+ int maciter = 0;
static char *kwlist[] = {"passphrase", "iter", "maciter", NULL};
- if (!PyArg_ParseTupleAndKeywords(args, keywds, "|zii:export",
+ if (!PyArg_ParseTupleAndKeywords(args, keywds, "|zii:export",
kwlist, &passphrase, &iter, &maciter))
return NULL;
@@ -276,7 +276,7 @@
friendly_name = PyString_AsString(self->friendlyname);
}
- p12 = PKCS12_create(passphrase, friendly_name, pkey, x509, cacerts,
+ p12 = PKCS12_create(passphrase, friendly_name, pkey, x509, cacerts,
NID_pbe_WithSHA1And3_Key_TripleDES_CBC,
NID_pbe_WithSHA1And3_Key_TripleDES_CBC,
iter, maciter, 0);
@@ -363,7 +363,7 @@
int allen;
if ((self->cert = (PyObject *)crypto_X509_New(cert, 1)) == NULL)
goto error;
-
+
/* Now we need to extract the friendlyName of the PKCS12
* that was stored by PKCS_pasrse() in the alias of the
* certificate. */
@@ -374,7 +374,7 @@
Py_INCREF(Py_None);
self->friendlyname = Py_None;
}
- }
+ }
/* private key */
if (pkey == NULL) {
@@ -527,7 +527,7 @@
NULL, /* setattro */
NULL, /* as_buffer */
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC,
- crypto_PKCS12_doc,
+ crypto_PKCS12_doc,
(traverseproc)crypto_PKCS12_traverse,
(inquiry)crypto_PKCS12_clear,
NULL, /* tp_richcompare */
@@ -569,4 +569,3 @@
return 1;
}
-