#include <ctype.h>
#include "apps.h"
#include "progs.h"
+#include <openssl/core_names.h>
#include <openssl/bio.h>
#include <openssl/evp.h>
#include <openssl/conf.h>
static int join(char buf[], size_t buf_size, const char *name,
const char *tail, const char *desc);
static EVP_PKEY_CTX *set_keygen_ctx(const char *gstr,
- int *pkey_type, long *pkeylen,
- char **palgnam, ENGINE *keygen_engine);
+ char **pkeytype, long *pkeylen,
+ ENGINE *keygen_engine);
static const char *section = "req";
static CONF *req_conf = NULL;
static int batch = 0;
typedef enum OPTION_choice {
- OPT_ERR = -1, OPT_EOF = 0, OPT_HELP,
+ OPT_COMMON,
OPT_INFORM, OPT_OUTFORM, OPT_ENGINE, OPT_KEYGEN_ENGINE, OPT_KEY,
OPT_PUBKEY, OPT_NEW, OPT_CONFIG, OPT_KEYFORM, OPT_IN, OPT_OUT,
OPT_KEYOUT, OPT_PASSIN, OPT_PASSOUT, OPT_NEWKEY,
X509 *new_x509 = NULL, *CAcert = NULL;
X509_REQ *req = NULL;
EVP_CIPHER *cipher = NULL;
- EVP_MD *md_alg = NULL, *digest = NULL;
int ext_copy = EXT_COPY_UNSET;
BIO *addext_bio = NULL;
char *extensions = NULL;
const char *infile = NULL, *CAfile = NULL, *CAkeyfile = NULL;
- char *outfile = NULL, *keyfile = NULL, *digestname = NULL;
+ char *outfile = NULL, *keyfile = NULL, *digest = NULL;
char *keyalgstr = NULL, *p, *prog, *passargin = NULL, *passargout = NULL;
char *passin = NULL, *passout = NULL;
char *nofree_passin = NULL, *nofree_passout = NULL;
OPTION_CHOICE o;
int days = UNSET_DAYS;
int ret = 1, gen_x509 = 0, i = 0, newreq = 0, verbose = 0;
- int pkey_type = -1;
- int informat = FORMAT_PEM, outformat = FORMAT_PEM, keyform = FORMAT_PEM;
+ int informat = FORMAT_UNDEF, outformat = FORMAT_PEM, keyform = FORMAT_UNDEF;
int modulus = 0, multirdn = 1, verify = 0, noout = 0, text = 0;
int noenc = 0, newhdr = 0, subject = 0, pubkey = 0, precert = 0;
long newkey_len = -1;
newreq = precert = 1;
break;
case OPT_MD:
- digestname = opt_unknown();
+ digest = opt_unknown();
break;
}
}
if (!app_RAND_load())
goto end;
- if (digestname != NULL) {
- if (!opt_md(digestname, &md_alg))
- goto opthelp;
- digest = md_alg;
- }
-
if (!gen_x509) {
if (days != UNSET_DAYS)
BIO_printf(bio_err, "Ignoring -days without -x509; not generating a certificate\n");
if (!add_oid_section(req_conf))
goto end;
- if (md_alg == NULL) {
+ if (digest == NULL) {
p = NCONF_get_string(req_conf, section, "default_md");
- if (p == NULL) {
+ if (p == NULL)
ERR_clear_error();
- } else {
- if (!opt_md(p, &md_alg))
- goto opthelp;
- digest = md_alg;
- }
+ else
+ digest = p;
}
if (extensions == NULL) {
newkey_len = DEFAULT_KEY_LENGTH;
}
- if (keyalg != NULL) {
- genctx = set_keygen_ctx(keyalg, &pkey_type, &newkey_len,
- &keyalgstr, gen_eng);
- if (genctx == NULL)
- goto end;
- }
+ genctx = set_keygen_ctx(keyalg, &keyalgstr, &newkey_len, gen_eng);
+ if (genctx == NULL)
+ goto end;
if (newkey_len < MIN_KEY_LENGTH
- && (pkey_type == EVP_PKEY_RSA || pkey_type == EVP_PKEY_DSA)) {
+ && (EVP_PKEY_CTX_is_a(genctx, "RSA")
+ || EVP_PKEY_CTX_is_a(genctx, "RSA-PSS")
+ || EVP_PKEY_CTX_is_a(genctx, "DSA"))) {
BIO_printf(bio_err, "Private key length is too short,\n");
BIO_printf(bio_err, "it needs to be at least %d bits, not %ld.\n",
MIN_KEY_LENGTH, newkey_len);
goto end;
}
- if (pkey_type == EVP_PKEY_RSA
- && newkey_len > OPENSSL_RSA_MAX_MODULUS_BITS)
+ if (newkey_len > OPENSSL_RSA_MAX_MODULUS_BITS
+ && (EVP_PKEY_CTX_is_a(genctx, "RSA")
+ || EVP_PKEY_CTX_is_a(genctx, "RSA-PSS")))
BIO_printf(bio_err,
"Warning: It is not recommended to use more than %d bit for RSA keys.\n"
" Your key size is %ld! Larger key size may behave not as expected.\n",
OPENSSL_RSA_MAX_MODULUS_BITS, newkey_len);
#ifndef OPENSSL_NO_DSA
- if (pkey_type == EVP_PKEY_DSA
+ if (EVP_PKEY_CTX_is_a(genctx, "DSA")
&& newkey_len > OPENSSL_DSA_MAX_MODULUS_BITS)
BIO_printf(bio_err,
"Warning: It is not recommended to use more than %d bit for DSA keys.\n"
OPENSSL_DSA_MAX_MODULUS_BITS, newkey_len);
#endif
- if (genctx == NULL) {
- genctx = set_keygen_ctx(NULL, &pkey_type, &newkey_len,
- &keyalgstr, gen_eng);
- if (genctx == NULL)
- goto end;
- }
-
if (pkeyopts != NULL) {
char *genopt;
for (i = 0; i < sk_OPENSSL_STRING_num(pkeyopts); i++) {
}
}
- if (pkey_type == EVP_PKEY_EC) {
- BIO_printf(bio_err, "Generating an EC private key\n");
- } else {
- BIO_printf(bio_err, "Generating a %s private key\n", keyalgstr);
- }
+ BIO_printf(bio_err, "Generating a %s private key\n", keyalgstr);
EVP_PKEY_CTX_set_cb(genctx, genpkey_cb);
EVP_PKEY_CTX_set_app_data(genctx, bio_err);
BIO_printf(bio_err,
"Ignoring -CAkey option since no -CA option is given\n");
} else {
- if ((CAkey = load_key(CAkeyfile, FORMAT_PEM,
+ if ((CAkey = load_key(CAkeyfile, FORMAT_UNDEF,
0, passin, e, "issuer private key")) == NULL)
goto end;
}
"Need to give the -CAkey option if using -CA\n");
goto end;
}
- if ((CAcert = load_cert_pass(CAfile, 1, passin,
+ if ((CAcert = load_cert_pass(CAfile, FORMAT_UNDEF, 1, passin,
"issuer certificate")) == NULL)
goto end;
if (!X509_check_private_key(CAcert, CAkey)) {
BIO_free(addext_bio);
BIO_free_all(out);
EVP_PKEY_free(pkey);
- EVP_MD_free(md_alg);
- EVP_MD_free(digest);
EVP_PKEY_CTX_free(genctx);
sk_OPENSSL_STRING_free(pkeyopts);
sk_OPENSSL_STRING_free(sigopts);
}
}
- if (!X509_REQ_set_version(req, 0L)) /* so far there is only version 1 */
+ /* so far there is only version 1 */
+ if (!X509_REQ_set_version(req, X509_REQ_VERSION_1))
goto err;
if (fsubj != NULL)
}
static EVP_PKEY_CTX *set_keygen_ctx(const char *gstr,
- int *pkey_type, long *pkeylen,
- char **palgnam, ENGINE *keygen_engine)
+ char **pkeytype, long *pkeylen,
+ ENGINE *keygen_engine)
{
EVP_PKEY_CTX *gctx = NULL;
EVP_PKEY *param = NULL;
long keylen = -1;
BIO *pbio = NULL;
+ const char *keytype = NULL;
+ size_t keytypelen = 0;
+ int expect_paramfile = 0;
const char *paramfile = NULL;
+ /* Treat the first part of gstr, and only that */
if (gstr == NULL) {
- *pkey_type = EVP_PKEY_RSA;
+ /*
+ * Special case: when no string given, default to RSA and the
+ * key length given by |*pkeylen|.
+ */
+ keytype = "RSA";
keylen = *pkeylen;
} else if (gstr[0] >= '0' && gstr[0] <= '9') {
- *pkey_type = EVP_PKEY_RSA;
- keylen = atol(gstr);
- *pkeylen = keylen;
- } else if (strncmp(gstr, "param:", 6) == 0) {
- paramfile = gstr + 6;
+ /* Special case: only keylength given from string, so default to RSA */
+ keytype = "RSA";
+ /* The second part treatment will do the rest */
} else {
const char *p = strchr(gstr, ':');
int len;
- ENGINE *tmpeng;
- const EVP_PKEY_ASN1_METHOD *ameth;
if (p != NULL)
len = p - gstr;
else
len = strlen(gstr);
- /*
- * The lookup of a the string will cover all engines so keep a note
- * of the implementation.
- */
-
- ameth = EVP_PKEY_asn1_find_str(&tmpeng, gstr, len);
- if (ameth == NULL) {
- BIO_printf(bio_err, "Unknown algorithm %.*s\n", len, gstr);
- return NULL;
+ if (strncmp(gstr, "param", len) == 0) {
+ expect_paramfile = 1;
+ } else {
+ keytype = gstr;
+ keytypelen = len;
}
- EVP_PKEY_asn1_get0_info(NULL, pkey_type, NULL, NULL, NULL, ameth);
-#ifndef OPENSSL_NO_ENGINE
- finish_engine(tmpeng);
-#endif
- if (*pkey_type == EVP_PKEY_RSA) {
- if (p != NULL) {
- keylen = atol(p + 1);
- *pkeylen = keylen;
- } else {
- keylen = *pkeylen;
- }
- } else if (p != NULL) {
- paramfile = p + 1;
- }
+ if (p != NULL)
+ gstr = gstr + len + 1;
+ else
+ gstr = NULL;
+ }
+
+ /* Treat the second part of gstr, if there is one */
+ if (gstr != NULL) {
+ /* If the second part starts with a digit, we assume it's a size */
+ if (!expect_paramfile && gstr[0] >= '0' && gstr[0] <= '9')
+ keylen = atol(gstr);
+ else
+ paramfile = gstr;
}
if (paramfile != NULL) {
BIO_printf(bio_err, "Error reading parameter file %s\n", paramfile);
return NULL;
}
- if (*pkey_type == -1) {
- *pkey_type = EVP_PKEY_id(param);
- } else if (*pkey_type != EVP_PKEY_base_id(param)) {
- BIO_printf(bio_err, "Key type does not match parameters\n");
- EVP_PKEY_free(param);
- return NULL;
+ if (keytype == NULL) {
+ keytype = EVP_PKEY_get0_type_name(param);
}
}
- if (palgnam != NULL) {
- const EVP_PKEY_ASN1_METHOD *ameth;
- ENGINE *tmpeng;
- const char *anam;
+ if (keytypelen > 0)
+ *pkeytype = OPENSSL_strndup(keytype, keytypelen);
+ else
+ *pkeytype = OPENSSL_strdup(keytype);
+ *pkeylen = keylen;
- ameth = EVP_PKEY_asn1_find(&tmpeng, *pkey_type);
- if (ameth == NULL) {
- BIO_puts(bio_err, "Internal error: can't find key algorithm\n");
+ if (param != NULL) {
+ if (!EVP_PKEY_is_a(param, *pkeytype)) {
+ BIO_printf(bio_err, "Key type does not match parameters\n");
+ EVP_PKEY_free(param);
return NULL;
}
- EVP_PKEY_asn1_get0_info(NULL, NULL, NULL, NULL, &anam, ameth);
- *palgnam = OPENSSL_strdup(anam);
-#ifndef OPENSSL_NO_ENGINE
- finish_engine(tmpeng);
-#endif
- }
- if (param != NULL) {
- gctx = EVP_PKEY_CTX_new(param, keygen_engine);
+ if (keygen_engine != NULL)
+ gctx = EVP_PKEY_CTX_new(param, keygen_engine);
+ else
+ gctx = EVP_PKEY_CTX_new_from_pkey(app_get0_libctx(),
+ param, app_get0_propq());
*pkeylen = EVP_PKEY_bits(param);
EVP_PKEY_free(param);
} else {
- gctx = EVP_PKEY_CTX_new_id(*pkey_type, keygen_engine);
+ if (keygen_engine != NULL) {
+ int pkey_id = get_legacy_pkey_id(app_get0_libctx(), keytype,
+ keygen_engine);
+
+ if (pkey_id != NID_undef)
+ gctx = EVP_PKEY_CTX_new_id(pkey_id, keygen_engine);
+ } else {
+ gctx = EVP_PKEY_CTX_new_from_name(app_get0_libctx(),
+ keytype, app_get0_propq());
+ }
}
if (gctx == NULL) {
EVP_PKEY_CTX_free(gctx);
return NULL;
}
- if ((*pkey_type == EVP_PKEY_RSA) && (keylen != -1)) {
- if (EVP_PKEY_CTX_set_rsa_keygen_bits(gctx, keylen) <= 0) {
- BIO_puts(bio_err, "Error setting RSA keysize\n");
+ if (keylen != -1) {
+ OSSL_PARAM params[] = { OSSL_PARAM_END, OSSL_PARAM_END };
+ size_t bits = keylen;
+
+ params[0] =
+ OSSL_PARAM_construct_size_t(OSSL_PKEY_PARAM_BITS, &bits);
+ if (EVP_PKEY_CTX_set_params(gctx, params) <= 0) {
+ BIO_puts(bio_err, "Error setting keysize\n");
EVP_PKEY_CTX_free(gctx);
return NULL;
}