summaryrefslogtreecommitdiff
path: root/usr.bin/openssl/rsa.c
diff options
context:
space:
mode:
authorKinichiro Inoguchi <inoguchi@cvs.openbsd.org>2019-02-09 06:27:38 +0000
committerKinichiro Inoguchi <inoguchi@cvs.openbsd.org>2019-02-09 06:27:38 +0000
commitc2e22a3bbeb5b9b10a16d7c44260496270680be7 (patch)
tree05d5fd4e5d03e17eed4b445ae46c4bf9510461fa /usr.bin/openssl/rsa.c
parentaf3ddbc131a6e9e2acf02583b0d0aaba64e65cc6 (diff)
Summarize the 4 same name functions and move it to apps.c
ok tb@ jsing@
Diffstat (limited to 'usr.bin/openssl/rsa.c')
-rw-r--r--usr.bin/openssl/rsa.c16
1 files changed, 2 insertions, 14 deletions
diff --git a/usr.bin/openssl/rsa.c b/usr.bin/openssl/rsa.c
index c6ab617ac82..49f67a3c174 100644
--- a/usr.bin/openssl/rsa.c
+++ b/usr.bin/openssl/rsa.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rsa.c,v 1.11 2019/02/05 12:45:47 inoguchi Exp $ */
+/* $OpenBSD: rsa.c,v 1.12 2019/02/09 06:27:37 inoguchi Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@@ -58,7 +58,6 @@
#include <openssl/opensslconf.h>
-#include <ctype.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -236,17 +235,6 @@ static struct option rsa_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
rsa_usage()
{
fprintf(stderr,
@@ -259,7 +247,7 @@ rsa_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");
}