summaryrefslogtreecommitdiff
path: root/src/usr.bin/openssl/pkey.c
diff options
context:
space:
mode:
authorinoguchi <>2019-02-09 15:49:21 +0000
committerinoguchi <>2019-02-09 15:49:21 +0000
commitebd8f7f4161d7b5a6cb147e04ebc83c15e30bd7d (patch)
tree57ca2f3b5903ab1dddc2ed09f7d4450b10ee8f31 /src/usr.bin/openssl/pkey.c
parent554999fb07e18f1178489022d8f51f04ebc732a4 (diff)
downloadopenbsd-ebd8f7f4161d7b5a6cb147e04ebc83c15e30bd7d.tar.gz
openbsd-ebd8f7f4161d7b5a6cb147e04ebc83c15e30bd7d.tar.bz2
openbsd-ebd8f7f4161d7b5a6cb147e04ebc83c15e30bd7d.zip
Fix weird wrap showing cipher list in interactive mode
ok jsing@ tb@
Diffstat (limited to 'src/usr.bin/openssl/pkey.c')
-rw-r--r--src/usr.bin/openssl/pkey.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/usr.bin/openssl/pkey.c b/src/usr.bin/openssl/pkey.c
index f7e7e87e48..fa88e55032 100644
--- a/src/usr.bin/openssl/pkey.c
+++ b/src/usr.bin/openssl/pkey.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: pkey.c,v 1.13 2019/02/09 06:27:37 inoguchi Exp $ */ 1/* $OpenBSD: pkey.c,v 1.14 2019/02/09 15:49:21 inoguchi Exp $ */
2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 * project 2006 3 * project 2006
4 */ 4 */
@@ -183,6 +183,8 @@ static struct option pkey_options[] = {
183static void 183static void
184pkey_usage() 184pkey_usage()
185{ 185{
186 int n = 0;
187
186 fprintf(stderr, 188 fprintf(stderr,
187 "usage: pkey [-ciphername] [-in file] [-inform fmt] [-noout] " 189 "usage: pkey [-ciphername] [-in file] [-inform fmt] [-noout] "
188 "[-out file]\n" 190 "[-out file]\n"
@@ -193,7 +195,7 @@ pkey_usage()
193 fprintf(stderr, "\n"); 195 fprintf(stderr, "\n");
194 196
195 fprintf(stderr, "Valid ciphername values:\n\n"); 197 fprintf(stderr, "Valid ciphername values:\n\n");
196 OBJ_NAME_do_all_sorted(OBJ_NAME_TYPE_CIPHER_METH, show_cipher, NULL); 198 OBJ_NAME_do_all_sorted(OBJ_NAME_TYPE_CIPHER_METH, show_cipher, &n);
197 fprintf(stderr, "\n"); 199 fprintf(stderr, "\n");
198} 200}
199 201