From eb8dd9dca1228af0cd132f515509051ecfabf6f6 Mon Sep 17 00:00:00 2001 From: cvs2svn Date: Mon, 14 Apr 2025 17:32:06 +0000 Subject: This commit was manufactured by cvs2git to create tag 'tb_20250414'. --- src/usr.bin/openssl/dsa.c | 365 ---------------------------------------------- 1 file changed, 365 deletions(-) delete mode 100644 src/usr.bin/openssl/dsa.c (limited to 'src/usr.bin/openssl/dsa.c') diff --git a/src/usr.bin/openssl/dsa.c b/src/usr.bin/openssl/dsa.c deleted file mode 100644 index f1de78cf4d..0000000000 --- a/src/usr.bin/openssl/dsa.c +++ /dev/null @@ -1,365 +0,0 @@ -/* $OpenBSD: dsa.c,v 1.18 2023/03/06 14:32:06 tb 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 /* for OPENSSL_NO_DSA */ - -#include -#include -#include -#include - -#include "apps.h" - -#include -#include -#include -#include -#include -#include -#include - -static struct { - const EVP_CIPHER *enc; - char *infile; - int informat; - int modulus; - int noout; - char *outfile; - int outformat; - char *passargin; - char *passargout; - int pubin; - int pubout; - int pvk_encr; - int text; -} cfg; - -static int -dsa_opt_enc(int argc, char **argv, int *argsused) -{ - char *name = argv[0]; - - if (*name++ != '-') - return (1); - - if ((cfg.enc = EVP_get_cipherbyname(name)) != NULL) { - *argsused = 1; - return (0); - } - - return (1); -} - -static const struct option dsa_options[] = { - { - .name = "in", - .argname = "file", - .desc = "Input file (default stdin)", - .type = OPTION_ARG, - .opt.arg = &cfg.infile, - }, - { - .name = "inform", - .argname = "format", - .desc = "Input format (PEM (default) or any other supported" - " format)", - .type = OPTION_ARG_FORMAT, - .opt.value = &cfg.informat, - }, - { - .name = "modulus", - .desc = "Print the DSA public value", - .type = OPTION_FLAG, - .opt.flag = &cfg.modulus, - }, - { - .name = "noout", - .desc = "No output", - .type = OPTION_FLAG, - .opt.flag = &cfg.noout, - }, - { - .name = "out", - .argname = "file", - .desc = "Output file (default stdout)", - .type = OPTION_ARG, - .opt.arg = &cfg.outfile, - }, - { - .name = "outform", - .argname = "format", - .desc = "Output format (DER, MSBLOB, PEM (default) or PVK)", - .type = OPTION_ARG_FORMAT, - .opt.value = &cfg.outformat, - }, - { - .name = "passin", - .argname = "source", - .desc = "Input file passphrase source", - .type = OPTION_ARG, - .opt.arg = &cfg.passargin, - }, - { - .name = "passout", - .argname = "source", - .desc = "Output file passphrase source", - .type = OPTION_ARG, - .opt.arg = &cfg.passargout, - }, - { - .name = "pubin", - .desc = "Read a public key from the input file instead of" - " private key", - .type = OPTION_FLAG, - .opt.flag = &cfg.pubin, - }, - { - .name = "pubout", - .desc = "Output a public key instead of private key", - .type = OPTION_FLAG, - .opt.flag = &cfg.pubout, - }, - { - .name = "pvk-none", - .desc = "PVK encryption level", - .type = OPTION_VALUE, - .value = 0, - .opt.value = &cfg.pvk_encr, - }, - { - .name = "pvk-strong", - .desc = "PVK encryption level (default)", - .type = OPTION_VALUE, - .value = 2, - .opt.value = &cfg.pvk_encr, - }, - { - .name = "pvk-weak", - .desc = "PVK encryption level", - .type = OPTION_VALUE, - .value = 1, - .opt.value = &cfg.pvk_encr, - }, - { - .name = "text", - .desc = "Print the key in text form", - .type = OPTION_FLAG, - .opt.flag = &cfg.text, - }, - { - .name = NULL, - .type = OPTION_ARGV_FUNC, - .opt.argvfunc = dsa_opt_enc, - }, - { NULL }, -}; - -static void -dsa_usage(void) -{ - int n = 0; - - fprintf(stderr, - "usage: dsa [-in file] [-inform format] [-modulus] [-noout]\n" - " [-out file] [-outform format] [-passin src] [-passout src]\n" - " [-pubin] [-pubout] [-pvk-none | -pvk-strong | -pvk-weak]\n" - " [-text] [-ciphername]\n\n"); - options_usage(dsa_options); - fprintf(stderr, "\n"); - - fprintf(stderr, "Valid ciphername values:\n\n"); - OBJ_NAME_do_all_sorted(OBJ_NAME_TYPE_CIPHER_METH, show_cipher, &n); - fprintf(stderr, "\n"); -} - -int -dsa_main(int argc, char **argv) -{ - int ret = 1; - DSA *dsa = NULL; - int i; - BIO *in = NULL, *out = NULL; - char *passin = NULL, *passout = NULL; - - if (pledge("stdio cpath wpath rpath tty", NULL) == -1) { - perror("pledge"); - exit(1); - } - - memset(&cfg, 0, sizeof(cfg)); - - cfg.pvk_encr = 2; - cfg.informat = FORMAT_PEM; - cfg.outformat = FORMAT_PEM; - - if (options_parse(argc, argv, dsa_options, NULL, NULL) != 0) { - dsa_usage(); - goto end; - } - - if (!app_passwd(bio_err, cfg.passargin, cfg.passargout, - &passin, &passout)) { - BIO_printf(bio_err, "Error getting passwords\n"); - goto end; - } - - in = BIO_new(BIO_s_file()); - out = BIO_new(BIO_s_file()); - if (in == NULL || out == NULL) { - ERR_print_errors(bio_err); - goto end; - } - if (cfg.infile == NULL) - BIO_set_fp(in, stdin, BIO_NOCLOSE); - else { - if (BIO_read_filename(in, cfg.infile) <= 0) { - perror(cfg.infile); - goto end; - } - } - - BIO_printf(bio_err, "read DSA key\n"); - - { - EVP_PKEY *pkey; - - if (cfg.pubin) - pkey = load_pubkey(bio_err, cfg.infile, - cfg.informat, 1, passin, "Public Key"); - else - pkey = load_key(bio_err, cfg.infile, - cfg.informat, 1, passin, "Private Key"); - - if (pkey) { - dsa = EVP_PKEY_get1_DSA(pkey); - EVP_PKEY_free(pkey); - } - } - if (dsa == NULL) { - BIO_printf(bio_err, "unable to load Key\n"); - ERR_print_errors(bio_err); - goto end; - } - if (cfg.outfile == NULL) { - BIO_set_fp(out, stdout, BIO_NOCLOSE); - } else { - if (BIO_write_filename(out, cfg.outfile) <= 0) { - perror(cfg.outfile); - goto end; - } - } - - if (cfg.text) { - if (!DSA_print(out, dsa, 0)) { - perror(cfg.outfile); - ERR_print_errors(bio_err); - goto end; - } - } - if (cfg.modulus) { - fprintf(stdout, "Public Key="); - BN_print(out, DSA_get0_pub_key(dsa)); - fprintf(stdout, "\n"); - } - if (cfg.noout) - goto end; - BIO_printf(bio_err, "writing DSA key\n"); - if (cfg.outformat == FORMAT_ASN1) { - if (cfg.pubin || cfg.pubout) - i = i2d_DSA_PUBKEY_bio(out, dsa); - else - i = i2d_DSAPrivateKey_bio(out, dsa); - } else if (cfg.outformat == FORMAT_PEM) { - if (cfg.pubin || cfg.pubout) - i = PEM_write_bio_DSA_PUBKEY(out, dsa); - else - i = PEM_write_bio_DSAPrivateKey(out, dsa, cfg.enc, - NULL, 0, NULL, passout); -#if !defined(OPENSSL_NO_RSA) && !defined(OPENSSL_NO_RC4) - } else if (cfg.outformat == FORMAT_MSBLOB || - cfg.outformat == FORMAT_PVK) { - EVP_PKEY *pk; - pk = EVP_PKEY_new(); - EVP_PKEY_set1_DSA(pk, dsa); - if (cfg.outformat == FORMAT_PVK) - i = i2b_PVK_bio(out, pk, cfg.pvk_encr, 0, - passout); - else if (cfg.pubin || cfg.pubout) - i = i2b_PublicKey_bio(out, pk); - else - i = i2b_PrivateKey_bio(out, pk); - EVP_PKEY_free(pk); -#endif - } else { - BIO_printf(bio_err, "bad output format specified for outfile\n"); - goto end; - } - if (i <= 0) { - BIO_printf(bio_err, "unable to write private key\n"); - ERR_print_errors(bio_err); - } else - ret = 0; - end: - BIO_free(in); - BIO_free_all(out); - DSA_free(dsa); - free(passin); - free(passout); - - return (ret); -} -- cgit v1.2.3-55-g6feb