diff options
| author | jsing <> | 2019-04-01 16:06:54 +0000 |
|---|---|---|
| committer | jsing <> | 2019-04-01 16:06:54 +0000 |
| commit | 7be6468beb0467c05caba97259d25e3c1fbecd10 (patch) | |
| tree | 85e28d5e8db26ecf8a57061a57c94b6e37121c93 /src | |
| parent | 47b864d8ad45e9a189482586d3bfcb4114453656 (diff) | |
| download | openbsd-7be6468beb0467c05caba97259d25e3c1fbecd10.tar.gz openbsd-7be6468beb0467c05caba97259d25e3c1fbecd10.tar.bz2 openbsd-7be6468beb0467c05caba97259d25e3c1fbecd10.zip | |
Sort.
Diffstat (limited to 'src')
| -rw-r--r-- | src/usr.bin/openssl/enc.c | 6 |
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 | ||
| 105 | static int | 105 | static int |
