=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/openssl/pkey.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- src/usr.bin/openssl/pkey.c 2019/02/05 12:45:47 1.12 +++ src/usr.bin/openssl/pkey.c 2019/02/09 06:27:37 1.13 @@ -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 #include #include @@ -182,17 +181,6 @@ }; 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 @@ 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"); }