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

Skip to content

Commit a29b181

Browse files
pitroupitrou
committed
Merged revisions 81116 via svnmerge from
svn+ssh://[email protected]/python/branches/py3k ................ r81116 | antoine.pitrou | 2010-05-12 16:05:24 +0200 (mer., 12 mai 2010) | 9 lines 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 96f212b commit a29b181

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
}
@@ -317,7 +314,7 @@ newPySSLObject(PySocketSockObject *Sock, char *key_file, char *cert_file,
317314
if (certreq != PY_SSL_CERT_NONE) {
318315
if (cacerts_file == NULL) {
319316
errstr = ERRSTR("No root certificates specified for "
320-
"verification of other-side certificates.");
317+
"verification of other-side certificates.");
321318
goto fail;
322319
} else {
323320
PySSL_BEGIN_ALLOW_THREADS
@@ -480,15 +477,15 @@ static PyObject *PySSL_SSLdo_handshake(PySSLObject *self)
480477
}
481478
if (sockstate == SOCKET_HAS_TIMED_OUT) {
482479
PyErr_SetString(PySSLErrorObject,
483-
ERRSTR("The handshake operation timed out"));
480+
ERRSTR("The handshake operation timed out"));
484481
return NULL;
485482
} else if (sockstate == SOCKET_HAS_BEEN_CLOSED) {
486483
PyErr_SetString(PySSLErrorObject,
487-
ERRSTR("Underlying socket has been closed."));
484+
ERRSTR("Underlying socket has been closed."));
488485
return NULL;
489486
} else if (sockstate == SOCKET_TOO_LARGE_FOR_SELECT) {
490487
PyErr_SetString(PySSLErrorObject,
491-
ERRSTR("Underlying socket too large for select()."));
488+
ERRSTR("Underlying socket too large for select()."));
492489
return NULL;
493490
} else if (sockstate == SOCKET_IS_NONBLOCKING) {
494491
break;
@@ -534,7 +531,7 @@ _create_tuple_for_attribute (ASN1_OBJECT *name, ASN1_STRING *value) {
534531
goto fail;
535532
}
536533
value_obj = PyUnicode_DecodeUTF8((char *) valuebuf,
537-
buflen, "strict");
534+
buflen, "strict");
538535
OPENSSL_free(valuebuf);
539536
if (value_obj == NULL) {
540537
Py_DECREF(name_obj);
@@ -1208,11 +1205,9 @@ static PyObject *PySSL_SSLwrite(PySSLObject *self, PyObject *args)
12081205
return NULL;
12091206
}
12101207
if (err == SSL_ERROR_WANT_READ) {
1211-
sockstate =
1212-
check_socket_and_wait_for_timeout(sock, 0);
1208+
sockstate = check_socket_and_wait_for_timeout(sock, 0);
12131209
} else if (err == SSL_ERROR_WANT_WRITE) {
1214-
sockstate =
1215-
check_socket_and_wait_for_timeout(sock, 1);
1210+
sockstate = check_socket_and_wait_for_timeout(sock, 1);
12161211
} else {
12171212
sockstate = SOCKET_OPERATION_OK;
12181213
}
@@ -1319,7 +1314,7 @@ static PyObject *PySSL_SSLread(PySSLObject *self, PyObject *args)
13191314
goto error;
13201315
} else if (sockstate == SOCKET_TOO_LARGE_FOR_SELECT) {
13211316
PyErr_SetString(PySSLErrorObject,
1322-
"Underlying socket too large for select().");
1317+
"Underlying socket too large for select().");
13231318
goto error;
13241319
} else if (sockstate == SOCKET_HAS_BEEN_CLOSED) {
13251320
count = 0;
@@ -1335,11 +1330,9 @@ static PyObject *PySSL_SSLread(PySSLObject *self, PyObject *args)
13351330
if (PyErr_CheckSignals())
13361331
goto error;
13371332
if (err == SSL_ERROR_WANT_READ) {
1338-
sockstate =
1339-
check_socket_and_wait_for_timeout(sock, 0);
1333+
sockstate = check_socket_and_wait_for_timeout(sock, 0);
13401334
} else if (err == SSL_ERROR_WANT_WRITE) {
1341-
sockstate =
1342-
check_socket_and_wait_for_timeout(sock, 1);
1335+
sockstate = check_socket_and_wait_for_timeout(sock, 1);
13431336
} else if ((err == SSL_ERROR_ZERO_RETURN) &&
13441337
(SSL_get_shutdown(self->ssl) ==
13451338
SSL_RECEIVED_SHUTDOWN))
@@ -1532,7 +1525,7 @@ PySSL_RAND_add(PyObject *self, PyObject *args)
15321525
double entropy;
15331526

15341527
if (!PyArg_ParseTuple(args, "s#d:RAND_add", &buf, &len, &entropy))
1535-
return NULL;
1528+
return NULL;
15361529
RAND_add(buf, len, entropy);
15371530
Py_INCREF(Py_None);
15381531
return Py_None;
@@ -1563,15 +1556,15 @@ PySSL_RAND_egd(PyObject *self, PyObject *arg)
15631556
int bytes;
15641557

15651558
if (!PyUnicode_Check(arg))
1566-
return PyErr_Format(PyExc_TypeError,
1567-
"RAND_egd() expected string, found %s",
1568-
Py_TYPE(arg)->tp_name);
1559+
return PyErr_Format(PyExc_TypeError,
1560+
"RAND_egd() expected string, found %s",
1561+
Py_TYPE(arg)->tp_name);
15691562
bytes = RAND_egd(_PyUnicode_AsString(arg));
15701563
if (bytes == -1) {
1571-
PyErr_SetString(PySSLErrorObject,
1572-
"EGD connection failed or EGD did not return "
1573-
"enough data to seed the PRNG");
1574-
return NULL;
1564+
PyErr_SetString(PySSLErrorObject,
1565+
"EGD connection failed or EGD did not return "
1566+
"enough data to seed the PRNG");
1567+
return NULL;
15751568
}
15761569
return PyLong_FromLong(bytes);
15771570
}

0 commit comments

Comments
 (0)