Commit 4e54730e authored by Jeremy Hylton's avatar Jeremy Hylton

Repair badly formatted code.

parent 6fc13d95
...@@ -87,40 +87,40 @@ PySSL_SetError(PySSLObject *obj, int ret) ...@@ -87,40 +87,40 @@ PySSL_SetError(PySSLObject *obj, int ret)
switch (err) { switch (err) {
case SSL_ERROR_ZERO_RETURN: case SSL_ERROR_ZERO_RETURN:
errstr = "TLS/SSL connection has been closed"; errstr = "TLS/SSL connection has been closed";
p=PY_SSL_ERROR_ZERO_RETURN; p = PY_SSL_ERROR_ZERO_RETURN;
break; break;
case SSL_ERROR_WANT_READ: case SSL_ERROR_WANT_READ:
errstr = "The operation did not complete (read)"; errstr = "The operation did not complete (read)";
p=PY_SSL_ERROR_WANT_READ; p = PY_SSL_ERROR_WANT_READ;
break; break;
case SSL_ERROR_WANT_WRITE: case SSL_ERROR_WANT_WRITE:
p=PY_SSL_ERROR_WANT_WRITE; p = PY_SSL_ERROR_WANT_WRITE;
errstr = "The operation did not complete (write)"; errstr = "The operation did not complete (write)";
break; break;
case SSL_ERROR_WANT_X509_LOOKUP: case SSL_ERROR_WANT_X509_LOOKUP:
p=PY_SSL_ERROR_WANT_X509_LOOKUP; p = PY_SSL_ERROR_WANT_X509_LOOKUP;
errstr = "The operation did not complete (X509 lookup)"; errstr = "The operation did not complete (X509 lookup)";
break; break;
case SSL_ERROR_WANT_CONNECT: case SSL_ERROR_WANT_CONNECT:
p=PY_SSL_ERROR_WANT_CONNECT; p = PY_SSL_ERROR_WANT_CONNECT;
errstr = "The operation did not complete (connect)"; errstr = "The operation did not complete (connect)";
break; break;
case SSL_ERROR_SYSCALL: case SSL_ERROR_SYSCALL:
{ {
unsigned long e = ERR_get_error(); unsigned long e = ERR_get_error();
if(e==0){ if (e == 0) {
if(ret==0){ if (ret == 0) {
p=PY_SSL_ERROR_EOF; p = PY_SSL_ERROR_EOF;
errstr = "EOF occurred in violation of protocol"; errstr = "EOF occurred in violation of protocol";
}else if(ret==-1){ } else if (ret == -1) {
/* the underlying BIO reported an I/O error */ /* the underlying BIO reported an I/O error */
return obj->Socket->errorhandler(); return obj->Socket->errorhandler();
}else{ /* possible? */ } else { /* possible? */
p=PY_SSL_ERROR_SYSCALL; p = PY_SSL_ERROR_SYSCALL;
errstr = "Some I/O error occurred"; errstr = "Some I/O error occurred";
} }
} else { } else {
p=PY_SSL_ERROR_SYSCALL; p = PY_SSL_ERROR_SYSCALL;
/* XXX Protected by global interpreter lock */ /* XXX Protected by global interpreter lock */
errstr = ERR_error_string(e, NULL); errstr = ERR_error_string(e, NULL);
} }
...@@ -129,17 +129,17 @@ PySSL_SetError(PySSLObject *obj, int ret) ...@@ -129,17 +129,17 @@ PySSL_SetError(PySSLObject *obj, int ret)
case SSL_ERROR_SSL: case SSL_ERROR_SSL:
{ {
unsigned long e = ERR_get_error(); unsigned long e = ERR_get_error();
p=PY_SSL_ERROR_SSL; p = PY_SSL_ERROR_SSL;
if (e !=0) { if (e != 0)
/* XXX Protected by global interpreter lock */ /* XXX Protected by global interpreter lock */
errstr = ERR_error_string(e, NULL); errstr = ERR_error_string(e, NULL);
} else { /* possible? */ else { /* possible? */
errstr="A failure in the SSL library occurred"; errstr = "A failure in the SSL library occurred";
} }
break; break;
} }
default: default:
p=PY_SSL_ERROR_INVALID_ERROR_CODE; p = PY_SSL_ERROR_INVALID_ERROR_CODE;
errstr = "Invalid error code"; errstr = "Invalid error code";
} }
n = PyInt_FromLong((long) p); n = PyInt_FromLong((long) p);
...@@ -162,7 +162,6 @@ PySSL_SetError(PySSLObject *obj, int ret) ...@@ -162,7 +162,6 @@ PySSL_SetError(PySSLObject *obj, int ret)
return NULL; return NULL;
} }
/* This is a C function to be called for new object initialization */
static PySSLObject * static PySSLObject *
newPySSLObject(PySocketSockObject *Sock, char *key_file, char *cert_file) newPySSLObject(PySocketSockObject *Sock, char *key_file, char *cert_file)
{ {
...@@ -238,7 +237,6 @@ newPySSLObject(PySocketSockObject *Sock, char *key_file, char *cert_file) ...@@ -238,7 +237,6 @@ newPySSLObject(PySocketSockObject *Sock, char *key_file, char *cert_file)
return NULL; return NULL;
} }
/* This is the Python function called for new object initialization */
static PyObject * static PyObject *
PySocket_ssl(PyObject *self, PyObject *args) PySocket_ssl(PyObject *self, PyObject *args)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment