diff options
| author | Kinichiro Inoguchi <inoguchi@cvs.openbsd.org> | 2019-07-24 14:23:26 +0000 |
|---|---|---|
| committer | Kinichiro Inoguchi <inoguchi@cvs.openbsd.org> | 2019-07-24 14:23:26 +0000 |
| commit | 9a46ddba0bd380d66f2cfdf7c60870d5ce5a4e4f (patch) | |
| tree | b59973ad1770d7957cb11c628b9d6f6ba23482dc | |
| parent | bb96974fa2e4287b88717765b53ae950bc953d93 (diff) | |
Capitalize cipher name and mode in help message as sync with pkcs12
| -rw-r--r-- | usr.bin/openssl/gendsa.c | 20 | ||||
| -rw-r--r-- | usr.bin/openssl/genrsa.c | 20 |
2 files changed, 20 insertions, 20 deletions
diff --git a/usr.bin/openssl/gendsa.c b/usr.bin/openssl/gendsa.c index 982676818a1..fff0053279d 100644 --- a/usr.bin/openssl/gendsa.c +++ b/usr.bin/openssl/gendsa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: gendsa.c,v 1.13 2019/07/16 12:36:50 inoguchi Exp $ */ +/* $OpenBSD: gendsa.c,v 1.14 2019/07/24 14:23:25 inoguchi Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -133,19 +133,19 @@ static const struct option gendsa_options[] = { #ifndef OPENSSL_NO_AES { .name = "aes128", - .desc = "Encrypt PEM output with cbc aes", + .desc = "Encrypt PEM output with CBC AES", .type = OPTION_ARGV_FUNC, .opt.argvfunc = set_enc, }, { .name = "aes192", - .desc = "Encrypt PEM output with cbc aes", + .desc = "Encrypt PEM output with CBC AES", .type = OPTION_ARGV_FUNC, .opt.argvfunc = set_enc, }, { .name = "aes256", - .desc = "Encrypt PEM output with cbc aes", + .desc = "Encrypt PEM output with CBC AES", .type = OPTION_ARGV_FUNC, .opt.argvfunc = set_enc, }, @@ -153,19 +153,19 @@ static const struct option gendsa_options[] = { #ifndef OPENSSL_NO_CAMELLIA { .name = "camellia128", - .desc = "Encrypt PEM output with cbc camellia", + .desc = "Encrypt PEM output with CBC Camellia", .type = OPTION_ARGV_FUNC, .opt.argvfunc = set_enc, }, { .name = "camellia192", - .desc = "Encrypt PEM output with cbc camellia", + .desc = "Encrypt PEM output with CBC Camellia", .type = OPTION_ARGV_FUNC, .opt.argvfunc = set_enc, }, { .name = "camellia256", - .desc = "Encrypt PEM output with cbc camellia", + .desc = "Encrypt PEM output with CBC Camellia", .type = OPTION_ARGV_FUNC, .opt.argvfunc = set_enc, }, @@ -173,13 +173,13 @@ static const struct option gendsa_options[] = { #ifndef OPENSSL_NO_DES { .name = "des", - .desc = "Encrypt the generated key with DES in cbc mode", + .desc = "Encrypt the generated key with DES in CBC mode", .type = OPTION_ARGV_FUNC, .opt.argvfunc = set_enc, }, { .name = "des3", - .desc = "Encrypt the generated key with DES in ede cbc mode (168 bit key)", + .desc = "Encrypt the generated key with DES in EDE CBC mode (168 bit key)", .type = OPTION_ARGV_FUNC, .opt.argvfunc = set_enc, }, @@ -187,7 +187,7 @@ static const struct option gendsa_options[] = { #ifndef OPENSSL_NO_IDEA { .name = "idea", - .desc = "Encrypt the generated key with IDEA in cbc mode", + .desc = "Encrypt the generated key with IDEA in CBC mode", .type = OPTION_ARGV_FUNC, .opt.argvfunc = set_enc, }, diff --git a/usr.bin/openssl/genrsa.c b/usr.bin/openssl/genrsa.c index 002842b04b3..f0cea1f9b1b 100644 --- a/usr.bin/openssl/genrsa.c +++ b/usr.bin/openssl/genrsa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: genrsa.c,v 1.16 2019/07/16 12:50:30 inoguchi Exp $ */ +/* $OpenBSD: genrsa.c,v 1.17 2019/07/24 14:23:25 inoguchi Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -179,19 +179,19 @@ static const struct option genrsa_options[] = { #ifndef OPENSSL_NO_AES { .name = "aes128", - .desc = "Encrypt PEM output with cbc aes", + .desc = "Encrypt PEM output with CBC AES", .type = OPTION_ARGV_FUNC, .opt.argvfunc = set_enc, }, { .name = "aes192", - .desc = "Encrypt PEM output with cbc aes", + .desc = "Encrypt PEM output with CBC AES", .type = OPTION_ARGV_FUNC, .opt.argvfunc = set_enc, }, { .name = "aes256", - .desc = "Encrypt PEM output with cbc aes", + .desc = "Encrypt PEM output with CBC AES", .type = OPTION_ARGV_FUNC, .opt.argvfunc = set_enc, }, @@ -199,19 +199,19 @@ static const struct option genrsa_options[] = { #ifndef OPENSSL_NO_CAMELLIA { .name = "camellia128", - .desc = "Encrypt PEM output with cbc camellia", + .desc = "Encrypt PEM output with CBC Camellia", .type = OPTION_ARGV_FUNC, .opt.argvfunc = set_enc, }, { .name = "camellia192", - .desc = "Encrypt PEM output with cbc camellia", + .desc = "Encrypt PEM output with CBC Camellia", .type = OPTION_ARGV_FUNC, .opt.argvfunc = set_enc, }, { .name = "camellia256", - .desc = "Encrypt PEM output with cbc camellia", + .desc = "Encrypt PEM output with CBC Camellia", .type = OPTION_ARGV_FUNC, .opt.argvfunc = set_enc, }, @@ -219,13 +219,13 @@ static const struct option genrsa_options[] = { #ifndef OPENSSL_NO_DES { .name = "des", - .desc = "Encrypt the generated key with DES in cbc mode", + .desc = "Encrypt the generated key with DES in CBC mode", .type = OPTION_ARGV_FUNC, .opt.argvfunc = set_enc, }, { .name = "des3", - .desc = "Encrypt the generated key with DES in ede cbc mode (168 bit key)", + .desc = "Encrypt the generated key with DES in EDE CBC mode (168 bit key)", .type = OPTION_ARGV_FUNC, .opt.argvfunc = set_enc, }, @@ -233,7 +233,7 @@ static const struct option genrsa_options[] = { #ifndef OPENSSL_NO_IDEA { .name = "idea", - .desc = "Encrypt the generated key with IDEA in cbc mode", + .desc = "Encrypt the generated key with IDEA in CBC mode", .type = OPTION_ARGV_FUNC, .opt.argvfunc = set_enc, }, |