Remove ASN1_bn_print() and ASN1_buf_print()

ASN1_bn_print() is a hilariously bad API that was replaced with a saner
interface internally. ASN1_buf_print() isn't terrible, but it is too
specialized to be of real use. It was only exposed because ASN1_bn_print()
was already there. Its only use had been in the EdDSA printing code before
it was replaced with an internal helper.

ok jsing

6 files changed, 3 insertions, 160 deletions

diff --git a/src/lib/libcrypto/Makefile b/src/lib/libcrypto/Makefile
index d44a18846f..6d9a6ca858 100644
--- a/src/lib/libcrypto/Makefile
+++ b/src/lib/libcrypto/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.146 2023/07/28 09:53:55 tb Exp $
+# $OpenBSD: Makefile,v 1.147 2023/07/28 10:02:11 tb Exp $
 
 LIB=    crypto
 LIBREBUILD=y
@@ -114,7 +114,6 @@ SRCS+= p5_pbe.c
 SRCS+= p5_pbev2.c
 SRCS+= p8_pkey.c
 SRCS+= t_crl.c
-SRCS+= t_pkey.c
 SRCS+= t_req.c
 SRCS+= t_spki.c
 SRCS+= t_x509.c
diff --git a/src/lib/libcrypto/Symbols.list b/src/lib/libcrypto/Symbols.list
index 2c38d67e26..80be9faeae 100644
--- a/src/lib/libcrypto/Symbols.list
+++ b/src/lib/libcrypto/Symbols.list
@@ -181,8 +181,6 @@ ASN1_VISIBLESTRING_free
 ASN1_VISIBLESTRING_it
 ASN1_VISIBLESTRING_new
 ASN1_add_oid_module
-ASN1_bn_print
-ASN1_buf_print
 ASN1_d2i_bio
 ASN1_d2i_fp
 ASN1_dup
diff --git a/src/lib/libcrypto/Symbols.namespace b/src/lib/libcrypto/Symbols.namespace
index 18d52db63c..7a309ab416 100644
--- a/src/lib/libcrypto/Symbols.namespace
+++ b/src/lib/libcrypto/Symbols.namespace
@@ -1078,8 +1078,6 @@ _libre_ASN1_GENERALIZEDTIME_print
 _libre_ASN1_TIME_print
 _libre_ASN1_STRING_print
 _libre_ASN1_STRING_print_ex
-_libre_ASN1_bn_print
-_libre_ASN1_buf_print
 _libre_ASN1_parse
 _libre_ASN1_parse_dump
 _libre_ASN1_tag2bit
