diff options
Diffstat (limited to '')
| -rw-r--r-- | src/usr.bin/openssl/dgst.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/usr.bin/openssl/dgst.c b/src/usr.bin/openssl/dgst.c index b8253a8fb8..6592d2b194 100644 --- a/src/usr.bin/openssl/dgst.c +++ b/src/usr.bin/openssl/dgst.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: dgst.c,v 1.15 2019/08/30 11:19:00 inoguchi Exp $ */ | 1 | /* $OpenBSD: dgst.c,v 1.16 2019/08/30 11:43:34 inoguchi 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 | * |
| @@ -122,11 +122,11 @@ dgst_opt_md(int argc, char **argv, int *argsused) | |||
| 122 | if (*name++ != '-') | 122 | if (*name++ != '-') |
| 123 | return (1); | 123 | return (1); |
| 124 | 124 | ||
| 125 | if ((dgst_config.m = EVP_get_digestbyname(name)) != NULL) | 125 | if ((dgst_config.m = EVP_get_digestbyname(name)) == NULL) |
| 126 | dgst_config.md = dgst_config.m; | ||
| 127 | else | ||
| 128 | return (1); | 126 | return (1); |
| 129 | 127 | ||
| 128 | dgst_config.md = dgst_config.m; | ||
| 129 | |||
| 130 | *argsused = 1; | 130 | *argsused = 1; |
| 131 | return (0); | 131 | return (0); |
| 132 | } | 132 | } |
| @@ -173,21 +173,21 @@ dgst_opt_verify(char *arg) | |||
| 173 | static const struct option dgst_options[] = { | 173 | static const struct option dgst_options[] = { |
| 174 | { | 174 | { |
| 175 | .name = "binary", | 175 | .name = "binary", |
| 176 | .desc = "Output in binary form", | 176 | .desc = "Output the digest or signature in binary form", |
| 177 | .type = OPTION_VALUE, | 177 | .type = OPTION_VALUE, |
| 178 | .opt.value = &dgst_config.out_bin, | 178 | .opt.value = &dgst_config.out_bin, |
| 179 | .value = 1, | 179 | .value = 1, |
| 180 | }, | 180 | }, |
| 181 | { | 181 | { |
| 182 | .name = "c", | 182 | .name = "c", |
| 183 | .desc = "To output the digest with separating colons", | 183 | .desc = "Print the digest in two-digit groups separated by colons", |
| 184 | .type = OPTION_VALUE, | 184 | .type = OPTION_VALUE, |
| 185 | .opt.value = &dgst_config.separator, | 185 | .opt.value = &dgst_config.separator, |
| 186 | .value = 1, | 186 | .value = 1, |
| 187 | }, | 187 | }, |
| 188 | { | 188 | { |
| 189 | .name = "d", | 189 | .name = "d", |
| 190 | .desc = "To output debug info", | 190 | .desc = "Print BIO debugging information", |
| 191 | .type = OPTION_FLAG, | 191 | .type = OPTION_FLAG, |
| 192 | .opt.flag = &dgst_config.debug, | 192 | .opt.flag = &dgst_config.debug, |
| 193 | }, | 193 | }, |
| @@ -249,7 +249,7 @@ static const struct option dgst_options[] = { | |||
| 249 | }, | 249 | }, |
| 250 | { | 250 | { |
| 251 | .name = "r", | 251 | .name = "r", |
| 252 | .desc = "To output the digest in coreutils format", | 252 | .desc = "Output the digest in coreutils format", |
| 253 | .type = OPTION_VALUE, | 253 | .type = OPTION_VALUE, |
| 254 | .opt.value = &dgst_config.separator, | 254 | .opt.value = &dgst_config.separator, |
| 255 | .value = 2, | 255 | .value = 2, |
