summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjsing <>2019-04-01 16:05:14 +0000
committerjsing <>2019-04-01 16:05:14 +0000
commitea9d9b1fff60ceccdfcd70a30e99c611294571bb (patch)
tree4ae9d1daa917c1c1bb6d21f31c4a3acd87482fb5
parent124072cef0c06581ae5bb8581be095c92b65e802 (diff)
downloadopenbsd-ea9d9b1fff60ceccdfcd70a30e99c611294571bb.tar.gz
openbsd-ea9d9b1fff60ceccdfcd70a30e99c611294571bb.tar.bz2
openbsd-ea9d9b1fff60ceccdfcd70a30e99c611294571bb.zip
Make the openssl(1) enc -iter flag actually work.
Diff from Steven Roberts <sroberts at fenderq dot com> - thanks!
-rw-r--r--src/usr.bin/openssl/enc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/usr.bin/openssl/enc.c b/src/usr.bin/openssl/enc.c
index bcf111f062..5c254def64 100644
--- a/src/usr.bin/openssl/enc.c
+++ b/src/usr.bin/openssl/enc.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: enc.c,v 1.18 2019/02/09 15:49:21 inoguchi Exp $ */ 1/* $OpenBSD: enc.c,v 1.19 2019/04/01 16:05:14 jsing Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -180,7 +180,7 @@ static struct option enc_options[] = {
180 .name = "iter", 180 .name = "iter",
181 .argname = "iterations", 181 .argname = "iterations",
182 .desc = "Specify iteration count and force use of PBKDF2", 182 .desc = "Specify iteration count and force use of PBKDF2",
183 .type = OPTION_VALUE, 183 .type = OPTION_ARG_INT,
184 .opt.value = &enc_config.iter, 184 .opt.value = &enc_config.iter,
185 }, 185 },
186 { 186 {