diff options
| author | Dr. David von Oheimb <David.von.Oheimb@siemens.com> | 2020-05-11 15:48:52 +0200 |
|---|---|---|
| committer | Dr. David von Oheimb <David.von.Oheimb@siemens.com> | 2020-11-19 11:36:02 +0100 |
| commit | b84965aff0451dd914d54d3fbb6b9d347e1cd947 (patch) | |
| tree | d75df291fac974cc517f3008cdeca295aaed8a15 /apps | |
| parent | bb57c90e6cdc8400219673ff32dad95361f3c291 (diff) | |
| download | openssl-new-b84965aff0451dd914d54d3fbb6b9d347e1cd947.tar.gz | |
apps/pkcs12: Do not prompt for password in case -nomac and -noenc/-nodes
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/4930)
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/pkcs12.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/pkcs12.c b/apps/pkcs12.c index 2c4e11a410..67da082390 100644 --- a/apps/pkcs12.c +++ b/apps/pkcs12.c @@ -573,7 +573,7 @@ int pkcs12_main(int argc, char **argv) if (add_lmk && key != NULL) EVP_PKEY_add1_attr_by_NID(key, NID_LocalKeySet, 0, NULL, -1); - if (!noprompt) { + if (!noprompt && !(enc == NULL && maciter == -1)) { /* To avoid bit rot */ if (1) { #ifndef OPENSSL_NO_UI_CONSOLE |