aboutsummaryrefslogtreecommitdiff
path: root/apps/ecparam.c
diff options
context:
space:
mode:
authorTomas Mraz <tomas@openssl.org>2021-04-30 16:57:53 +0200
committerMatt Caswell <matt@openssl.org>2021-05-06 11:43:32 +0100
commitd382e79632677f2457025be3d820e08d7ea12d85 (patch)
tree3a429b630ec1cce9656ee67434324c6930c677f4 /apps/ecparam.c
parentb86fa8c55682169c88e14e616170d6caeb208865 (diff)
downloadopenssl-d382e79632677f2457025be3d820e08d7ea12d85.zip
openssl-d382e79632677f2457025be3d820e08d7ea12d85.tar.gz
openssl-d382e79632677f2457025be3d820e08d7ea12d85.tar.bz2
Make the -inform option to be respected if possible
Add OSSL_STORE_PARAM_INPUT_TYPE and make it possible to be set when OSSL_STORE_open_ex() or OSSL_STORE_attach() is called. The input type format is enforced only in case the file type file store is used. By default we use FORMAT_UNDEF meaning the input type is not enforced. Fixes #14569 Reviewed-by: Paul Dale <pauli@openssl.org> (Merged from https://github.com/openssl/openssl/pull/15100)
Diffstat (limited to 'apps/ecparam.c')
-rw-r--r--apps/ecparam.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/ecparam.c b/apps/ecparam.c
index e9e36d1..a801ad6 100644
--- a/apps/ecparam.c
+++ b/apps/ecparam.c
@@ -240,7 +240,7 @@ int ecparam_main(int argc, char **argv)
goto end;
}
} else {
- params_key = load_keyparams(infile, 1, "EC", "EC parameters");
+ params_key = load_keyparams(infile, informat, 1, "EC", "EC parameters");
if (params_key == NULL || !EVP_PKEY_is_a(params_key, "EC"))
goto end;
if (point_format