mirror of
https://github.com/openssl/openssl.git
synced 2024-12-27 06:21:43 +08:00
30b2c3592e
The -provider and -propquery options did not work on dsaparam and gendsa. Fix this and add tests that check that operations that are not supported by the FIPS provider work when run with | -provider default -propquery '?fips!=yes' See also https://bugzilla.redhat.com/show_bug.cgi?id=2094956, where this was initially reported. Signed-off-by: Clemens Lang <cllang@redhat.com> Reviewed-by: Hugo Landau <hlandau@openssl.org> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/18576)
171 lines
4.8 KiB
C
171 lines
4.8 KiB
C
/*
|
|
* Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved.
|
|
*
|
|
* Licensed under the Apache License 2.0 (the "License"). You may not use
|
|
* this file except in compliance with the License. You can obtain a copy
|
|
* in the file LICENSE in the source distribution or at
|
|
* https://www.openssl.org/source/license.html
|
|
*/
|
|
|
|
#include <openssl/opensslconf.h>
|
|
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
#include <sys/types.h>
|
|
#include <sys/stat.h>
|
|
#include "apps.h"
|
|
#include "progs.h"
|
|
#include <openssl/bio.h>
|
|
#include <openssl/err.h>
|
|
#include <openssl/bn.h>
|
|
#include <openssl/dsa.h>
|
|
#include <openssl/x509.h>
|
|
#include <openssl/pem.h>
|
|
|
|
typedef enum OPTION_choice {
|
|
OPT_COMMON,
|
|
OPT_OUT, OPT_PASSOUT, OPT_ENGINE, OPT_CIPHER, OPT_VERBOSE, OPT_QUIET,
|
|
OPT_R_ENUM, OPT_PROV_ENUM
|
|
} OPTION_CHOICE;
|
|
|
|
const OPTIONS gendsa_options[] = {
|
|
{OPT_HELP_STR, 1, '-', "Usage: %s [options] dsaparam-file\n"},
|
|
|
|
OPT_SECTION("General"),
|
|
{"help", OPT_HELP, '-', "Display this summary"},
|
|
#ifndef OPENSSL_NO_ENGINE
|
|
{"engine", OPT_ENGINE, 's', "Use engine, possibly a hardware device"},
|
|
#endif
|
|
|
|
OPT_SECTION("Output"),
|
|
{"out", OPT_OUT, '>', "Output the key to the specified file"},
|
|
{"passout", OPT_PASSOUT, 's', "Output file pass phrase source"},
|
|
OPT_R_OPTIONS,
|
|
OPT_PROV_OPTIONS,
|
|
{"", OPT_CIPHER, '-', "Encrypt the output with any supported cipher"},
|
|
{"verbose", OPT_VERBOSE, '-', "Verbose output"},
|
|
{"quiet", OPT_QUIET, '-', "Terse output"},
|
|
|
|
OPT_PARAMETERS(),
|
|
{"dsaparam-file", 0, 0, "File containing DSA parameters"},
|
|
{NULL}
|
|
};
|
|
|
|
int gendsa_main(int argc, char **argv)
|
|
{
|
|
ENGINE *e = NULL;
|
|
BIO *out = NULL, *in = NULL;
|
|
EVP_PKEY *pkey = NULL;
|
|
EVP_PKEY_CTX *ctx = NULL;
|
|
EVP_CIPHER *enc = NULL;
|
|
char *dsaparams = NULL, *ciphername = NULL;
|
|
char *outfile = NULL, *passoutarg = NULL, *passout = NULL, *prog;
|
|
OPTION_CHOICE o;
|
|
int ret = 1, private = 0, verbose = 0, nbits;
|
|
|
|
opt_set_unknown_name("cipher");
|
|
prog = opt_init(argc, argv, gendsa_options);
|
|
while ((o = opt_next()) != OPT_EOF) {
|
|
switch (o) {
|
|
case OPT_EOF:
|
|
case OPT_ERR:
|
|
opthelp:
|
|
BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
|
|
goto end;
|
|
case OPT_HELP:
|
|
ret = 0;
|
|
opt_help(gendsa_options);
|
|
goto end;
|
|
case OPT_OUT:
|
|
outfile = opt_arg();
|
|
break;
|
|
case OPT_PASSOUT:
|
|
passoutarg = opt_arg();
|
|
break;
|
|
case OPT_ENGINE:
|
|
e = setup_engine(opt_arg(), 0);
|
|
break;
|
|
case OPT_R_CASES:
|
|
if (!opt_rand(o))
|
|
goto end;
|
|
break;
|
|
case OPT_PROV_CASES:
|
|
if (!opt_provider(o))
|
|
goto end;
|
|
break;
|
|
case OPT_CIPHER:
|
|
ciphername = opt_unknown();
|
|
break;
|
|
case OPT_VERBOSE:
|
|
verbose = 1;
|
|
break;
|
|
case OPT_QUIET:
|
|
verbose = 0;
|
|
break;
|
|
}
|
|
}
|
|
|
|
/* One argument, the params file. */
|
|
if (!opt_check_rest_arg("params file"))
|
|
goto opthelp;
|
|
argv = opt_rest();
|
|
dsaparams = argv[0];
|
|
|
|
if (!app_RAND_load())
|
|
goto end;
|
|
|
|
if (!opt_cipher(ciphername, &enc))
|
|
goto end;
|
|
private = 1;
|
|
|
|
if (!app_passwd(NULL, passoutarg, NULL, &passout)) {
|
|
BIO_printf(bio_err, "Error getting password\n");
|
|
goto end;
|
|
}
|
|
|
|
pkey = load_keyparams(dsaparams, FORMAT_UNDEF, 1, "DSA", "DSA parameters");
|
|
|
|
out = bio_open_owner(outfile, FORMAT_PEM, private);
|
|
if (out == NULL)
|
|
goto end2;
|
|
|
|
nbits = EVP_PKEY_get_bits(pkey);
|
|
if (nbits > OPENSSL_DSA_MAX_MODULUS_BITS)
|
|
BIO_printf(bio_err,
|
|
"Warning: It is not recommended to use more than %d bit for DSA keys.\n"
|
|
" Your key size is %d! Larger key size may behave not as expected.\n",
|
|
OPENSSL_DSA_MAX_MODULUS_BITS, EVP_PKEY_get_bits(pkey));
|
|
|
|
ctx = EVP_PKEY_CTX_new_from_pkey(app_get0_libctx(), pkey, app_get0_propq());
|
|
if (ctx == NULL) {
|
|
BIO_printf(bio_err, "unable to create PKEY context\n");
|
|
goto end;
|
|
}
|
|
EVP_PKEY_free(pkey);
|
|
pkey = NULL;
|
|
if (EVP_PKEY_keygen_init(ctx) <= 0) {
|
|
BIO_printf(bio_err, "unable to set up for key generation\n");
|
|
goto end;
|
|
}
|
|
pkey = app_keygen(ctx, "DSA", nbits, verbose);
|
|
|
|
assert(private);
|
|
if (!PEM_write_bio_PrivateKey(out, pkey, enc, NULL, 0, NULL, passout)) {
|
|
BIO_printf(bio_err, "unable to output generated key\n");
|
|
goto end;
|
|
}
|
|
ret = 0;
|
|
end:
|
|
if (ret != 0)
|
|
ERR_print_errors(bio_err);
|
|
end2:
|
|
BIO_free(in);
|
|
BIO_free_all(out);
|
|
EVP_PKEY_free(pkey);
|
|
EVP_PKEY_CTX_free(ctx);
|
|
EVP_CIPHER_free(enc);
|
|
release_engine(e);
|
|
OPENSSL_free(passout);
|
|
return ret;
|
|
}
|