4 files changed, 4 insertions, 317 deletions

diff --git a/src/usr.bin/openssl/Makefile b/src/usr.bin/openssl/Makefile
index ac42361932..e35b788500 100644
--- a/src/usr.bin/openssl/Makefile
+++ b/src/usr.bin/openssl/Makefile
@@ -1,4 +1,4 @@
-#       $OpenBSD: Makefile,v 1.13 2024/05/27 16:11:43 tb Exp $
+#       $OpenBSD: Makefile,v 1.14 2024/07/08 05:59:10 tb Exp $
 
 .include <bsd.own.mk>
 
@@ -25,7 +25,7 @@ SRCS=	apps.c apps_posix.c asn1pars.c ca.c certhash.c ciphers.c cms.c crl.c \
         errstr.c gendh.c gendsa.c genpkey.c genrsa.c ocsp.c \
         openssl.c passwd.c pkcs12.c pkcs7.c pkcs8.c pkey.c pkeyparam.c \
         pkeyutl.c prime.c rand.c req.c rsa.c rsautl.c s_cb.c s_client.c \
-        s_server.c s_socket.c s_time.c sess_id.c smime.c speed.c spkac.c ts.c \
+        s_server.c s_socket.c s_time.c sess_id.c smime.c speed.c ts.c \
         verify.c version.c x509.c
 
 .include <bsd.prog.mk>
diff --git a/src/usr.bin/openssl/openssl.c b/src/usr.bin/openssl/openssl.c
index 7a42b70f2b..adafb0bc71 100644
--- a/src/usr.bin/openssl/openssl.c
+++ b/src/usr.bin/openssl/openssl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: openssl.c,v 1.36 2024/02/03 15:58:34 beck Exp $ */
+/* $OpenBSD: openssl.c,v 1.37 2024/07/08 05:59:10 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -184,7 +184,6 @@ FUNCTION functions[] = {
 #ifndef OPENSSL_NO_SPEED
         { FUNC_TYPE_GENERAL, "speed", speed_main },
 #endif
-        { FUNC_TYPE_GENERAL, "spkac", spkac_main },
         { FUNC_TYPE_GENERAL, "ts", ts_main },
         { FUNC_TYPE_GENERAL, "verify", verify_main },
         { FUNC_TYPE_GENERAL, "version", version_main },
diff --git a/src/usr.bin/openssl/progs.h b/src/usr.bin/openssl/progs.h
index 2696f20145..6cbc9d7b5f 100644
--- a/src/usr.bin/openssl/progs.h
+++ b/src/usr.bin/openssl/progs.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: progs.h,v 1.10 2024/05/18 08:47:13 jsg Exp $ */
+/* $OpenBSD: progs.h,v 1.11 2024/07/08 05:59:10 tb Exp $ */
 /* Public domain */
 
 int asn1parse_main(int argc, char **argv);
@@ -40,7 +40,6 @@ int s_time_main(int argc, char **argv);
 int sess_id_main(int argc, char **argv);
 int smime_main(int argc, char **argv);
 int speed_main(int argc, char **argv);
-int spkac_main(int argc, char **argv);
 int ts_main(int argc, char **argv);
 int verify_main(int argc, char **argv);
 int version_main(int argc, char **argv);
