5 files changed, 3 insertions, 578 deletions
diff --git a/src/lib/libcrypto/Makefile b/src/lib/libcrypto/Makefile
index be22c4e9e6..6bbe8ad9de 100644
--- a/src/lib/libcrypto/Makefile
+++ b/src/lib/libcrypto/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.69 2022/01/14 07:52:24 tb Exp $
+# $OpenBSD: Makefile,v 1.70 2022/01/14 08:12:31 tb Exp $
 LIB=    crypto
 LIBREBUILD=y
@@ -62,11 +62,9 @@ SRCS+= a_print.c a_type.c a_string.c
 SRCS+= a_enum.c a_utf8.c a_mbstr.c a_strex.c
 SRCS+= x_algor.c x_val.c x_pubkey.c x_sig.c x_req.c x_attrib.c x_bignum.c
 SRCS+= x_long.c x_name.c x_x509.c x_x509a.c x_crl.c x_info.c x_spki.c nsseq.c
-SRCS+= x_nx509.c
 SRCS+= t_req.c t_x509.c t_x509a.c t_crl.c t_pkey.c t_spki.c
 SRCS+= tasn_new.c tasn_fre.c tasn_enc.c tasn_dec.c tasn_utl.c tasn_typ.c
 SRCS+= tasn_prn.c ameth_lib.c
-SRCS+= n_pkey.c
 SRCS+= x_pkey.c x_exten.c bio_asn1.c bio_ndef.c asn_mime.c
 SRCS+= asn1_gen.c asn1_par.c asn1_old_lib.c asn1_err.c a_strnid.c
 SRCS+= p5_pbe.c p5_pbev2.c p8_pkey.c asn_moid.c
