projects
/
privoxy.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Regenerate user-manual
[privoxy.git]
/
openssl.c
diff --git
a/openssl.c
b/openssl.c
index
e3717af
..
cfcc59e
100644
(file)
--- a/
openssl.c
+++ b/
openssl.c
@@
-229,6
+229,11
@@
extern int ssl_recv_data(struct ssl_attr *ssl_attr, unsigned char *buf, size_t m
ret = BIO_read(bio, buf, (int)max_length);
} while (ret <= 0 && BIO_should_retry(bio));
ret = BIO_read(bio, buf, (int)max_length);
} while (ret <= 0 && BIO_should_retry(bio));
+ if (BIO_get_ssl(bio, &ssl) == 1)
+ {
+ fd = SSL_get_fd(ssl);
+ }
+
if (ret < 0)
{
log_ssl_errors(LOG_LEVEL_ERROR,
if (ret < 0)
{
log_ssl_errors(LOG_LEVEL_ERROR,
@@
-237,11
+242,6
@@
extern int ssl_recv_data(struct ssl_attr *ssl_attr, unsigned char *buf, size_t m
return -1;
}
return -1;
}
- if (BIO_get_ssl(bio, &ssl) == 1)
- {
- fd = SSL_get_fd(ssl);
- }
-
log_error(LOG_LEVEL_RECEIVED, "TLS from socket %d: %N",
fd, ret, buf);
log_error(LOG_LEVEL_RECEIVED, "TLS from socket %d: %N",
fd, ret, buf);
@@
-1647,7
+1647,7
@@
static int ssl_certificate_is_invalid(const char *cert_file)
* 3 : nid = OpenSSL NID
* 4 : value = extension value
*
* 3 : nid = OpenSSL NID
* 4 : value = extension value
*
- * Returns : 0 => Error while setting extens
u
on data
+ * Returns : 0 => Error while setting extens
i
on data
* 1 => It worked
*
*********************************************************************/
* 1 => It worked
*
*********************************************************************/