diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 1999-05-19 12:45:16 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 1999-05-19 12:45:16 +0000 |
| commit | e84240d42289a131def633579cfdabfb6ebf557d (patch) | |
| tree | ec455fe5f4865fc28309c3e5f5762eec155b4f7d /apps/pkcs12.c | |
| parent | 054810ec0e02d7d15bf96945e2ea46d2e4147aa5 (diff) | |
| download | openssl-e84240d42289a131def633579cfdabfb6ebf557d.tar.gz | |
New functions sk_set, sk_value and sk_num to replace existing macros: this is
to minimise the effects on existing code.
Diffstat (limited to 'apps/pkcs12.c')
| -rw-r--r-- | apps/pkcs12.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/pkcs12.c b/apps/pkcs12.c index 190efc7b42..13544ddef8 100644 --- a/apps/pkcs12.c +++ b/apps/pkcs12.c @@ -69,7 +69,6 @@ EVP_CIPHER *enc; -#define _ITER_ 2048 #define NOKEYS 0x1 #define NOCERTS 0x2 @@ -99,7 +98,7 @@ int MAIN(int argc, char **argv) int options = 0; int chain = 0; int badarg = 0; - int iter = _ITER_; + int iter = PKCS12_DEFAULT_ITER; int maciter = 1; int twopass = 0; int keytype = 0; @@ -140,7 +139,8 @@ int MAIN(int argc, char **argv) #endif else if (!strcmp (*args, "-des3")) enc = EVP_des_ede3_cbc(); else if (!strcmp (*args, "-noiter")) iter = 1; - else if (!strcmp (*args, "-maciter")) maciter = _ITER_; + else if (!strcmp (*args, "-maciter")) + maciter = PKCS12_DEFAULT_ITER; else if (!strcmp (*args, "-nodes")) enc=NULL; else if (!strcmp (*args, "-inkey")) { if (args[1]) { |