summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPauli <pauli@openssl.org>2021-05-31 09:26:05 +1000
committerPauli <pauli@openssl.org>2021-06-01 18:46:44 +1000
commit8ee66a092c07e618191ef49c8912f8235b08bb95 (patch)
treeab8e77cc16286610b2836a704d7d9db905c08f8f
parent28cab20916731c188180628330de27f6ce5f684e (diff)
req: fix Coverity 1485137 Explicit null dereference
Add a check for a non-existent file name when specifying params via file. Add a check for a failure to determine key type. Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/15534)
-rw-r--r--apps/req.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/apps/req.c b/apps/req.c
index a9769b7452..3b0545fd6e 100644
--- a/apps/req.c
+++ b/apps/req.c
@@ -1522,6 +1522,12 @@ static EVP_PKEY_CTX *set_keygen_ctx(const char *gstr,
if (strncmp(gstr, "param", len) == 0) {
expect_paramfile = 1;
+ if (p == NULL) {
+ BIO_printf(bio_err,
+ "Parameter file requested but no path given: %s\n",
+ gstr);
+ return NULL;
+ }
} else {
keytype = gstr;
keytypelen = len;
@@ -1569,6 +1575,11 @@ static EVP_PKEY_CTX *set_keygen_ctx(const char *gstr,
}
if (keytype == NULL) {
keytype = EVP_PKEY_get0_type_name(param);
+ if (keytype == NULL) {
+ EVP_PKEY_free(param);
+ BIO_puts(bio_err, "Unable to determine key type\n");
+ return NULL;
+ }
}
}