diff --git a/src/lib/libcrypto/asn1/asn1.h b/src/lib/libcrypto/asn1/asn1.h
index fbc5d098d8..bef5cb4808 100644
--- a/src/lib/libcrypto/asn1/asn1.h
+++ b/src/lib/libcrypto/asn1/asn1.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: asn1.h,v 1.77 2023/07/28 09:58:30 tb Exp $ */
+/* $OpenBSD: asn1.h,v 1.78 2023/07/28 10:02:11 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -834,9 +834,6 @@ int ASN1_GENERALIZEDTIME_print(BIO *fp, const ASN1_GENERALIZEDTIME *a);
 int ASN1_TIME_print(BIO *fp, const ASN1_TIME *a);
 int ASN1_STRING_print(BIO *bp, const ASN1_STRING *v);
 int ASN1_STRING_print_ex(BIO *out, const ASN1_STRING *str, unsigned long flags);
-int ASN1_bn_print(BIO *bp, const char *number, const BIGNUM *num,
-    unsigned char *buf, int off);
-int ASN1_buf_print(BIO *bp, const unsigned char *buf, size_t buflen, int indent);
 int ASN1_parse(BIO *bp, const unsigned char *pp, long len, int indent);
 int ASN1_parse_dump(BIO *bp, const unsigned char *pp, long len, int indent, int dump);
 #endif
diff --git a/src/lib/libcrypto/asn1/t_pkey.c b/src/lib/libcrypto/asn1/t_pkey.c
deleted file mode 100644
index 3257cd08c8..0000000000
--- a/src/lib/libcrypto/asn1/t_pkey.c
+++ /dev/null
@@ -1,147 +0,0 @@
-/* $OpenBSD: t_pkey.c,v 1.20 2023/07/05 21:23:36 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 <openssl/bn.h>
-#include <openssl/buffer.h>
-#include <openssl/objects.h>
-
-#include "bn_local.h"
-
-int
-ASN1_bn_print(BIO *bp, const char *number, const BIGNUM *num,
-    unsigned char *buf, int off)
-{
-        int n, i;
-        const char *neg;
-
-        if (num == NULL)
-                return (1);
-        neg = (BN_is_negative(num)) ? "-" : "";
-        if (!BIO_indent(bp, off, 128))
-                return 0;
-        if (BN_is_zero(num)) {
-                if (BIO_printf(bp, "%s 0\n", number) <= 0)
-                        return 0;
-                return 1;
-        }
-
-        if (BN_num_bytes(num) <= BN_BYTES) {
-                if (BIO_printf(bp, "%s %s%lu (%s0x%lx)\n", number, neg,
-                    (unsigned long)num->d[0], neg,
-                    (unsigned long)num->d[0]) <= 0)
-                        return (0);
-        } else {
-                buf[0] = 0;
-                if (BIO_printf(bp, "%s%s", number,
-                    (neg[0] == '-') ? " (Negative)" : "") <= 0)
-                        return (0);
-                n = BN_bn2bin(num, &buf[1]);
-
-                if (buf[1] & 0x80)
-                        n++;
-                else
-                        buf++;
-
-                for (i = 0; i < n; i++) {
-                        if ((i % 15) == 0) {
-                                if (BIO_puts(bp, "\n") <= 0 ||
-                                    !BIO_indent(bp, off + 4, 128))
-                                        return 0;
-                        }
-                        if (BIO_printf(bp, "%02x%s", buf[i],
-                            ((i + 1) == n) ? "" : ":") <= 0)
-                                return (0);
-                }
-                if (BIO_write(bp, "\n", 1) <= 0)
-                        return (0);
-        }
-        return (1);
-}
-LCRYPTO_ALIAS(ASN1_bn_print);
-
-#define ASN1_BUF_PRINT_WIDTH            15
-#define ASN1_BUF_PRINT_MAX_INDENT       64
-
-int
-ASN1_buf_print(BIO *bp, const unsigned char *buf, size_t buflen, int indent)
-{
-        size_t i;
-
-        for (i = 0; i < buflen; i++) {
-                if ((i % ASN1_BUF_PRINT_WIDTH) == 0) {
-                        if (i > 0 && BIO_puts(bp, "\n") <= 0)
-                                return 0;
-                        if (!BIO_indent(bp, indent, ASN1_BUF_PRINT_MAX_INDENT))
-                                return 0;
-                }
-                /*
-                 * Use colon separators for each octet for compatibility as
-                 * this function is used to print out key components.
-                 */
-                if (BIO_printf(bp, "%02x%s", buf[i],
-                    (i == buflen - 1) ? "" : ":") <= 0)
-                        return 0;
-        }
-        if (BIO_write(bp, "\n", 1) <= 0)
-                return 0;
-
-        return 1;
-}
-LCRYPTO_ALIAS(ASN1_buf_print);
diff --git a/src/lib/libcrypto/hidden/openssl/asn1.h b/src/lib/libcrypto/hidden/openssl/asn1.h
index e3095e0631..2a1eda1a89 100644
--- a/src/lib/libcrypto/hidden/openssl/asn1.h
+++ b/src/lib/libcrypto/hidden/openssl/asn1.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: asn1.h,v 1.3 2023/07/28 09:58:30 tb Exp $ */
+/* $OpenBSD: asn1.h,v 1.4 2023/07/28 10:02:11 tb Exp $ */
 /*
  * Copyright (c) 2023 Bob Beck <beck@openbsd.org>
  *
@@ -208,8 +208,6 @@ LCRYPTO_USED(ASN1_GENERALIZEDTIME_print);
 LCRYPTO_USED(ASN1_TIME_print);
 LCRYPTO_USED(ASN1_STRING_print);
 LCRYPTO_USED(ASN1_STRING_print_ex);
-LCRYPTO_USED(ASN1_bn_print);
-LCRYPTO_USED(ASN1_buf_print);
 LCRYPTO_USED(ASN1_parse);
 LCRYPTO_USED(ASN1_parse_dump);
 LCRYPTO_USED(ASN1_tag2bit);