summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjsing <>2019-04-01 16:06:54 +0000
committerjsing <>2019-04-01 16:06:54 +0000
commitde2ddd84025c942800dd01f54d5e858a7f2e0f5e (patch)
tree85e28d5e8db26ecf8a57061a57c94b6e37121c93
parentea9d9b1fff60ceccdfcd70a30e99c611294571bb (diff)
downloadopenbsd-de2ddd84025c942800dd01f54d5e858a7f2e0f5e.tar.gz
openbsd-de2ddd84025c942800dd01f54d5e858a7f2e0f5e.tar.bz2
openbsd-de2ddd84025c942800dd01f54d5e858a7f2e0f5e.zip
Sort.
-rw-r--r--src/usr.bin/openssl/enc.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/usr.bin/openssl/enc.c b/src/usr.bin/openssl/enc.c
index 5c254def64..4de92bd636 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.19 2019/04/01 16:05:14 jsing Exp $ */ 1/* $OpenBSD: enc.c,v 1.20 2019/04/01 16:06:54 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 *
@@ -88,6 +88,7 @@ static struct {
88 char *hkey; 88 char *hkey;
89 char *hsalt; 89 char *hsalt;
90 char *inf; 90 char *inf;
91 int iter;
91 char *keyfile; 92 char *keyfile;
92 char *keystr; 93 char *keystr;
93 char *md; 94 char *md;
@@ -96,10 +97,9 @@ static struct {
96 int olb64; 97 int olb64;
97 char *outf; 98 char *outf;
98 char *passarg; 99 char *passarg;
100 int pbkdf2;
99 int printkey; 101 int printkey;
100 int verbose; 102 int verbose;
101 int iter;
102 int pbkdf2;
103} enc_config; 103} enc_config;
104 104
105static int 105static int