Remove lh stats

This could have been removed in an earlier bump. Now it's time for it to
say goodbye.

ok jsing

2 files changed, 1 insertions, 280 deletions

diff --git a/src/lib/libcrypto/lhash/lh_stats.c b/src/lib/libcrypto/lhash/lh_stats.c
deleted file mode 100644
index 123792a2ab..0000000000
--- a/src/lib/libcrypto/lhash/lh_stats.c
+++ /dev/null
@@ -1,263 +0,0 @@
-/* $OpenBSD: lh_stats.c,v 1.13 2023/07/07 13:40:44 beck Exp $ */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- *
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- *
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- *
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-
-#include <openssl/opensslconf.h>
-
-#ifndef OPENSSL_NO_BIO
-#include <openssl/bio.h>
-#endif
-#include <openssl/lhash.h>
-
-#ifdef OPENSSL_NO_BIO
-
-void
-lh_stats(LHASH *lh, FILE *out)
-{
-        fprintf(out, "num_items             = %lu\n", lh->num_items);
-        fprintf(out, "num_nodes             = %u\n", lh->num_nodes);
-        fprintf(out, "num_alloc_nodes       = %u\n", lh->num_alloc_nodes);
-        fprintf(out, "num_expands           = %lu\n", lh->num_expands);
-        fprintf(out, "num_expand_reallocs   = %lu\n", lh->num_expand_reallocs);
-        fprintf(out, "num_contracts         = %lu\n", lh->num_contracts);
-        fprintf(out, "num_contract_reallocs = %lu\n",
-            lh->num_contract_reallocs);
-        fprintf(out, "num_hash_calls        = %lu\n", lh->num_hash_calls);
-        fprintf(out, "num_comp_calls        = %lu\n", lh->num_comp_calls);
-        fprintf(out, "num_insert            = %lu\n", lh->num_insert);
-        fprintf(out, "num_replace           = %lu\n", lh->num_replace);
-        fprintf(out, "num_delete            = %lu\n", lh->num_delete);
-        fprintf(out, "num_no_delete         = %lu\n", lh->num_no_delete);
-        fprintf(out, "num_retrieve          = %lu\n", lh->num_retrieve);
-        fprintf(out, "num_retrieve_miss     = %lu\n", lh->num_retrieve_miss);
-        fprintf(out, "num_hash_comps        = %lu\n", lh->num_hash_comps);
-#if 0
-        fprintf(out, "p                     = %u\n", lh->p);
-        fprintf(out, "pmax                  = %u\n", lh->pmax);
-        fprintf(out, "up_load               = %lu\n", lh->up_load);
-        fprintf(out, "down_load             = %lu\n", lh->down_load);
-#endif
-}
-LCRYPTO_ALIAS(lh_stats);
-
-void
-lh_node_stats(LHASH *lh, FILE *out)
-{
-        LHASH_NODE *n;
-        unsigned int i, num;
-
-        for (i = 0; i < lh->num_nodes; i++) {
-                for (n = lh->b[i], num = 0; n != NULL; n = n->next)
-                        num++;
-                fprintf(out, "node %6u -> %3u\n", i, num);
-        }
-}
-LCRYPTO_ALIAS(lh_node_stats);
-
-void
-lh_node_usage_stats(LHASH *lh, FILE *out)
-{
-        LHASH_NODE *n;
-        unsigned long num;
-        unsigned int i;
-        unsigned long total = 0, n_used = 0;
-
-        for (i = 0; i < lh->num_nodes; i++) {
-                for (n = lh->b[i], num = 0; n != NULL; n = n->next)
-                        num++;
-                if (num != 0) {
-                        n_used++;
-                        total += num;
-                }
-        }
-        fprintf(out, "%lu nodes used out of %u\n", n_used, lh->num_nodes);
-        fprintf(out, "%lu items\n", total);
-        if (n_used == 0)
-                return;
-        fprintf(out, "load %d.%02d  actual load %d.%02d\n",
-            (int)(total / lh->num_nodes),
-            (int)((total % lh->num_nodes) * 100 / lh->num_nodes),
-            (int)(total / n_used),
-            (int)((total % n_used) * 100 / n_used));
-}
-LCRYPTO_ALIAS(lh_node_usage_stats);
-
-#else
-
-void
-lh_stats(const _LHASH *lh, FILE *fp)
-{
-        BIO *bp;
-
-        bp = BIO_new(BIO_s_file());
-        if (bp == NULL)
-                goto end;
-        BIO_set_fp(bp, fp, BIO_NOCLOSE);
-        lh_stats_bio(lh, bp);
-        BIO_free(bp);
-end:;
-}
-LCRYPTO_ALIAS(lh_stats);
-
-void
-lh_node_stats(const _LHASH *lh, FILE *fp)
-{
-        BIO *bp;
-
-        bp = BIO_new(BIO_s_file());
-        if (bp == NULL)
-                goto end;
-        BIO_set_fp(bp, fp, BIO_NOCLOSE);
-        lh_node_stats_bio(lh, bp);
-        BIO_free(bp);
-end:;
-}
-LCRYPTO_ALIAS(lh_node_stats);
-
-void
-lh_node_usage_stats(const _LHASH *lh, FILE *fp)
-{
-        BIO *bp;
-
-        bp = BIO_new(BIO_s_file());
-        if (bp == NULL)
-                goto end;
-        BIO_set_fp(bp, fp, BIO_NOCLOSE);
-        lh_node_usage_stats_bio(lh, bp);
-        BIO_free(bp);
-end:;
-}
-LCRYPTO_ALIAS(lh_node_usage_stats);
-
-
-void
-lh_stats_bio(const _LHASH *lh, BIO *out)
-{
-        BIO_printf(out, "num_items             = %lu\n", lh->num_items);
-        BIO_printf(out, "num_nodes             = %u\n", lh->num_nodes);
-        BIO_printf(out, "num_alloc_nodes       = %u\n", lh->num_alloc_nodes);
-        BIO_printf(out, "num_expands           = %lu\n", lh->num_expands);
-        BIO_printf(out, "num_expand_reallocs   = %lu\n",
-            lh->num_expand_reallocs);
-        BIO_printf(out, "num_contracts         = %lu\n", lh->num_contracts);
-        BIO_printf(out, "num_contract_reallocs = %lu\n",
-            lh->num_contract_reallocs);
-        BIO_printf(out, "num_hash_calls        = %lu\n", lh->num_hash_calls);
-        BIO_printf(out, "num_comp_calls        = %lu\n", lh->num_comp_calls);
-        BIO_printf(out, "num_insert            = %lu\n", lh->num_insert);
-        BIO_printf(out, "num_replace           = %lu\n", lh->num_replace);
-        BIO_printf(out, "num_delete            = %lu\n", lh->num_delete);
-        BIO_printf(out, "num_no_delete         = %lu\n", lh->num_no_delete);
-        BIO_printf(out, "num_retrieve          = %lu\n", lh->num_retrieve);
-        BIO_printf(out, "num_retrieve_miss     = %lu\n", lh->num_retrieve_miss);
-        BIO_printf(out, "num_hash_comps        = %lu\n", lh->num_hash_comps);
-#if 0
-        BIO_printf(out, "p                     = %u\n", lh->p);
-        BIO_printf(out, "pmax                  = %u\n", lh->pmax);
-        BIO_printf(out, "up_load               = %lu\n", lh->up_load);
-        BIO_printf(out, "down_load             = %lu\n", lh->down_load);
-#endif
-}
-LCRYPTO_ALIAS(lh_stats_bio);
-
-void
-lh_node_stats_bio(const _LHASH *lh, BIO *out)
-{
-        LHASH_NODE *n;
-        unsigned int i, num;
-
-        for (i = 0; i < lh->num_nodes; i++) {
-                for (n = lh->b[i], num = 0; n != NULL; n = n->next)
-                        num++;
-                BIO_printf(out, "node %6u -> %3u\n", i, num);
-        }
-}
-LCRYPTO_ALIAS(lh_node_stats_bio);
-
-void
-lh_node_usage_stats_bio(const _LHASH *lh, BIO *out)
-{
-        LHASH_NODE *n;
-        unsigned long num;
-        unsigned int i;
-        unsigned long total = 0, n_used = 0;
-
-        for (i = 0; i < lh->num_nodes; i++) {
-                for (n = lh->b[i], num = 0; n != NULL; n = n->next)
-                        num++;
-                if (num != 0) {
-                        n_used++;
-                        total += num;
-                }
-        }
-        BIO_printf(out, "%lu nodes used out of %u\n", n_used, lh->num_nodes);
-        BIO_printf(out, "%lu items\n", total);
-        if (n_used == 0)
-                return;
-        BIO_printf(out, "load %d.%02d  actual load %d.%02d\n",
-            (int)(total / lh->num_nodes),
-            (int)((total % lh->num_nodes) * 100 / lh->num_nodes),
-            (int)(total / n_used),
-            (int)((total % n_used) * 100 / n_used));
-}
-LCRYPTO_ALIAS(lh_node_usage_stats_bio);
-
-#endif
diff --git a/src/lib/libcrypto/lhash/lhash.h b/src/lib/libcrypto/lhash/lhash.h
index 9c63657396..8db0174a61 100644
--- a/src/lib/libcrypto/lhash/lhash.h
+++ b/src/lib/libcrypto/lhash/lhash.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: lhash.h,v 1.12 2014/06/12 15:49:29 deraadt Exp $ */
+/* $OpenBSD: lhash.h,v 1.13 2024/03/02 11:04:51 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -179,16 +179,6 @@ void lh_doall_arg(_LHASH *lh, LHASH_DOALL_ARG_FN_TYPE func, void *arg);
 unsigned long lh_strhash(const char *c);
 unsigned long lh_num_items(const _LHASH *lh);
 
-void lh_stats(const _LHASH *lh, FILE *out);
-void lh_node_stats(const _LHASH *lh, FILE *out);
-void lh_node_usage_stats(const _LHASH *lh, FILE *out);
-
-#ifndef OPENSSL_NO_BIO
-void lh_stats_bio(const _LHASH *lh, BIO *out);
-void lh_node_stats_bio(const _LHASH *lh, BIO *out);
-void lh_node_usage_stats_bio(const _LHASH *lh, BIO *out);
-#endif
-
 /* Type checking... */
 
 #define LHASH_OF(type) struct lhash_st_##type
@@ -217,12 +207,6 @@ void lh_node_usage_stats_bio(const _LHASH *lh, BIO *out);
   lh_doall_arg(CHECKED_LHASH_OF(type, lh), fn, CHECKED_PTR_OF(arg_type, arg))
 #define LHM_lh_num_items(type, lh) lh_num_items(CHECKED_LHASH_OF(type, lh))
 #define LHM_lh_down_load(type, lh) (CHECKED_LHASH_OF(type, lh)->down_load)
-#define LHM_lh_node_stats_bio(type, lh, out) \
-  lh_node_stats_bio(CHECKED_LHASH_OF(type, lh), out)
-#define LHM_lh_node_usage_stats_bio(type, lh, out) \
-  lh_node_usage_stats_bio(CHECKED_LHASH_OF(type, lh), out)
-#define LHM_lh_stats_bio(type, lh, out) \
-  lh_stats_bio(CHECKED_LHASH_OF(type, lh), out)
 #define LHM_lh_free(type, lh) lh_free(CHECKED_LHASH_OF(type, lh))
 
 DECLARE_LHASH_OF(OPENSSL_STRING);