Fix weird wrap showing cipher list in interactive mode

ok jsing@ tb@

6 files changed, 23 insertions, 13 deletions

diff --git a/src/usr.bin/openssl/apps.c b/src/usr.bin/openssl/apps.c
index d8d9256dc5..2297b5bf2b 100644
--- a/src/usr.bin/openssl/apps.c
+++ b/src/usr.bin/openssl/apps.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: apps.c,v 1.50 2019/02/09 06:27:37 inoguchi Exp $ */
+/* $OpenBSD: apps.c,v 1.51 2019/02/09 15:49:21 inoguchi Exp $ */
 /*
  * Copyright (c) 2014 Joel Sing <jsing@openbsd.org>
  *
@@ -2324,11 +2324,11 @@ options_parse(int argc, char **argv, struct option *opts, char **unnamed,
 void
 show_cipher(const OBJ_NAME *name, void *arg)
 {
-        static int n;
+        int *n = arg;
 
         if (!islower((unsigned char)*name->name))
                 return;
 
-        fprintf(stderr, " -%-24s%s", name->name, (++n % 3 ? "" : "\n"));
+        fprintf(stderr, " -%-24s%s", name->name, (++*n % 3 != 0 ? "" : "\n"));
 }
 
diff --git a/src/usr.bin/openssl/dsa.c b/src/usr.bin/openssl/dsa.c
index d2460a7aaa..c988283b5b 100644
--- a/src/usr.bin/openssl/dsa.c
+++ b/src/usr.bin/openssl/dsa.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dsa.c,v 1.12 2019/02/09 06:27:37 inoguchi Exp $ */
+/* $OpenBSD: dsa.c,v 1.13 2019/02/09 15:49:21 inoguchi Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -206,6 +206,8 @@ static struct option dsa_options[] = {
 static void
 dsa_usage(void)
 {
+        int n = 0;
+
         fprintf(stderr,
             "usage: dsa [-in file] [-inform format] [-noout]\n"
             "    [-out file] [-outform format] [-passin src] [-passout src]\n"
@@ -215,7 +217,7 @@ dsa_usage(void)
         fprintf(stderr, "\n");
 
         fprintf(stderr, "Valid ciphername values:\n\n");
-        OBJ_NAME_do_all_sorted(OBJ_NAME_TYPE_CIPHER_METH, show_cipher, NULL);
+        OBJ_NAME_do_all_sorted(OBJ_NAME_TYPE_CIPHER_METH, show_cipher, &n);
         fprintf(stderr, "\n");
 }
 
diff --git a/src/usr.bin/openssl/ec.c b/src/usr.bin/openssl/ec.c
index 917a7a15e5..f9056154ed 100644
--- a/src/usr.bin/openssl/ec.c
+++ b/src/usr.bin/openssl/ec.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ec.c,v 1.12 2019/02/09 06:27:37 inoguchi Exp $ */
+/* $OpenBSD: ec.c,v 1.13 2019/02/09 15:49:21 inoguchi Exp $ */
 /*
  * Written by Nils Larsch for the OpenSSL project.
  */
@@ -241,6 +241,8 @@ static struct option ec_options[] = {
 static void
 ec_usage(void)
 {
+        int n = 0;
+
         fprintf(stderr,
             "usage: ec [-conv_form form] [-in file]\n"
             "    [-inform format] [-noout] [-out file] [-outform format]\n"
@@ -251,7 +253,7 @@ ec_usage(void)
         fprintf(stderr, "\n");
 
         fprintf(stderr, "Valid ciphername values:\n\n");
-        OBJ_NAME_do_all_sorted(OBJ_NAME_TYPE_CIPHER_METH, show_cipher, NULL);
+        OBJ_NAME_do_all_sorted(OBJ_NAME_TYPE_CIPHER_METH, show_cipher, &n);
         fprintf(stderr, "\n");
 }
 
diff --git a/src/usr.bin/openssl/enc.c b/src/usr.bin/openssl/enc.c
index 863a048c12..bcf111f062 100644
--- a/src/usr.bin/openssl/enc.c
+++ b/src/usr.bin/openssl/enc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: enc.c,v 1.17 2019/02/09 06:27:37 inoguchi Exp $ */
+/* $OpenBSD: enc.c,v 1.18 2019/02/09 15:49:21 inoguchi Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -306,6 +306,8 @@ static struct option enc_options[] = {
 static void
 enc_usage(void)
 {
+        int n = 0;
+
         fprintf(stderr, "usage: enc -ciphername [-AadePp] [-base64] "
             "[-bufsize number] [-debug]\n"
             "    [-in file] [-iter iterations] [-iv IV] [-K key] "
@@ -316,7 +318,7 @@ enc_usage(void)
         fprintf(stderr, "\n");
 
         fprintf(stderr, "Valid ciphername values:\n\n");
-        OBJ_NAME_do_all_sorted(OBJ_NAME_TYPE_CIPHER_METH, show_cipher, NULL);
+        OBJ_NAME_do_all_sorted(OBJ_NAME_TYPE_CIPHER_METH, show_cipher, &n);
         fprintf(stderr, "\n");
 }
 
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 @@
-/* $OpenBSD: pkey.c,v 1.13 2019/02/09 06:27:37 inoguchi Exp $ */
+/* $OpenBSD: pkey.c,v 1.14 2019/02/09 15:49:21 inoguchi Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2006
  */
@@ -183,6 +183,8 @@ static struct option pkey_options[] = {
 static void
 pkey_usage()
 {
+        int n = 0;
+
         fprintf(stderr,
             "usage: pkey [-ciphername] [-in file] [-inform fmt] [-noout] "
             "[-out file]\n"
@@ -193,7 +195,7 @@ pkey_usage()
         fprintf(stderr, "\n");
 
         fprintf(stderr, "Valid ciphername values:\n\n");
-        OBJ_NAME_do_all_sorted(OBJ_NAME_TYPE_CIPHER_METH, show_cipher, NULL);
+        OBJ_NAME_do_all_sorted(OBJ_NAME_TYPE_CIPHER_METH, show_cipher, &n);
         fprintf(stderr, "\n");
 }
 
diff --git a/src/usr.bin/openssl/rsa.c b/src/usr.bin/openssl/rsa.c
index 49f67a3c17..4017899c45 100644
--- a/src/usr.bin/openssl/rsa.c
+++ b/src/usr.bin/openssl/rsa.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rsa.c,v 1.12 2019/02/09 06:27:37 inoguchi Exp $ */
+/* $OpenBSD: rsa.c,v 1.13 2019/02/09 15:49:21 inoguchi Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -237,6 +237,8 @@ static struct option rsa_options[] = {
 static void
 rsa_usage()
 {
+        int n = 0;
+
         fprintf(stderr,
             "usage: rsa [-ciphername] [-check] [-in file] "
             "[-inform fmt]\n"
@@ -247,7 +249,7 @@ rsa_usage()
         fprintf(stderr, "\n");
 
         fprintf(stderr, "Valid ciphername values:\n\n");
-        OBJ_NAME_do_all_sorted(OBJ_NAME_TYPE_CIPHER_METH, show_cipher, NULL);
+        OBJ_NAME_do_all_sorted(OBJ_NAME_TYPE_CIPHER_METH, show_cipher, &n);
         fprintf(stderr, "\n");
 }