fix whitespace

epel9
Dennis Gilmore 17 years ago
parent b740483ad4
commit ae5fb926b5

@ -1,7 +1,7 @@
diff -Nur pyOpenSSL-0.7-bad/src/crypto/crypto.c pyOpenSSL-0.7/src/crypto/crypto.c diff -Nur pyOpenSSL-0.7-bad/src/crypto/crypto.c pyOpenSSL-0.7/src/crypto/crypto.c
--- pyOpenSSL-0.7-bad/src/crypto/crypto.c 2008-03-21 17:34:42.000000000 -0500 --- pyOpenSSL-0.7-bad/src/crypto/crypto.c 2008-03-21 17:34:42.000000000 -0500
+++ pyOpenSSL-0.7/src/crypto/crypto.c 2008-09-19 17:22:12.000000000 -0500 +++ pyOpenSSL-0.7/src/crypto/crypto.c 2008-09-19 18:06:08.000000000 -0500
-694,6 +694,74 @@ @@ -694,6 +694,74 @@
{ NULL, NULL } { NULL, NULL }
}; };
@ -76,7 +76,7 @@ diff -Nur pyOpenSSL-0.7-bad/src/crypto/crypto.c pyOpenSSL-0.7/src/crypto/crypto.
/* /*
* Initialize crypto sub module * Initialize crypto sub module
* *
-739,6 +807,10 @@ @@ -739,6 +807,10 @@
PyModule_AddIntConstant(module, "TYPE_DSA", crypto_TYPE_DSA); PyModule_AddIntConstant(module, "TYPE_DSA", crypto_TYPE_DSA);
dict = PyModule_GetDict(module); dict = PyModule_GetDict(module);
@ -88,9 +88,9 @@ diff -Nur pyOpenSSL-0.7-bad/src/crypto/crypto.c pyOpenSSL-0.7/src/crypto/crypto.
goto error; goto error;
if (!init_crypto_x509name(dict)) if (!init_crypto_x509name(dict))
diff -Nur pyOpenSSL-0.7-bad/src/ssl/context.c pyOpenSSL-0.7/src/ssl/context.c diff -Nur pyOpenSSL-0.7-bad/src/ssl/context.c pyOpenSSL-0.7/src/ssl/context.c
--- pyOpenSSL-0.7-bad/src/ssl/context.c 2008-03-21 17:34:42.000000000 -0500 --- pyOpenSSL-0.7-bad/src/ssl/context.c 2008-03-21 17:34:42.000000000 -0500
+++ pyOpenSSL-0.7/src/ssl/context.c 2008-09-19 17:22:12.000000000 -0500 +++ pyOpenSSL-0.7/src/ssl/context.c 2008-09-19 18:27:00.000000000 -0500
-64,39 +64,33 @@ @@ -64,39 +64,33 @@
static int static int
global_passphrase_callback(char *buf, int maxlen, int verify, void *arg) global_passphrase_callback(char *buf, int maxlen, int verify, void *arg)
{ {
@ -127,7 +127,7 @@ diff -Nur pyOpenSSL-0.7-bad/src/ssl/context.c pyOpenSSL-0.7/src/ssl/context.c
if (!PyObject_IsTrue(ret)) if (!PyObject_IsTrue(ret))
{ {
Py_DECREF(ret); Py_DECREF(ret);
- return 0; - return 0;
+ goto out; + goto out;
} }
@ -139,7 +139,7 @@ diff -Nur pyOpenSSL-0.7-bad/src/ssl/context.c pyOpenSSL-0.7/src/ssl/context.c
} }
len = PyString_Size(ret); len = PyString_Size(ret);
-107,6 +101,8 @@ @@ -107,6 +101,8 @@
strncpy(buf, str, len); strncpy(buf, str, len);
Py_XDECREF(ret); Py_XDECREF(ret);
@ -148,7 +148,7 @@ diff -Nur pyOpenSSL-0.7-bad/src/ssl/context.c pyOpenSSL-0.7/src/ssl/context.c
return len; return len;
} }
-173,28 +169,19 @@ @@ -173,28 +169,19 @@
ssl_ConnectionObj *conn = (ssl_ConnectionObj *)SSL_get_app_data(ssl); ssl_ConnectionObj *conn = (ssl_ConnectionObj *)SSL_get_app_data(ssl);
PyObject *argv, *ret; PyObject *argv, *ret;
@ -186,7 +186,7 @@ diff -Nur pyOpenSSL-0.7-bad/src/ssl/context.c pyOpenSSL-0.7/src/ssl/context.c
return; return;
} }
-447,6 +434,8 @@ @@ -447,6 +434,8 @@
if (!PyArg_ParseTuple(args, "s|i:use_privatekey_file", &keyfile, &filetype)) if (!PyArg_ParseTuple(args, "s|i:use_privatekey_file", &keyfile, &filetype))
return NULL; return NULL;

Loading…
Cancel
Save