diff --git a/src/usr.bin/openssl/spkac.c b/src/usr.bin/openssl/spkac.c
deleted file mode 100644
index 12d530e3cf..0000000000
--- a/src/usr.bin/openssl/spkac.c
+++ /dev/null
@@ -1,311 +0,0 @@
-/* $OpenBSD: spkac.c,v 1.13 2023/03/06 14:32:06 tb Exp $ */
-/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
- * project 1999. Based on an original idea by Massimiliano Pala
- * (madwolf@openca.org).
- */
-/* ====================================================================
- * Copyright (c) 1999 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 <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-
-#include "apps.h"
-#include "progs.h"
-
-#include <openssl/bio.h>
-#include <openssl/conf.h>
-#include <openssl/err.h>
-#include <openssl/evp.h>
-#include <openssl/lhash.h>
-#include <openssl/pem.h>
-#include <openssl/x509.h>
-
-static struct {
-        char *challenge;
-        char *infile;
-        char *keyfile;
-        int noout;
-        char *outfile;
-        char *passargin;
-        int pubkey;
-        char *spkac;
-        char *spksect;
-        int verify;
-} cfg;
-
-static const struct option spkac_options[] = {
-        {
-                .name = "challenge",
-                .argname = "string",
-                .desc = "Specify challenge string if SPKAC is generated",
-                .type = OPTION_ARG,
-                .opt.arg = &cfg.challenge,
-        },
-        {
-                .name = "in",
-                .argname = "file",
-                .desc = "Input file (default stdin)",
-                .type = OPTION_ARG,
-                .opt.arg = &cfg.infile,
-        },
-        {
-                .name = "key",
-                .argname = "file",
-                .desc = "Create SPKAC using private key file",
-                .type = OPTION_ARG,
-                .opt.arg = &cfg.keyfile,
-        },
-        {
-                .name = "noout",
-                .desc = "Do not print text version of SPKAC",
-                .type = OPTION_FLAG,
-                .opt.flag = &cfg.noout,
-        },
-        {
-                .name = "out",
-                .argname = "file",
-                .desc = "Output file (default stdout)",
-                .type = OPTION_ARG,
-                .opt.arg = &cfg.outfile,
-        },
-        {
-                .name = "passin",
-                .argname = "src",
-                .desc = "Input file passphrase source",
-                .type = OPTION_ARG,
-                .opt.arg = &cfg.passargin,
-        },
-        {
-                .name = "pubkey",
-                .desc = "Output public key of an SPKAC (not used if creating)",
-                .type = OPTION_FLAG,
-                .opt.flag = &cfg.pubkey,
-        },
-        {
-                .name = "spkac",
-                .argname = "name",
-                .desc = "SPKAC name (default \"SPKAC\")",
-                .type = OPTION_ARG,
-                .opt.arg = &cfg.spkac,
-        },
-        {
-                .name = "spksect",
-                .argname = "name",
-                .desc = "Name of the section containing SPKAC (default"
-                " \"default\")",
-                .type = OPTION_ARG,
-                .opt.arg = &cfg.spksect,
-        },
-        {
-                .name = "verify",
-                .desc = "Verify digital signature on supplied SPKAC",
-                .type = OPTION_FLAG,
-                .opt.flag = &cfg.verify,
-        },
-        { NULL }
-};
-
-static void
-spkac_usage(void)
-{
-        fprintf(stderr,
-            "usage: spkac [-challenge string] [-in file] "
-            "[-key file] [-noout]\n"
-            "    [-out file] [-passin src] [-pubkey] [-spkac name] "
-            "[-spksect section]\n"
-            "    [-verify]\n\n");
-        options_usage(spkac_options);
-}
-
-int
-spkac_main(int argc, char **argv)
-{
-        int i, ret = 1;
-        BIO *in = NULL, *out = NULL;
-        char *passin = NULL;
-        char *spkstr = NULL;
-        CONF *conf = NULL;
-        NETSCAPE_SPKI *spki = NULL;
-        EVP_PKEY *pkey = NULL;
-
-        if (pledge("stdio cpath wpath rpath tty", NULL) == -1) {
-                perror("pledge");
-                exit(1);
-        }
-
-        memset(&cfg, 0, sizeof(cfg));
-        cfg.spkac = "SPKAC";
-        cfg.spksect = "default";
-
-        if (options_parse(argc, argv, spkac_options, NULL, NULL) != 0) {
-                spkac_usage();
-                return (1);
-        }
-
-        if (!app_passwd(bio_err, cfg.passargin, NULL, &passin, NULL)) {
-                BIO_printf(bio_err, "Error getting password\n");
-                goto end;
-        }
-
-        if (cfg.keyfile) {
-                pkey = load_key(bio_err,
-                    strcmp(cfg.keyfile, "-") ? cfg.keyfile
-                    : NULL, FORMAT_PEM, 1, passin, "private key");
-                if (!pkey) {
-                        goto end;
-                }
-                spki = NETSCAPE_SPKI_new();
-                if (cfg.challenge)
-                        ASN1_STRING_set(spki->spkac->challenge,
-                            cfg.challenge,
-                            (int) strlen(cfg.challenge));
-                NETSCAPE_SPKI_set_pubkey(spki, pkey);
-                NETSCAPE_SPKI_sign(spki, pkey, EVP_md5());
-                spkstr = NETSCAPE_SPKI_b64_encode(spki);
-                if (spkstr == NULL) {
-                        BIO_printf(bio_err, "Error encoding SPKAC\n");
-                        ERR_print_errors(bio_err);
-                        goto end;
-                }
-
-                if (cfg.outfile)
-                        out = BIO_new_file(cfg.outfile, "w");
-                else
-                        out = BIO_new_fp(stdout, BIO_NOCLOSE);
-
-                if (!out) {
-                        BIO_printf(bio_err, "Error opening output file\n");
-                        ERR_print_errors(bio_err);
-                } else {
-                        BIO_printf(out, "SPKAC=%s\n", spkstr);
-                        ret = 0;
-                }
-                free(spkstr);
-                goto end;
-        }
-        if (cfg.infile)
-                in = BIO_new_file(cfg.infile, "r");
-        else
-                in = BIO_new_fp(stdin, BIO_NOCLOSE);
-
-        if (!in) {
-                BIO_printf(bio_err, "Error opening input file\n");
-                ERR_print_errors(bio_err);
-                goto end;
-        }
-        conf = NCONF_new(NULL);
-        i = NCONF_load_bio(conf, in, NULL);
-
-        if (!i) {
-                BIO_printf(bio_err, "Error parsing config file\n");
-                ERR_print_errors(bio_err);
-                goto end;
-        }
-        spkstr = NCONF_get_string(conf, cfg.spksect,
-            cfg.spkac);
-
-        if (!spkstr) {
-                BIO_printf(bio_err, "Can't find SPKAC called \"%s\"\n",
-                    cfg.spkac);
-                ERR_print_errors(bio_err);
-                goto end;
-        }
-        spki = NETSCAPE_SPKI_b64_decode(spkstr, -1);
-
-        if (!spki) {
-                BIO_printf(bio_err, "Error loading SPKAC\n");
-                ERR_print_errors(bio_err);
-                goto end;
-        }
-        if (cfg.outfile)
-                out = BIO_new_file(cfg.outfile, "w");
-        else {
-                out = BIO_new_fp(stdout, BIO_NOCLOSE);
-        }
-
-        if (!out) {
-                BIO_printf(bio_err, "Error opening output file\n");
-                ERR_print_errors(bio_err);
-                goto end;
-        }
-        if (!cfg.noout)
-                NETSCAPE_SPKI_print(out, spki);
-        pkey = NETSCAPE_SPKI_get_pubkey(spki);
-        if (cfg.verify) {
-                i = NETSCAPE_SPKI_verify(spki, pkey);
-                if (i > 0)
-                        BIO_printf(bio_err, "Signature OK\n");
-                else {
-                        BIO_printf(bio_err, "Signature Failure\n");
-                        ERR_print_errors(bio_err);
-                        goto end;
-                }
-        }
-        if (cfg.pubkey)
-                PEM_write_bio_PUBKEY(out, pkey);
-
-        ret = 0;
-
- end:
-        NCONF_free(conf);
-        NETSCAPE_SPKI_free(spki);
-        BIO_free(in);
-        BIO_free_all(out);
-        EVP_PKEY_free(pkey);
-        free(passin);
-
-        return (ret);
-}