Remove SSL_CIPHER_get_by_{id,value}()

While this undocumented API would have been much nicer and saner than
SSL_CIPHER_find(), nothing used this except for the exporter test.
Let's get rid of it again. libssl uses ssl3_get_cipher_by_{id,value}()
directly.

ok jsing

diff --git a/lib/libssl/Symbols.list b/lib/libssl/Symbols.list
index 37715a8..63aa8ff 100644 (file)
--- a/lib/libssl/Symbols.list
+++ b/lib/libssl/Symbols.list
@@ -23,8 +23,6 @@ SSL_CIPHER_description
 SSL_CIPHER_find
 SSL_CIPHER_get_auth_nid
 SSL_CIPHER_get_bits
-SSL_CIPHER_get_by_id
-SSL_CIPHER_get_by_value
 SSL_CIPHER_get_cipher_nid
 SSL_CIPHER_get_digest_nid
 SSL_CIPHER_get_id

diff --git a/lib/libssl/hidden/openssl/ssl.h b/lib/libssl/hidden/openssl/ssl.h
index e4ec6d6..e0fb898 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.4 2023/07/28 09:53:55 tb Exp $ */
+/* $OpenBSD: ssl.h,v 1.5 2024/03/02 11:45:51 tb Exp $ */
 /*
  * Copyright (c) 2023 Bob Beck <beck@openbsd.org>
  *
@@ -111,8 +111,6 @@ LSSL_USED(SSL_want);
 LSSL_USED(SSL_clear);
 LSSL_USED(SSL_CTX_flush_sessions);
 LSSL_USED(SSL_get_current_cipher);
-LSSL_USED(SSL_CIPHER_get_by_id);
-LSSL_USED(SSL_CIPHER_get_by_value);
 LSSL_USED(SSL_CIPHER_get_bits);
 LSSL_USED(SSL_CIPHER_get_version);
 LSSL_USED(SSL_CIPHER_get_name);

diff --git a/lib/libssl/ssl.h b/lib/libssl/ssl.h
index e69979c..e3f536a 100644 (file)
--- a/lib/libssl/ssl.h
+++ b/lib/libssl/ssl.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl.h,v 1.234 2024/03/02 11:44:47 tb Exp $ */
+/* $OpenBSD: ssl.h,v 1.235 2024/03/02 11:45:51 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -1122,8 +1122,6 @@ int       SSL_clear(SSL *s);
 void   SSL_CTX_flush_sessions(SSL_CTX *ctx, long tm);
 
 const SSL_CIPHER *SSL_get_current_cipher(const SSL *s);
-const SSL_CIPHER *SSL_CIPHER_get_by_id(unsigned int id);
-const SSL_CIPHER *SSL_CIPHER_get_by_value(uint16_t value);
 int    SSL_CIPHER_get_bits(const SSL_CIPHER *c, int *alg_bits);
 const char *   SSL_CIPHER_get_version(const SSL_CIPHER *c);
 const char *   SSL_CIPHER_get_name(const SSL_CIPHER *c);

diff --git a/lib/libssl/ssl_ciph.c b/lib/libssl/ssl_ciph.c
index 76a3840..45d7889 100644 (file)
--- a/lib/libssl/ssl_ciph.c
+++ b/lib/libssl/ssl_ciph.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl_ciph.c,v 1.139 2024/02/03 15:58:33 beck Exp $ */
+/* $OpenBSD: ssl_ciph.c,v 1.140 2024/03/02 11:45:51 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -1341,20 +1341,6 @@ ssl_create_cipher_list(const SSL_METHOD *ssl_method,
        return ret;
 }
 
-const SSL_CIPHER *
-SSL_CIPHER_get_by_id(unsigned int id)
-{
-       return ssl3_get_cipher_by_id(id);
-}
-LSSL_ALIAS(SSL_CIPHER_get_by_id);
-
-const SSL_CIPHER *
-SSL_CIPHER_get_by_value(uint16_t value)
-{
-       return ssl3_get_cipher_by_value(value);
-}
-LSSL_ALIAS(SSL_CIPHER_get_by_value);
-
 char *
 SSL_CIPHER_description(const SSL_CIPHER *cipher, char *buf, int len)
 {