Remove SSL_add_compression_method

diff --git a/lib/libssl/Symbols.list b/lib/libssl/Symbols.list
index 4577566..65cd3e7 100644 (file)
--- a/lib/libssl/Symbols.list
+++ b/lib/libssl/Symbols.list
@@ -32,7 +32,6 @@ SSL_CIPHER_get_name
 SSL_CIPHER_get_value
 SSL_CIPHER_get_version
 SSL_CIPHER_is_aead
-SSL_COMP_add_compression_method
 SSL_COMP_get_compression_methods
 SSL_COMP_get_name
 SSL_CTX_add0_chain_cert

diff --git a/lib/libssl/hidden/openssl/ssl.h b/lib/libssl/hidden/openssl/ssl.h
index 6cf8d0c..b854dd7 100644 (file)
--- a/lib/libssl/hidden/openssl/ssl.h
+++ b/lib/libssl/hidden/openssl/ssl.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl.h,v 1.8 2024/08/03 04:50:27 tb Exp $ */
+/* $OpenBSD: ssl.h,v 1.9 2024/08/31 10:51:48 tb Exp $ */
 /*
  * Copyright (c) 2023 Bob Beck <beck@openbsd.org>
  *
@@ -355,7 +355,6 @@ LSSL_USED(SSL_get_current_expansion);
 LSSL_USED(SSL_get_peer_certificate);
 LSSL_USED(SSL_COMP_get_name);
 LSSL_USED(SSL_COMP_get_compression_methods);
-LSSL_USED(SSL_COMP_add_compression_method);
 LSSL_USED(SSL_set_session_ticket_ext);
 LSSL_USED(SSL_set_session_ticket_ext_cb);
 LSSL_USED(SSL_set_session_secret_cb);

diff --git a/lib/libssl/man/SSL_COMP_add_compression_method.3 b/lib/libssl/man/SSL_COMP_add_compression_method.3
index a18c9cd..f9e2535 100644 (file)
--- a/lib/libssl/man/SSL_COMP_add_compression_method.3
+++ b/lib/libssl/man/SSL_COMP_add_compression_method.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: SSL_COMP_add_compression_method.3,v 1.6 2024/05/23 06:49:55 tb Exp $
+.\" $OpenBSD: SSL_COMP_add_compression_method.3,v 1.7 2024/08/31 10:51:48 tb Exp $
 .\"
 .\" Copyright (c) 2016 Ingo Schwarze <schwarze@openbsd.org>
 .\"
@@ -14,45 +14,29 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: May 23 2024 $
+.Dd $Mdocdate: August 31 2024 $
 .Dt SSL_COMP_ADD_COMPRESSION_METHOD 3
 .Os
 .Sh NAME
-.Nm SSL_COMP_add_compression_method ,
 .Nm SSL_COMP_get_compression_methods
 .Nd handle SSL/TLS integrated compression methods
 .Sh SYNOPSIS
 .In openssl/ssl.h
-.Ft int
-.Fn SSL_COMP_add_compression_method "int id" "void *cm"
 .Ft STACK_OF(SSL_COMP) *
 .Fn SSL_COMP_get_compression_methods void
 .Sh DESCRIPTION
-These functions are deprecated and have no effect.
-They are provided purely for compatibility with legacy application code.
-.Pp
-.Fn SSL_COMP_add_compression_method
-used to add the compression method
-.Fa cm
-with the identifier
-.Fa id
-to the list of available compression methods.
+This function is deprecated and has no effect.
+It is provided purely for compatibility with legacy application code.
 .Pp
 .Fn SSL_COMP_get_compression_methods
 used to return a stack of available compression methods.
 .Sh RETURN VALUES
-.Fn SSL_COMP_add_compression_method
-always returns 1.
 .Fn SSL_COMP_get_compression_methods
 always returns
 .Dv NULL .
 .Sh SEE ALSO
 .Xr ssl 3
 .Sh HISTORY
-.Fn SSL_COMP_add_compression_method
-first appeared in OpenSSL 0.9.2b and has been available since
-.Ox 2.6 .
-.Pp
 .Fn SSL_COMP_get_compression_methods
 first appeared in OpenSSL 0.9.8 and has been available since
 .Ox 4.5 .

diff --git a/lib/libssl/man/ssl.3 b/lib/libssl/man/ssl.3
index 5bceba7..314a1b0 100644 (file)
--- a/lib/libssl/man/ssl.3
+++ b/lib/libssl/man/ssl.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ssl.3,v 1.25 2024/07/13 18:33:18 tb Exp $
+.\" $OpenBSD: ssl.3,v 1.26 2024/08/31 10:51:48 tb Exp $
 .\" full merge up to: OpenSSL e330f55d Nov 11 00:51:04 2016 +0100
 .\" selective merge up to: OpenSSL 322755cc Sep 1 08:40:51 2018 +0800
 .\"
@@ -51,7 +51,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 .\" OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: July 13 2024 $
+.Dd $Mdocdate: August 31 2024 $
 .Dt SSL 3
 .Os
 .Sh NAME
@@ -339,7 +339,7 @@ To inspect the state during ongoing communication:
 .Xr SSL_load_client_CA_file 3
 .Ss Obsolete functions
 .Xr OPENSSL_init_ssl 3 ,
-.Xr SSL_COMP_add_compression_method 3 ,
+.Xr SSL_COMP_get_compression_methods 3 ,
 .Xr SSL_CTX_set_tmp_rsa_callback 3 ,
 .Xr SSL_library_init 3 ,
 .Xr SSL_set_tmp_ecdh 3

diff --git a/lib/libssl/ssl.h b/lib/libssl/ssl.h
index 1a0fca1..789a52b 100644 (file)
--- a/lib/libssl/ssl.h
+++ b/lib/libssl/ssl.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl.h,v 1.241 2024/08/12 21:01:00 tb Exp $ */
+/* $OpenBSD: ssl.h,v 1.242 2024/08/31 10:51:48 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -1479,7 +1479,6 @@ const void *SSL_get_current_expansion(SSL *s);
 
 const char *SSL_COMP_get_name(const void *comp);
 void *SSL_COMP_get_compression_methods(void);
-int SSL_COMP_add_compression_method(int id, void *cm);
 
 /* TLS extensions functions */
 int SSL_set_session_ticket_ext(SSL *s, void *ext_data, int ext_len);

diff --git a/lib/libssl/ssl_ciph.c b/lib/libssl/ssl_ciph.c
index 2478d70..aba8fbd 100644 (file)
--- a/lib/libssl/ssl_ciph.c
+++ b/lib/libssl/ssl_ciph.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl_ciph.c,v 1.147 2024/07/23 14:40:53 jsing Exp $ */
+/* $OpenBSD: ssl_ciph.c,v 1.148 2024/08/31 10:51:48 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -1640,13 +1640,6 @@ SSL_COMP_get_compression_methods(void)
 }
 LSSL_ALIAS(SSL_COMP_get_compression_methods);
 
-int
-SSL_COMP_add_compression_method(int id, void *cm)
-{
-       return 1;
-}
-LSSL_ALIAS(SSL_COMP_add_compression_method);
-
 const char *
 SSL_COMP_get_name(const void *comp)
 {