Summarize the 4 same name functions and move it to apps.c

ok tb@ jsing@

1 files changed, 2 insertions, 14 deletions

diff --git a/src/usr.bin/openssl/pkey.c b/src/usr.bin/openssl/pkey.c
index a5ed21fc3b..f7e7e87e48 100644
--- a/src/usr.bin/openssl/pkey.c
+++ b/src/usr.bin/openssl/pkey.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pkey.c,v 1.12 2019/02/05 12:45:47 inoguchi Exp $ */
+/* $OpenBSD: pkey.c,v 1.13 2019/02/09 06:27:37 inoguchi Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2006
  */
@@ -56,7 +56,6 @@
  *
  */
 
-#include <ctype.h>
 #include <stdio.h>
 #include <string.h>
 
@@ -182,17 +181,6 @@ static struct option pkey_options[] = {
 };
 
 static void
-show_ciphers(const OBJ_NAME *name, void *arg)
-{
-        static int n;
-
-        if (!islower((unsigned char)*name->name))
-                return;
-
-        fprintf(stderr, " -%-24s%s", name->name, (++n % 3 ? "" : "\n"));
-}
-
-static void
 pkey_usage()
 {
         fprintf(stderr,
@@ -205,7 +193,7 @@ pkey_usage()
         fprintf(stderr, "\n");
 
         fprintf(stderr, "Valid ciphername values:\n\n");
-        OBJ_NAME_do_all_sorted(OBJ_NAME_TYPE_CIPHER_METH, show_ciphers, NULL);
+        OBJ_NAME_do_all_sorted(OBJ_NAME_TYPE_CIPHER_METH, show_cipher, NULL);
         fprintf(stderr, "\n");
 }