diff --git a/src/lib/libcrypto/asn1/asn1.h b/src/lib/libcrypto/asn1/asn1.h
index 2e854f511e..3f587fe5a0 100644
--- a/src/lib/libcrypto/asn1/asn1.h
+++ b/src/lib/libcrypto/asn1/asn1.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: asn1.h,v 1.60 2022/01/14 08:09:18 tb Exp $ */
+/* $OpenBSD: asn1.h,v 1.61 2022/01/14 08:12:31 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
 * All rights reserved.
 *
@@ -484,11 +484,6 @@ ASN1_SEQUENCE_ANY *d2i_ASN1_SET_ANY(ASN1_SEQUENCE_ANY **a, const unsigned char *
 int i2d_ASN1_SET_ANY(const ASN1_SEQUENCE_ANY *a, unsigned char **out);
 extern const ASN1_ITEM ASN1_SET_ANY_it;
-typedef struct NETSCAPE_X509_st {
-        ASN1_OCTET_STRING *header;
-        X509 *cert;
-} NETSCAPE_X509;
 /* This is used to contain a list of bit names */
 typedef struct BIT_STRING_BITNAME_st {
        int bitnum;
@@ -850,14 +845,6 @@ int ASN1_parse_dump(BIO *bp, const unsigned char *pp, long len, int indent, int
 unsigned long ASN1_tag2bit(int tag);
 const char *ASN1_tag2str(int tag);
-/* Used to load and write netscape format cert */
-NETSCAPE_X509 *NETSCAPE_X509_new(void);
-void NETSCAPE_X509_free(NETSCAPE_X509 *a);
-NETSCAPE_X509 *d2i_NETSCAPE_X509(NETSCAPE_X509 **a, const unsigned char **in, long len);
-int i2d_NETSCAPE_X509(NETSCAPE_X509 *a, unsigned char **out);
-extern const ASN1_ITEM NETSCAPE_X509_it;
 int ASN1_UNIVERSALSTRING_to_string(ASN1_UNIVERSALSTRING *s);
 int ASN1_TYPE_set_octetstring(ASN1_TYPE *a, const unsigned char *data, int len);
diff --git a/src/lib/libcrypto/asn1/n_pkey.c b/src/lib/libcrypto/asn1/n_pkey.c
deleted file mode 100644
index 40d8fa4240..0000000000
--- a/src/lib/libcrypto/asn1/n_pkey.c
+++ /dev/null
@@ -1,435 +0,0 @@
-/* $OpenBSD: n_pkey.c,v 1.35 2021/12/25 13:17:48 jsing 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 <openssl/opensslconf.h>
-#ifndef OPENSSL_NO_RSA
-#include <openssl/asn1t.h>
-#include <openssl/err.h>
-#include <openssl/evp.h>
-#include <openssl/objects.h>
-#include <openssl/rsa.h>
-#include <openssl/x509.h>
-#include "evp_locl.h"
-#include "x509_lcl.h"
-#ifndef OPENSSL_NO_RC4
-typedef struct netscape_pkey_st {
-        long version;
-        X509_ALGOR *algor;
-        ASN1_OCTET_STRING *private_key;
-} NETSCAPE_PKEY;
-typedef struct netscape_encrypted_pkey_st {
-        ASN1_OCTET_STRING *os;
-        /* This is the same structure as DigestInfo so use it:
-         * although this isn't really anything to do with
-         * digests.
-         */
-        X509_SIG *enckey;
-} NETSCAPE_ENCRYPTED_PKEY;
-static const ASN1_AUX NETSCAPE_ENCRYPTED_PKEY_aux = {
-        .flags = ASN1_AFLG_BROKEN,
-};
-static const ASN1_TEMPLATE NETSCAPE_ENCRYPTED_PKEY_seq_tt[] = {
-        {
-                .offset = offsetof(NETSCAPE_ENCRYPTED_PKEY, os),
-                .field_name = "os",
-                .item = &ASN1_OCTET_STRING_it,
-        },
-        {
-                .offset = offsetof(NETSCAPE_ENCRYPTED_PKEY, enckey),
-                .field_name = "enckey",
-                .item = &X509_SIG_it,
-        },
-};
-const ASN1_ITEM NETSCAPE_ENCRYPTED_PKEY_it = {
-        .itype = ASN1_ITYPE_SEQUENCE,
-        .utype = V_ASN1_SEQUENCE,
-        .templates = NETSCAPE_ENCRYPTED_PKEY_seq_tt,
-        .tcount = sizeof(NETSCAPE_ENCRYPTED_PKEY_seq_tt) / sizeof(ASN1_TEMPLATE),
-        .funcs = &NETSCAPE_ENCRYPTED_PKEY_aux,
-        .size = sizeof(NETSCAPE_ENCRYPTED_PKEY),
-        .sname = "NETSCAPE_ENCRYPTED_PKEY",
-};
-NETSCAPE_ENCRYPTED_PKEY *NETSCAPE_ENCRYPTED_PKEY_new(void);
-void NETSCAPE_ENCRYPTED_PKEY_free(NETSCAPE_ENCRYPTED_PKEY *a);
-NETSCAPE_ENCRYPTED_PKEY *d2i_NETSCAPE_ENCRYPTED_PKEY(NETSCAPE_ENCRYPTED_PKEY **a, const unsigned char **in, long len);
-int i2d_NETSCAPE_ENCRYPTED_PKEY(const NETSCAPE_ENCRYPTED_PKEY *a, unsigned char **out);
-NETSCAPE_ENCRYPTED_PKEY *
-d2i_NETSCAPE_ENCRYPTED_PKEY(NETSCAPE_ENCRYPTED_PKEY **a, const unsigned char **in, long len)
-{
-        return (NETSCAPE_ENCRYPTED_PKEY *)ASN1_item_d2i((ASN1_VALUE **)a, in, len,
-            &NETSCAPE_ENCRYPTED_PKEY_it);
-}
-int
-i2d_NETSCAPE_ENCRYPTED_PKEY(const NETSCAPE_ENCRYPTED_PKEY *a, unsigned char **out)
-{
-        return ASN1_item_i2d((ASN1_VALUE *)a, out, &NETSCAPE_ENCRYPTED_PKEY_it);
-}
-NETSCAPE_ENCRYPTED_PKEY *
-NETSCAPE_ENCRYPTED_PKEY_new(void)
-{
-        return (NETSCAPE_ENCRYPTED_PKEY *)ASN1_item_new(&NETSCAPE_ENCRYPTED_PKEY_it);
-}
-void
-NETSCAPE_ENCRYPTED_PKEY_free(NETSCAPE_ENCRYPTED_PKEY *a)
-{
-        ASN1_item_free((ASN1_VALUE *)a, &NETSCAPE_ENCRYPTED_PKEY_it);
-}
-static const ASN1_TEMPLATE NETSCAPE_PKEY_seq_tt[] = {
-        {
-                .offset = offsetof(NETSCAPE_PKEY, version),
-                .field_name = "version",
-                .item = &LONG_it,
-        },
-        {
-                .offset = offsetof(NETSCAPE_PKEY, algor),
-                .field_name = "algor",
-                .item = &X509_ALGOR_it,
-        },
-        {
-                .offset = offsetof(NETSCAPE_PKEY, private_key),
-                .field_name = "private_key",
-                .item = &ASN1_OCTET_STRING_it,
-        },
-};
-const ASN1_ITEM NETSCAPE_PKEY_it = {
-        .itype = ASN1_ITYPE_SEQUENCE,
-        .utype = V_ASN1_SEQUENCE,
-        .templates = NETSCAPE_PKEY_seq_tt,
-        .tcount = sizeof(NETSCAPE_PKEY_seq_tt) / sizeof(ASN1_TEMPLATE),
-        .size = sizeof(NETSCAPE_PKEY),
-        .sname = "NETSCAPE_PKEY",
-};
-NETSCAPE_PKEY *NETSCAPE_PKEY_new(void);
-void NETSCAPE_PKEY_free(NETSCAPE_PKEY *a);
-NETSCAPE_PKEY *d2i_NETSCAPE_PKEY(NETSCAPE_PKEY **a, const unsigned char **in, long len);
-int i2d_NETSCAPE_PKEY(const NETSCAPE_PKEY *a, unsigned char **out);
-NETSCAPE_PKEY *
-d2i_NETSCAPE_PKEY(NETSCAPE_PKEY **a, const unsigned char **in, long len)
-{
-        return (NETSCAPE_PKEY *)ASN1_item_d2i((ASN1_VALUE **)a, in, len,
-            &NETSCAPE_PKEY_it);
-}
-int
-i2d_NETSCAPE_PKEY(const NETSCAPE_PKEY *a, unsigned char **out)
-{
-        return ASN1_item_i2d((ASN1_VALUE *)a, out, &NETSCAPE_PKEY_it);
-}
-NETSCAPE_PKEY *
-NETSCAPE_PKEY_new(void)
-{
-        return (NETSCAPE_PKEY *)ASN1_item_new(&NETSCAPE_PKEY_it);
-}
-void
-NETSCAPE_PKEY_free(NETSCAPE_PKEY *a)
-{
-        ASN1_item_free((ASN1_VALUE *)a, &NETSCAPE_PKEY_it);
-}
-static RSA *d2i_RSA_NET_2(RSA **a, ASN1_OCTET_STRING *os,
-    int (*cb)(char *buf, int len, const char *prompt, int verify), int sgckey);
-int
-i2d_Netscape_RSA(const RSA *a, unsigned char **pp,
-    int (*cb)(char *buf, int len, const char *prompt, int verify))
-{
-        return i2d_RSA_NET(a, pp, cb, 0);
-}
-int
-i2d_RSA_NET(const RSA *a, unsigned char **pp,
-    int (*cb)(char *buf, int len, const char *prompt, int verify), int sgckey)
-{
-        int i, j, ret = 0;
-        int rsalen, pkeylen, olen;
-        NETSCAPE_PKEY *pkey = NULL;
-        NETSCAPE_ENCRYPTED_PKEY *enckey = NULL;
-        unsigned char buf[256], *zz;
-        unsigned char key[EVP_MAX_KEY_LENGTH];
-        EVP_CIPHER_CTX ctx;
-        EVP_CIPHER_CTX_init(&ctx);
-        if (a == NULL)
-                return (0);
-        if ((pkey = NETSCAPE_PKEY_new()) == NULL)
-                goto err;
-        if ((enckey = NETSCAPE_ENCRYPTED_PKEY_new()) == NULL)
-                goto err;
-        pkey->version = 0;
-        pkey->algor->algorithm = OBJ_nid2obj(NID_rsaEncryption);
-        if ((pkey->algor->parameter = ASN1_TYPE_new()) == NULL)
-                goto err;
-        pkey->algor->parameter->type = V_ASN1_NULL;
-        rsalen = i2d_RSAPrivateKey(a, NULL);
-        /* Fake some octet strings just for the initial length
-         * calculation.
-         */
-        pkey->private_key->length = rsalen;
-        pkeylen = i2d_NETSCAPE_PKEY(pkey, NULL);
-        enckey->enckey->digest->length = pkeylen;
-        enckey->os->length = 11;        /* "private-key" */
-        enckey->enckey->algor->algorithm = OBJ_nid2obj(NID_rc4);
-        if ((enckey->enckey->algor->parameter = ASN1_TYPE_new()) == NULL)
-                goto err;
-        enckey->enckey->algor->parameter->type = V_ASN1_NULL;
-        if (pp == NULL) {
-                olen = i2d_NETSCAPE_ENCRYPTED_PKEY(enckey, NULL);
-                NETSCAPE_PKEY_free(pkey);
-                NETSCAPE_ENCRYPTED_PKEY_free(enckey);
-                return olen;
-        }
-        /* Since its RC4 encrypted length is actual length */
-        if ((zz = malloc(rsalen)) == NULL) {
-                ASN1error(ERR_R_MALLOC_FAILURE);
-                goto err;
-        }
-        pkey->private_key->data = zz;
-        /* Write out private key encoding */
-        i2d_RSAPrivateKey(a, &zz);
-        if ((zz = malloc(pkeylen)) == NULL) {
-                ASN1error(ERR_R_MALLOC_FAILURE);
-                goto err;
-        }
-        enckey->enckey->digest->data = zz;
-        if (!ASN1_STRING_set(enckey->os, "private-key", -1)) {
-                ASN1error(ERR_R_MALLOC_FAILURE);
-                goto err;
-        }
-        i2d_NETSCAPE_PKEY(pkey, &zz);
-        /* Wipe the private key encoding */
-        explicit_bzero(pkey->private_key->data, rsalen);
-        if (cb == NULL)
-                cb = EVP_read_pw_string;
-        i = cb((char *)buf, sizeof(buf), "Enter Private Key password:", 1);
-        if (i != 0) {
-                ASN1error(ASN1_R_BAD_PASSWORD_READ);
-                goto err;
-        }
-        i = strlen((char *)buf);
-        /* If the key is used for SGC the algorithm is modified a little. */
-        if (sgckey) {
-                if (!EVP_Digest(buf, i, buf, NULL, EVP_md5(), NULL))
-                        goto err;
-                memcpy(buf + 16, "SGCKEYSALT", 10);
-                i = 26;
-        }
-        if (!EVP_BytesToKey(EVP_rc4(), EVP_md5(), NULL, buf, i,1, key, NULL))
-                goto err;
-        explicit_bzero(buf, sizeof(buf));
-        /* Encrypt private key in place */
-        zz = enckey->enckey->digest->data;
-        if (!EVP_EncryptInit_ex(&ctx, EVP_rc4(), NULL, key, NULL))
-                goto err;
-        if (!EVP_EncryptUpdate(&ctx, zz, &i, zz, pkeylen))
-                goto err;
-        if (!EVP_EncryptFinal_ex(&ctx, zz + i, &j))
-                goto err;
-        ret = i2d_NETSCAPE_ENCRYPTED_PKEY(enckey, pp);
- err:
-        EVP_CIPHER_CTX_cleanup(&ctx);
-        NETSCAPE_ENCRYPTED_PKEY_free(enckey);
-        NETSCAPE_PKEY_free(pkey);
-        return (ret);
-}
-RSA *
-d2i_Netscape_RSA(RSA **a, const unsigned char **pp, long length,
-    int (*cb)(char *buf, int len, const char *prompt, int verify))
-{
-        return d2i_RSA_NET(a, pp, length, cb, 0);
-}
-RSA *
-d2i_RSA_NET(RSA **a, const unsigned char **pp, long length,
-    int (*cb)(char *buf, int len, const char *prompt, int verify), int sgckey)
-{
-        RSA *ret = NULL;
-        const unsigned char *p;
-        NETSCAPE_ENCRYPTED_PKEY *enckey = NULL;
-        p = *pp;
-        enckey = d2i_NETSCAPE_ENCRYPTED_PKEY(NULL, &p, length);
-        if (!enckey) {
-                ASN1error(ASN1_R_DECODING_ERROR);
-                return NULL;
-        }
-        /* XXX 11 == strlen("private-key") */
-        if (enckey->os->length != 11 ||
-            memcmp("private-key", enckey->os->data, 11) != 0) {
-                ASN1error(ASN1_R_PRIVATE_KEY_HEADER_MISSING);
-                goto err;
-        }
-        if (OBJ_obj2nid(enckey->enckey->algor->algorithm) != NID_rc4) {
-                ASN1error(ASN1_R_UNSUPPORTED_ENCRYPTION_ALGORITHM);
-                goto err;
-        }
-        if (cb == NULL)
-                cb = EVP_read_pw_string;
-        if ((ret = d2i_RSA_NET_2(a, enckey->enckey->digest, cb,
-            sgckey)) == NULL)
-                goto err;
-        *pp = p;
- err:
-        NETSCAPE_ENCRYPTED_PKEY_free(enckey);
-        return ret;
-}
-static RSA *
-d2i_RSA_NET_2(RSA **a, ASN1_OCTET_STRING *os,
-    int (*cb)(char *buf, int len, const char *prompt, int verify), int sgckey)
-{
-        NETSCAPE_PKEY *pkey = NULL;
-        RSA *ret = NULL;
-        int i, j;
-        unsigned char buf[256];
-        const unsigned char *zz;
-        unsigned char key[EVP_MAX_KEY_LENGTH];
-        EVP_CIPHER_CTX ctx;
-        EVP_CIPHER_CTX_init(&ctx);
-        i=cb((char *)buf, sizeof(buf), "Enter Private Key password:",0);
-        if (i != 0) {
-                ASN1error(ASN1_R_BAD_PASSWORD_READ);
-                goto err;
-        }
-        i = strlen((char *)buf);
-        if (sgckey){
-                if (!EVP_Digest(buf, i, buf, NULL, EVP_md5(), NULL))
-                        goto err;
-                memcpy(buf + 16, "SGCKEYSALT", 10);
-                i = 26;
-        }
-        if (!EVP_BytesToKey(EVP_rc4(), EVP_md5(), NULL, buf, i,1, key, NULL))
-                goto err;
-        explicit_bzero(buf, sizeof(buf));
-        if (!EVP_DecryptInit_ex(&ctx, EVP_rc4(), NULL, key, NULL))
-                goto err;
-        if (!EVP_DecryptUpdate(&ctx, os->data, &i, os->data, os->length))
-                goto err;
-        if (!EVP_DecryptFinal_ex(&ctx, &(os->data[i]), &j))
-                goto err;
-        os->length = i + j;
-        zz = os->data;
-        if ((pkey = d2i_NETSCAPE_PKEY(NULL, &zz, os->length)) == NULL) {
-                ASN1error(ASN1_R_UNABLE_TO_DECODE_RSA_PRIVATE_KEY);
-                goto err;
-        }
-        zz = pkey->private_key->data;
-        if ((ret = d2i_RSAPrivateKey(a, &zz,
-            pkey->private_key->length)) == NULL) {
-                ASN1error(ASN1_R_UNABLE_TO_DECODE_RSA_KEY);
-                goto err;
-        }
- err:
-        EVP_CIPHER_CTX_cleanup(&ctx);
-        NETSCAPE_PKEY_free(pkey);
-        return (ret);
-}
-#endif /* OPENSSL_NO_RC4 */
-#endif
diff --git a/src/lib/libcrypto/asn1/x_nx509.c b/src/lib/libcrypto/asn1/x_nx509.c
deleted file mode 100644
index 7e18be8c79..0000000000
--- a/src/lib/libcrypto/asn1/x_nx509.c
+++ /dev/null
@@ -1,113 +0,0 @@
-/* $OpenBSD: x_nx509.c,v 1.6 2015/02/11 04:00:39 jsing Exp $ */
-/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
- * project 2005.
- */
-/* ====================================================================
- * Copyright (c) 2005 The OpenSSL Project.  All rights reserved.
- *
- * 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 above 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 acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED 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 OpenSSL PROJECT OR
- * ITS 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.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-#include <stddef.h>
-#include <openssl/x509.h>
-#include <openssl/asn1.h>
-#include <openssl/asn1t.h>
-/* Old netscape certificate wrapper format */
-static const ASN1_TEMPLATE NETSCAPE_X509_seq_tt[] = {
-        {
-                .offset = offsetof(NETSCAPE_X509, header),
-                .field_name = "header",
-                .item = &ASN1_OCTET_STRING_it,
-        },
-        {
-                .flags = ASN1_TFLG_OPTIONAL,
-                .offset = offsetof(NETSCAPE_X509, cert),
-                .field_name = "cert",
-                .item = &X509_it,
-        },
-};
-const ASN1_ITEM NETSCAPE_X509_it = {
-        .itype = ASN1_ITYPE_SEQUENCE,
-        .utype = V_ASN1_SEQUENCE,
-        .templates = NETSCAPE_X509_seq_tt,
-        .tcount = sizeof(NETSCAPE_X509_seq_tt) / sizeof(ASN1_TEMPLATE),
-        .size = sizeof(NETSCAPE_X509),
-        .sname = "NETSCAPE_X509",
-};
-NETSCAPE_X509 *
-d2i_NETSCAPE_X509(NETSCAPE_X509 **a, const unsigned char **in, long len)
-{
-        return (NETSCAPE_X509 *)ASN1_item_d2i((ASN1_VALUE **)a, in, len,
-            &NETSCAPE_X509_it);
-}
-int
-i2d_NETSCAPE_X509(NETSCAPE_X509 *a, unsigned char **out)
-{
-        return ASN1_item_i2d((ASN1_VALUE *)a, out, &NETSCAPE_X509_it);
-}
-NETSCAPE_X509 *
-NETSCAPE_X509_new(void)
-{
-        return (NETSCAPE_X509 *)ASN1_item_new(&NETSCAPE_X509_it);
-}
-void
-NETSCAPE_X509_free(NETSCAPE_X509 *a)
-{
-        ASN1_item_free((ASN1_VALUE *)a, &NETSCAPE_X509_it);
-}
diff --git a/src/lib/libcrypto/rsa/rsa.h b/src/lib/libcrypto/rsa/rsa.h
index daefcb85b2..e01e6ba553 100644
--- a/src/lib/libcrypto/rsa/rsa.h
+++ b/src/lib/libcrypto/rsa/rsa.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: rsa.h,v 1.53 2022/01/14 07:49:49 tb Exp $ */
+/* $OpenBSD: rsa.h,v 1.54 2022/01/14 08:12:31 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
 * All rights reserved.
 *
@@ -380,18 +380,6 @@ int RSA_print_fp(FILE *fp, const RSA *r, int offset);
 int RSA_print(BIO *bp, const RSA *r, int offset);
 #endif
-#ifndef OPENSSL_NO_RC4
-int i2d_RSA_NET(const RSA *a, unsigned char **pp,
-    int (*cb)(char *buf, int len, const char *prompt, int verify), int sgckey);
-RSA *d2i_RSA_NET(RSA **a, const unsigned char **pp, long length,
-    int (*cb)(char *buf, int len, const char *prompt, int verify), int sgckey);
-int i2d_Netscape_RSA(const RSA *a, unsigned char **pp,
-    int (*cb)(char *buf, int len, const char *prompt, int verify));
-RSA *d2i_Netscape_RSA(RSA **a, const unsigned char **pp, long length,
-    int (*cb)(char *buf, int len, const char *prompt, int verify));
-#endif
 /* The following 2 functions sign and verify a X509_SIG ASN1 object
 * inside PKCS#1 padded RSA encryption */
 int RSA_sign(int type, const unsigned char *m, unsigned int m_length,