diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2000-01-08 03:16:04 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2000-01-08 03:16:04 +0000 |
| commit | dad666fbbeed2a0699ca682b96f26f490cee1a4c (patch) | |
| tree | 3a5b58fc4577ec4d15e54b44a7af7489041ad7d3 /apps/pkcs12.c | |
| parent | 5b58baee3c2ad47f7fa673fed7f31f0656eef13b (diff) | |
Add PKCS#12 manpage and use MAC iteration counts by default.
Diffstat (limited to 'apps/pkcs12.c')
| -rw-r--r-- | apps/pkcs12.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/apps/pkcs12.c b/apps/pkcs12.c index 65276f5229..800e2a8406 100644 --- a/apps/pkcs12.c +++ b/apps/pkcs12.c @@ -100,7 +100,7 @@ int MAIN(int argc, char **argv) int chain = 0; int badarg = 0; int iter = PKCS12_DEFAULT_ITER; - int maciter = 1; + int maciter = PKCS12_DEFAULT_ITER; int twopass = 0; int keytype = 0; int cert_pbe = NID_pbe_WithSHA1And40BitRC2_CBC; @@ -143,6 +143,8 @@ int MAIN(int argc, char **argv) else if (!strcmp (*args, "-noiter")) iter = 1; else if (!strcmp (*args, "-maciter")) maciter = PKCS12_DEFAULT_ITER; + else if (!strcmp (*args, "-nomaciter")) + maciter = 1; else if (!strcmp (*args, "-nodes")) enc=NULL; else if (!strcmp (*args, "-certpbe")) { if (args[1]) { |