[Privoxy-commits] [privoxy] 06/18: Replace 'TLS/SSL' with 'TLS' in a bunch of places
User Git
git at git.privoxy.org
Tue Mar 31 09:20:59 CEST 2026
This is an automated email from the git hooks/post-receive script.
git pushed a commit to branch master
in repository privoxy.
commit 7febb0cc466b8a61b4dba9d75050763f0b1b7383
Author: Fabian Keil <fk at fabiankeil.de>
AuthorDate: Sat Mar 14 08:07:11 2026 +0100
Replace 'TLS/SSL' with 'TLS' in a bunch of places
... as most (all?) supported TLS libraries default to
not supporting SSL anymore.
---
doc/source/faq.sgml | 2 +-
jcc.c | 18 +++++++++---------
openssl.c | 30 +++++++++++++++---------------
project.h | 6 +++---
ssl.c | 26 +++++++++++++-------------
ssl.h | 10 +++++-----
ssl_common.c | 10 +++++-----
ssl_common.h | 6 +++---
wolfssl.c | 8 ++++----
9 files changed, 58 insertions(+), 58 deletions(-)
diff --git a/doc/source/faq.sgml b/doc/source/faq.sgml
index 85af14e0..53651d5e 100644
--- a/doc/source/faq.sgml
+++ b/doc/source/faq.sgml
@@ -2994,7 +2994,7 @@ browsing has slowed to a crawl. What gives? </title>
once the client closed its connection to &my-app;.
Technically &my-app; could keep the connection to the server open,
but the server would not accept requests that do not belong to the
- previous TLS/SSL session (and the client may even have terminated
+ previous TLS session (and the client may even have terminated
the session).
</para>
<para>
diff --git a/jcc.c b/jcc.c
index f147d61c..50d7339d 100644
--- a/jcc.c
+++ b/jcc.c
@@ -877,7 +877,7 @@ static void send_crunch_response(struct client_state *csp, struct http_response
{
/* There is nothing we can do about it. */
log_error(LOG_LEVEL_CONNECT, "Couldn't deliver the error message "
- "for https://%s%s through client socket %d using TLS/SSL",
+ "for https://%s%s through client socket %d using TLS",
http->hostport, http->url, csp->cfd);
}
}
@@ -3400,7 +3400,7 @@ static void handle_established_connection(struct client_state *csp)
}
continue;
}
- log_error(LOG_LEVEL_CONNECT, "Breaking with TLS/SSL.");
+ log_error(LOG_LEVEL_CONNECT, "Breaking with TLS.");
break;
}
else
@@ -4356,9 +4356,9 @@ static void chat(struct client_state *csp)
* have been altered by now.
*
* SSL proxy = Open a socket to the host:port of the server
- * and create TLS/SSL connection with server and
+ * and create TLS connection with server and
* with client. Then behave like mediator between
- * client and server over TLS/SSL.
+ * client and server over TLS.
*
* SSL proxy = Pass the request unchanged if forwarding a CONNECT
* with request to a parent proxy. Note that we'll be sending
@@ -4367,7 +4367,7 @@ static void chat(struct client_state *csp)
* since that would result in a double message (ours and the
* parent's). After sending the request to the parent, we
* must parse answer and send it to client. If connection
- * with server is established, we do TLS/SSL proxy. Otherwise
+ * with server is established, we do TLS proxy. Otherwise
* we send parent response to client and close connections.
*
* here's the matrix:
@@ -4431,7 +4431,7 @@ static void chat(struct client_state *csp)
/*
* We have a request. Check if one of the crunchers wants it
- * unless the client wants to use TLS/SSL in which case we
+ * unless the client wants to use TLS in which case we
* haven't setup the TLS context yet and will send the crunch
* response later.
*/
@@ -4665,7 +4665,7 @@ static void chat(struct client_state *csp)
#ifdef FEATURE_HTTPS_INSPECTION
/*
- * Creating TLS/SSL connections with destination server or parent
+ * Creating TLS connections with destination server or parent
* proxy. If forwarding is enabled, we must send client request to
* parent proxy and receive, parse and resend parent proxy answer.
*/
@@ -4742,7 +4742,7 @@ static void chat(struct client_state *csp)
} /* -END- if (fwd->forward_host != NULL) */
/*
- * We can now create the TLS/SSL connection with the destination server.
+ * We can now create the TLS connection with the destination server.
*/
int ret = create_server_ssl_connection(csp);
if (ret != 0)
@@ -4762,7 +4762,7 @@ static void chat(struct client_state *csp)
|| csp->server_cert_verification_result == SSL_CERT_VALID)
{
/*
- * The TLS/SSL connection wasn't created but an invalid
+ * The TLS connection wasn't created but an invalid
* certificate wasn't detected. Report it as connection
* failure.
*/
diff --git a/openssl.c b/openssl.c
index 3a5bf1e5..8e254913 100644
--- a/openssl.c
+++ b/openssl.c
@@ -2,8 +2,8 @@
*
* File : $Source: /cvsroot/ijbswa/current/openssl.c,v $
*
- * Purpose : File with TLS/SSL extension. Contains methods for
- * creating, using and closing TLS/SSL connections
+ * Purpose : File with TLS extension. Contains methods for
+ * creating, using and closing TLS connections
* using OpenSSL (or LibreSSL).
*
* Copyright : Written by and Copyright (c) 2020 Maxim Antonov <mantonov at gmail.com>
@@ -180,7 +180,7 @@ extern int ssl_send_data(struct ssl_attr *ssl_attr, const unsigned char *buf, si
if (!BIO_should_retry(bio))
{
log_ssl_errors(LOG_LEVEL_ERROR,
- "Sending data on socket %d over TLS/SSL failed", fd);
+ "Sending data on socket %d over TLS failed", fd);
return -1;
}
}
@@ -233,7 +233,7 @@ extern int ssl_recv_data(struct ssl_attr *ssl_attr, unsigned char *buf, size_t m
if (ret < 0)
{
log_ssl_errors(LOG_LEVEL_ERROR,
- "Receiving data on socket %d over TLS/SSL failed", fd);
+ "Receiving data on socket %d over TLS failed", fd);
return -1;
}
@@ -714,7 +714,7 @@ static int host_to_hash(struct client_state *csp)
*
* Function : create_client_ssl_connection
*
- * Description : Creates TLS/SSL secured connection with client
+ * Description : Creates TLS secured connection with client
*
* Parameters :
* 1 : csp = Current client state (buffers, headers, etc...)
@@ -733,7 +733,7 @@ extern int create_client_ssl_connection(struct client_state *csp)
SSL *ssl;
/*
- * Initializing OpenSSL structures for TLS/SSL connection
+ * Initializing OpenSSL structures for TLS connection
*/
openssl_init();
@@ -843,12 +843,12 @@ extern int create_client_ssl_connection(struct client_state *csp)
* Handshake with client
*/
log_error(LOG_LEVEL_CONNECT,
- "Performing the TLS/SSL handshake with client. Hash of host: %s",
+ "Performing the TLS handshake with client. Hash of host: %s",
csp->http->hash_of_host_hex);
if (BIO_do_handshake(ssl_attr->openssl_attr.bio) != 1)
{
log_ssl_errors(LOG_LEVEL_ERROR,
- "The TLS/SSL handshake with the client failed");
+ "The TLS handshake with the client failed");
ret = -1;
goto exit;
}
@@ -879,7 +879,7 @@ exit:
*
* Function : close_client_ssl_connection
*
- * Description : Closes TLS/SSL connection with client. This function
+ * Description : Closes TLS connection with client. This function
* checks if this connection is already created.
*
* Parameters :
@@ -953,7 +953,7 @@ static void free_client_ssl_structures(struct client_state *csp)
*
* Function : close_server_ssl_connection
*
- * Description : Closes TLS/SSL connection with server. This function
+ * Description : Closes TLS connection with server. This function
* checks if this connection is already opened.
*
* Parameters :
@@ -999,7 +999,7 @@ extern void close_server_ssl_connection(struct client_state *csp)
*
* Function : create_server_ssl_connection
*
- * Description : Creates TLS/SSL secured connection with server.
+ * Description : Creates TLS secured connection with server.
*
* Parameters :
* 1 : csp = Current client state (buffers, headers, etc...)
@@ -1101,12 +1101,12 @@ extern int create_server_ssl_connection(struct client_state *csp)
* Handshake with server
*/
log_error(LOG_LEVEL_CONNECT,
- "Performing the TLS/SSL handshake with the server");
+ "Performing the TLS handshake with the server");
if (BIO_do_handshake(ssl_attrs->bio) != 1)
{
log_ssl_errors(LOG_LEVEL_ERROR,
- "The TLS/SSL handshake with the server failed");
+ "The TLS handshake with the server failed");
ret = -1;
goto exit;
}
@@ -1230,11 +1230,11 @@ static void log_ssl_errors(int debuglevel, const char* fmt, ...)
va_end(args);
/*
* In case if called by mistake and there were
- * no TLS/SSL errors let's report it to the log.
+ * no TLS errors let's report it to the log.
*/
if (!reported)
{
- log_error(debuglevel, "%s: no TLS/SSL errors detected", prefix);
+ log_error(debuglevel, "%s: no TLS errors detected", prefix);
}
}
diff --git a/project.h b/project.h
index ee50d8d4..b90465cd 100644
--- a/project.h
+++ b/project.h
@@ -298,7 +298,7 @@ struct map
#ifdef FEATURE_HTTPS_INSPECTION_MBEDTLS
/*
- * Struct of attributes necessary for TLS/SSL connection
+ * Struct of attributes necessary for TLS connection
*/
typedef struct {
mbedtls_ssl_context ssl;
@@ -317,7 +317,7 @@ typedef struct {
#ifdef FEATURE_HTTPS_INSPECTION_OPENSSL
/*
- * Struct of attributes necessary for TLS/SSL connection
+ * Struct of attributes necessary for TLS connection
*/
typedef struct {
SSL_CTX *ctx;
@@ -327,7 +327,7 @@ typedef struct {
#ifdef FEATURE_HTTPS_INSPECTION_WOLFSSL
/*
- * Struct of attributes necessary for TLS/SSL connection
+ * Struct of attributes necessary for TLS connection
*/
typedef struct {
WOLFSSL_CTX *ctx;
diff --git a/ssl.c b/ssl.c
index 6950caae..703945ac 100644
--- a/ssl.c
+++ b/ssl.c
@@ -2,8 +2,8 @@
*
* File : $Source: /cvsroot/ijbswa/current/ssl.c,v $
*
- * Purpose : File with TLS/SSL extension. Contains methods for
- * creating, using and closing TLS/SSL connections
+ * Purpose : File with TLS extension. Contains methods for
+ * creating, using and closing TLS connections
* using mbedTLS.
*
* Copyright : Written by and Copyright (c) 2017-2020 Vaclav Svec. FIT CVUT.
@@ -163,7 +163,7 @@ extern int ssl_send_data(struct ssl_attr *ssl_attr, const unsigned char *buf, si
mbedtls_strerror(ret, err_buf, sizeof(err_buf));
log_error(LOG_LEVEL_ERROR,
- "Sending %d bytes on socket %d over TLS/SSL failed with ret %d: %s",
+ "Sending %d bytes on socket %d over TLS failed with ret %d: %s",
send_len, ssl_attr->mbedtls_attr.socket_fd.fd, ret, err_buf);
return -1;
}
@@ -219,7 +219,7 @@ extern int ssl_recv_data(struct ssl_attr *ssl_attr, unsigned char *buf, size_t m
}
mbedtls_strerror(ret, err_buf, sizeof(err_buf));
log_error(LOG_LEVEL_ERROR,
- "Receiving data on socket %d over TLS/SSL failed: %s",
+ "Receiving data on socket %d over TLS failed: %s",
ssl_attr->mbedtls_attr.socket_fd.fd, err_buf);
return -1;
@@ -236,7 +236,7 @@ extern int ssl_recv_data(struct ssl_attr *ssl_attr, unsigned char *buf, size_t m
*
* Function : create_client_ssl_connection
*
- * Description : Creates TLS/SSL secured connection with client
+ * Description : Creates TLS secured connection with client
*
* Parameters :
* 1 : csp = Current client state (buffers, headers, etc...)
@@ -256,7 +256,7 @@ extern int create_client_ssl_connection(struct client_state *csp)
char err_buf[ERROR_BUF_SIZE];
/*
- * Initializing mbedtls structures for TLS/SSL connection
+ * Initializing mbedtls structures for TLS connection
*/
mbedtls_net_init(&(ssl_attr->mbedtls_attr.socket_fd));
mbedtls_ssl_init(&(ssl_attr->mbedtls_attr.ssl));
@@ -437,7 +437,7 @@ extern int create_client_ssl_connection(struct client_state *csp)
* Handshake with client
*/
log_error(LOG_LEVEL_CONNECT,
- "Performing the TLS/SSL handshake with client. Hash of host: %s",
+ "Performing the TLS handshake with client. Hash of host: %s",
csp->http->hash_of_host_hex);
while ((ret = mbedtls_ssl_handshake(&(ssl_attr->mbedtls_attr.ssl))) != 0)
{
@@ -478,7 +478,7 @@ exit:
*
* Function : close_client_ssl_connection
*
- * Description : Closes TLS/SSL connection with client. This function
+ * Description : Closes TLS connection with client. This function
* checks if this connection is already created.
*
* Parameters :
@@ -549,7 +549,7 @@ static void free_client_ssl_structures(struct client_state *csp)
*
* Function : create_server_ssl_connection
*
- * Description : Creates TLS/SSL secured connection with server.
+ * Description : Creates TLS secured connection with server.
*
* Parameters :
* 1 : csp = Current client state (buffers, headers, etc...)
@@ -573,7 +573,7 @@ extern int create_server_ssl_connection(struct client_state *csp)
trusted_cas_file = csp->config->trusted_cas_file;
/*
- * Initializing mbedtls structures for TLS/SSL connection
+ * Initializing mbedtls structures for TLS connection
*/
mbedtls_net_init(&(ssl_attr->mbedtls_attr.socket_fd));
mbedtls_ssl_init(&(ssl_attr->mbedtls_attr.ssl));
@@ -612,7 +612,7 @@ extern int create_server_ssl_connection(struct client_state *csp)
}
/*
- * Set TLS/SSL options
+ * Set TLS options
*/
ret = mbedtls_ssl_config_defaults(&(ssl_attr->mbedtls_attr.conf),
MBEDTLS_SSL_IS_CLIENT,
@@ -695,7 +695,7 @@ extern int create_server_ssl_connection(struct client_state *csp)
* Handshake with server
*/
log_error(LOG_LEVEL_CONNECT,
- "Performing the TLS/SSL handshake with the server.");
+ "Performing the TLS handshake with the server.");
while ((ret = mbedtls_ssl_handshake(&(ssl_attr->mbedtls_attr.ssl))) != 0)
{
@@ -759,7 +759,7 @@ exit:
*
* Function : close_server_ssl_connection
*
- * Description : Closes TLS/SSL connection with server. This function
+ * Description : Closes TLS connection with server. This function
* checks if this connection is already opened.
*
* Parameters :
diff --git a/ssl.h b/ssl.h
index c0168154..afc8a377 100644
--- a/ssl.h
+++ b/ssl.h
@@ -4,8 +4,8 @@
*
* File : $Source: $
*
-* Purpose : File with TLS/SSL extension. Contains methods for
-* creating, using and closing TLS/SSL connections.
+* Purpose : File with TLS extension. Contains methods for
+* creating, using and closing TLS connections.
*
* Copyright : Written by and Copyright (c) 2017 Vaclav Svec. FIT CVUT.
*
@@ -31,13 +31,13 @@
#include "project.h"
-/* Boolean functions to get information about TLS/SSL connections */
+/* Boolean functions to get information about TLS connections */
extern int client_use_ssl(const struct client_state *csp);
extern int server_use_ssl(const struct client_state *csp);
extern size_t is_ssl_pending(struct ssl_attr *ssl_attr);
extern int tunnel_established_successfully(const char *response, unsigned int response_len);
-/* Functions for sending and receiving data over TLS/SSL connections */
+/* Functions for sending and receiving data over TLS connections */
extern int ssl_send_data(struct ssl_attr *ssl_attr, const unsigned char *buf, size_t len);
extern int ssl_send_data_delayed(struct ssl_attr *ssl_attr, const unsigned char *buf,
size_t len, unsigned int delay);
@@ -45,7 +45,7 @@ extern int ssl_recv_data(struct ssl_attr *ssl_attr, unsigned char *buf, size_t
extern long ssl_flush_socket(struct ssl_attr *ssl_attr, struct iob *iob);
extern void ssl_send_certificate_error(struct client_state *csp);
-/* Functions for opening and closing TLS/SSL connections */
+/* Functions for opening and closing TLS connections */
extern int create_client_ssl_connection(struct client_state *csp);
extern int create_server_ssl_connection(struct client_state *csp);
extern void close_client_and_server_ssl_connections(struct client_state *csp);
diff --git a/ssl_common.c b/ssl_common.c
index e3badef6..900e3eba 100644
--- a/ssl_common.c
+++ b/ssl_common.c
@@ -2,9 +2,9 @@
*
* File : $Source: /cvsroot/ijbswa/current/ssl_common.c,v $
*
- * Purpose : File with TLS/SSL extension. Contains methods for
- * creating, using and closing TLS/SSL connections that do
- * not depend on particular TLS/SSL library.
+ * Purpose : File with TLS extension. Contains methods for
+ * creating, using and closing TLS connections that do
+ * not depend on particular TLS library.
*
* Copyright : Written by and Copyright (c) 2017 Vaclav Svec. FIT CVUT.
* Copyright (C) 2018-2024 by Fabian Keil <fk at fabiankeil.de>
@@ -54,7 +54,7 @@
* Parameters :
* 1 : csp = Current client state (buffers, headers, etc...)
*
- * Returns : If client should use TLS/SSL connection, 1 is returned.
+ * Returns : If client should use TLS connection, 1 is returned.
* Otherwise 0 is returned.
*
*********************************************************************/
@@ -74,7 +74,7 @@ extern int client_use_ssl(const struct client_state *csp)
* Parameters :
* 1 : csp = Current client state (buffers, headers, etc...)
*
- * Returns : If server should use TLS/SSL connection, 1 is returned.
+ * Returns : If server should use TLS connection, 1 is returned.
* Otherwise 0 is returned.
*
*********************************************************************/
diff --git a/ssl_common.h b/ssl_common.h
index 3458b232..084e4887 100644
--- a/ssl_common.h
+++ b/ssl_common.h
@@ -4,9 +4,9 @@
*
* File : $Source: /cvsroot/ijbswa/current/ssl_common.h,v $
*
-* Purpose : File with TLS/SSL extension. Contains methods for
-* creating, using and closing TLS/SSL connections that do
-* not depend on particular TLS/SSL library.
+* Purpose : File with TLS extension. Contains methods for
+* creating, using and closing TLS connections that do
+* not depend on particular TLS library.
*
* Copyright : Written by and Copyright (c) 2017 Vaclav Svec. FIT CVUT.
*
diff --git a/wolfssl.c b/wolfssl.c
index 7adf64ab..de472947 100644
--- a/wolfssl.c
+++ b/wolfssl.c
@@ -2,8 +2,8 @@
*
* File : $Source: /cvsroot/ijbswa/current/wolfssl.c,v $
*
- * Purpose : File with TLS/SSL extension. Contains methods for
- * creating, using and closing TLS/SSL connections
+ * Purpose : File with TLS extension. Contains methods for
+ * creating, using and closing TLS connections
* using wolfSSL.
*
* Copyright : Copyright (C) 2018-2026 by Fabian Keil <fk at fabiankeil.de>
@@ -877,7 +877,7 @@ extern int create_client_ssl_connection(struct client_state *csp)
* Handshake with client
*/
log_error(LOG_LEVEL_CONNECT,
- "Performing the TLS/SSL handshake with client. Hash of host: %s",
+ "Performing the TLS handshake with client. Hash of host: %s",
csp->http->hash_of_host_hex);
ret = wolfSSL_accept(ssl);
@@ -1163,7 +1163,7 @@ extern int create_server_ssl_connection(struct client_state *csp)
#endif
log_error(LOG_LEVEL_CONNECT,
- "Performing the TLS/SSL handshake with the server");
+ "Performing the TLS handshake with the server");
/* wolfSSL_Debugging_ON(); */
connect_ret = wolfSSL_connect(ssl);
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Privoxy-commits
mailing list