diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2013-06-23 12:58:43 (GMT) |
|---|---|---|
| committer | Victor Stinner <victor.stinner@gmail.com> | 2013-06-23 12:58:43 (GMT) |
| commit | 4569cd5eab5092c4508e6d0471eb9f535e71193a (patch) | |
| tree | d83d909aa4126d0c4707e7e75f2cb6fa5a697d6c /Modules/_ssl.c | |
| parent | 2f084ecfe78472b6a1a6c8b07472672176d4f848 (diff) | |
| download | cpython-4569cd5eab5092c4508e6d0471eb9f535e71193a.zip cpython-4569cd5eab5092c4508e6d0471eb9f535e71193a.tar.gz cpython-4569cd5eab5092c4508e6d0471eb9f535e71193a.tar.bz2 | |
_ssl.c: strip trailing spaces
Diffstat (limited to 'Modules/_ssl.c')
| -rw-r--r-- | Modules/_ssl.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Modules/_ssl.c b/Modules/_ssl.c index abb48b9..79d2f71 100644 --- a/Modules/_ssl.c +++ b/Modules/_ssl.c @@ -1136,7 +1136,7 @@ static PyObject *PySSL_selected_npn_protocol(PySSLSocket *self) { const unsigned char *out; unsigned int outlen; - SSL_get0_next_proto_negotiated(self->ssl, + SSL_get0_next_proto_negotiated(self->ssl, &out, &outlen); if (out == NULL) @@ -1763,8 +1763,8 @@ set_ciphers(PySSLContext *self, PyObject *args) #ifdef OPENSSL_NPN_NEGOTIATED /* this callback gets passed to SSL_CTX_set_next_protos_advertise_cb */ static int -_advertiseNPN_cb(SSL *s, - const unsigned char **data, unsigned int *len, +_advertiseNPN_cb(SSL *s, + const unsigned char **data, unsigned int *len, void *args) { PySSLContext *ssl_ctx = (PySSLContext *) args; @@ -1781,7 +1781,7 @@ _advertiseNPN_cb(SSL *s, } /* this callback gets passed to SSL_CTX_set_next_proto_select_cb */ static int -_selectNPN_cb(SSL *s, +_selectNPN_cb(SSL *s, unsigned char **out, unsigned char *outlen, const unsigned char *server, unsigned int server_len, void *args) @@ -2848,7 +2848,7 @@ PyInit__ssl(void) } if (PyModule_AddObject(m, "lib_codes_to_names", lib_codes_to_names)) return NULL; - + /* OpenSSL version */ /* SSLeay() gives us the version of the library linked against, which could be different from the headers version. |