Commit 8a6c6bbf authored by Naftuli Tzvi Kay's avatar Naftuli Tzvi Kay Committed by Matt Caswell
Browse files

Added custom PBKDF2 iteration count to PKCS8 tool.

parent 50cc4f7b

apps/pkcs8.c

+8 −1
Original line number Diff line number Diff line
@@ -173,6 +173,12 @@ int MAIN(int argc, char **argv) 
			topk8 = 1;

		else if (!strcmp (*args, "-noiter"))

			iter = 1;

        else if (!strcmp (*args, "-iter"))

            {

            if (!args[1]) goto bad;

            iter = atoi(*(++args));

            if (iter <= 0) goto bad;

            }

		else if (!strcmp (*args, "-nocrypt"))

			nocrypt = 1;

		else if (!strcmp (*args, "-nooct"))
@@ -235,6 +241,7 @@ int MAIN(int argc, char **argv) 
		BIO_printf(bio_err, "-nooct          use (nonstandard) no octet format\n");

		BIO_printf(bio_err, "-embed          use (nonstandard) embedded DSA parameters format\n");

		BIO_printf(bio_err, "-nsdb           use (nonstandard) DSA Netscape DB format\n");

		BIO_printf(bio_err, "-iter count     use count as iteration count\n");

        BIO_printf(bio_err, "-noiter         use 1 as iteration count\n");

		BIO_printf(bio_err, "-nocrypt        use or expect unencrypted private key\n");

		BIO_printf(bio_err, "-v2 alg         use PKCS#5 v2.0 and cipher \"alg\"\n");