projects
/
privoxy.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
socks5_connect(): Don't try to send credentials when none are configured
[privoxy.git]
/
ssl.c
diff --git
a/ssl.c
b/ssl.c
index
f74f585
..
4862609
100644
(file)
--- a/
ssl.c
+++ b/
ssl.c
@@
-479,7
+479,10
@@
extern int create_client_ssl_connection(struct client_state *csp)
}
}
}
}
- log_error(LOG_LEVEL_CONNECT, "Client successfully connected over TLS/SSL");
+ log_error(LOG_LEVEL_CONNECT, "Client successfully connected over %s (%s).",
+ mbedtls_ssl_get_version(&(ssl_attr->mbedtls_attr.ssl)),
+ mbedtls_ssl_get_ciphersuite(&(ssl_attr->mbedtls_attr.ssl)));
+
csp->ssl_with_client_is_opened = 1;
exit:
csp->ssl_with_client_is_opened = 1;
exit:
@@
-754,7
+757,9
@@
extern int create_server_ssl_connection(struct client_state *csp)
}
}
}
}
- log_error(LOG_LEVEL_CONNECT, "Server successfully connected over TLS/SSL");
+ log_error(LOG_LEVEL_CONNECT, "Server successfully connected over %s (%s).",
+ mbedtls_ssl_get_version(&(ssl_attr->mbedtls_attr.ssl)),
+ mbedtls_ssl_get_ciphersuite(&(ssl_attr->mbedtls_attr.ssl)));
/*
* Server certificate chain is valid, so we can clean
/*
* Server certificate chain is valid, so we can clean
@@
-1768,7
+1773,7
@@
static int ssl_verify_callback(void *csp_void, mbedtls_x509_crt *crt,
* Parameters :
* 1 : csp = Current client state (buffers, headers, etc...)
*
* Parameters :
* 1 : csp = Current client state (buffers, headers, etc...)
*
- * Returns :
1 => Error while creating hash
+ * Returns :
-
1 => Error while creating hash
* 0 => Hash created successfully
*
*********************************************************************/
* 0 => Hash created successfully
*
*********************************************************************/
@@
-1902,6
+1907,7
@@
extern void ssl_crt_verify_info(char *buf, size_t size, struct client_state *csp
}
}
+#ifdef FEATURE_GRACEFUL_TERMINATION
/*********************************************************************
*
* Function : ssl_release
/*********************************************************************
*
* Function : ssl_release
@@
-1921,6
+1927,7
@@
extern void ssl_release(void)
mbedtls_entropy_free(&entropy);
}
}
mbedtls_entropy_free(&entropy);
}
}
+#endif /* def FEATURE_GRACEFUL_TERMINATION */
/*********************************************************************
/*********************************************************************