Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 525807b

Browse files
pitroupitrou
committed
Merged revisions 81115 via svnmerge from
svn+ssh://[email protected]/python/trunk ........ r81115 | antoine.pitrou | 2010-05-12 16:02:34 +0200 (mer., 12 mai 2010) | 3 lines Improve _ssl.c formatting ........
1 parent ade1917 commit 525807b

1 file changed

Lines changed: 26 additions & 33 deletions

File tree

‎Modules/_ssl.c‎

Lines changed: 26 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -182,8 +182,7 @@ PySSL_SetError(PySSLObject *obj, int ret, char *filename, int lineno)
182182
break;
183183
case SSL_ERROR_WANT_X509_LOOKUP:
184184
p = PY_SSL_ERROR_WANT_X509_LOOKUP;
185-
errstr =
186-
"The operation did not complete (X509 lookup)";
185+
errstr = "The operation did not complete (X509 lookup)";
187186
break;
188187
case SSL_ERROR_WANT_CONNECT:
189188
p = PY_SSL_ERROR_WANT_CONNECT;
@@ -196,15 +195,14 @@ PySSL_SetError(PySSLObject *obj, int ret, char *filename, int lineno)
196195
PySocketSockObject *s
197196
= (PySocketSockObject *) PyWeakref_GetObject(obj->Socket);
198197
if (ret == 0 || (((PyObject *)s) == Py_None)) {
199-
p = PY_SSL_ERROR_EOF;
200-
errstr =
201-
"EOF occurred in violation of protocol";
198+
p = PY_SSL_ERROR_EOF;
199+
errstr = "EOF occurred in violation of protocol";
202200
} else if (ret == -1) {
203-
/* underlying BIO reported an I/O error */
204-
return s->errorhandler();
201+
/* underlying BIO reported an I/O error */
202+
return s->errorhandler();
205203
} else { /* possible? */
206-
p = PY_SSL_ERROR_SYSCALL;
207-
errstr = "Some I/O error occurred";
204+
p = PY_SSL_ERROR_SYSCALL;
205+
errstr = "Some I/O error occurred";
208206
}
209207
} else {
210208
p = PY_SSL_ERROR_SYSCALL;
@@ -221,8 +219,7 @@ PySSL_SetError(PySSLObject *obj, int ret, char *filename, int lineno)
221219
/* XXX Protected by global interpreter lock */
222220
errstr = ERR_error_string(e, NULL);
223221
else { /* possible? */
224-
errstr =
225-
"A failure in the SSL library occurred";
222+
errstr = "A failure in the SSL library occurred";
226223
}
227224
break;
228225
}
@@ -325,7 +322,7 @@ newPySSLObject(PySocketSockObject *Sock, char *key_file, char *cert_file,
325322
if (certreq != PY_SSL_CERT_NONE) {
326323
if (cacerts_file == NULL) {
327324
errstr = ERRSTR("No root certificates specified for "
328-
"verification of other-side certificates.");
325+
"verification of other-side certificates.");
329326
goto fail;
330327
} else {
331328
PySSL_BEGIN_ALLOW_THREADS
@@ -490,15 +487,15 @@ static PyObject *PySSL_SSLdo_handshake(PySSLObject *self)
490487
}
491488
if (sockstate == SOCKET_HAS_TIMED_OUT) {
492489
PyErr_SetString(PySSLErrorObject,
493-
ERRSTR("The handshake operation timed out"));
490+
ERRSTR("The handshake operation timed out"));
494491
return NULL;
495492
} else if (sockstate == SOCKET_HAS_BEEN_CLOSED) {
496493
PyErr_SetString(PySSLErrorObject,
497-
ERRSTR("Underlying socket has been closed."));
494+
ERRSTR("Underlying socket has been closed."));
498495
return NULL;
499496
} else if (sockstate == SOCKET_TOO_LARGE_FOR_SELECT) {
500497
PyErr_SetString(PySSLErrorObject,
501-
ERRSTR("Underlying socket too large for select()."));
498+
ERRSTR("Underlying socket too large for select()."));
502499
return NULL;
503500
} else if (sockstate == SOCKET_IS_NONBLOCKING) {
504501
break;
@@ -544,7 +541,7 @@ _create_tuple_for_attribute (ASN1_OBJECT *name, ASN1_STRING *value) {
544541
goto fail;
545542
}
546543
value_obj = PyUnicode_DecodeUTF8((char *) valuebuf,
547-
buflen, "strict");
544+
buflen, "strict");
548545
OPENSSL_free(valuebuf);
549546
if (value_obj == NULL) {
550547
Py_DECREF(name_obj);
@@ -1217,11 +1214,9 @@ static PyObject *PySSL_SSLwrite(PySSLObject *self, PyObject *args)
12171214
goto error;
12181215
}
12191216
if (err == SSL_ERROR_WANT_READ) {
1220-
sockstate =
1221-
check_socket_and_wait_for_timeout(sock, 0);
1217+
sockstate = check_socket_and_wait_for_timeout(sock, 0);
12221218
} else if (err == SSL_ERROR_WANT_WRITE) {
1223-
sockstate =
1224-
check_socket_and_wait_for_timeout(sock, 1);
1219+
sockstate = check_socket_and_wait_for_timeout(sock, 1);
12251220
} else {
12261221
sockstate = SOCKET_OPERATION_OK;
12271222
}
@@ -1334,7 +1329,7 @@ static PyObject *PySSL_SSLread(PySSLObject *self, PyObject *args)
13341329
goto error;
13351330
} else if (sockstate == SOCKET_TOO_LARGE_FOR_SELECT) {
13361331
PyErr_SetString(PySSLErrorObject,
1337-
"Underlying socket too large for select().");
1332+
"Underlying socket too large for select().");
13381333
goto error;
13391334
} else if (sockstate == SOCKET_HAS_BEEN_CLOSED) {
13401335
count = 0;
@@ -1350,11 +1345,9 @@ static PyObject *PySSL_SSLread(PySSLObject *self, PyObject *args)
13501345
if (PyErr_CheckSignals())
13511346
goto error;
13521347
if (err == SSL_ERROR_WANT_READ) {
1353-
sockstate =
1354-
check_socket_and_wait_for_timeout(sock, 0);
1348+
sockstate = check_socket_and_wait_for_timeout(sock, 0);
13551349
} else if (err == SSL_ERROR_WANT_WRITE) {
1356-
sockstate =
1357-
check_socket_and_wait_for_timeout(sock, 1);
1350+
sockstate = check_socket_and_wait_for_timeout(sock, 1);
13581351
} else if ((err == SSL_ERROR_ZERO_RETURN) &&
13591352
(SSL_get_shutdown(self->ssl) ==
13601353
SSL_RECEIVED_SHUTDOWN))
@@ -1547,7 +1540,7 @@ PySSL_RAND_add(PyObject *self, PyObject *args)
15471540
double entropy;
15481541

15491542
if (!PyArg_ParseTuple(args, "s#d:RAND_add", &buf, &len, &entropy))
1550-
return NULL;
1543+
return NULL;
15511544
RAND_add(buf, len, entropy);
15521545
Py_INCREF(Py_None);
15531546
return Py_None;
@@ -1578,15 +1571,15 @@ PySSL_RAND_egd(PyObject *self, PyObject *arg)
15781571
int bytes;
15791572

15801573
if (!PyUnicode_Check(arg))
1581-
return PyErr_Format(PyExc_TypeError,
1582-
"RAND_egd() expected string, found %s",
1583-
Py_TYPE(arg)->tp_name);
1574+
return PyErr_Format(PyExc_TypeError,
1575+
"RAND_egd() expected string, found %s",
1576+
Py_TYPE(arg)->tp_name);
15841577
bytes = RAND_egd(_PyUnicode_AsString(arg));
15851578
if (bytes == -1) {
1586-
PyErr_SetString(PySSLErrorObject,
1587-
"EGD connection failed or EGD did not return "
1588-
"enough data to seed the PRNG");
1589-
return NULL;
1579+
PyErr_SetString(PySSLErrorObject,
1580+
"EGD connection failed or EGD did not return "
1581+
"enough data to seed the PRNG");
1582+
return NULL;
15901583
}
15911584
return PyLong_FromLong(bytes);
15921585
}

0 commit comments

Comments
 (0)