From 7a09aa52502e5c4598eda224db8dd8e132773449 Mon Sep 17 00:00:00 2001 From: inoguchi <> Date: Sat, 9 Feb 2019 06:27:37 +0000 Subject: Summarize the 4 same name functions and move it to apps.c ok tb@ jsing@ --- src/usr.bin/openssl/apps.c | 14 +++++++++++++- src/usr.bin/openssl/apps.h | 4 +++- src/usr.bin/openssl/dsa.c | 16 ++-------------- src/usr.bin/openssl/ec.c | 16 ++-------------- src/usr.bin/openssl/enc.c | 16 ++-------------- src/usr.bin/openssl/pkey.c | 16 ++-------------- src/usr.bin/openssl/rsa.c | 16 ++-------------- 7 files changed, 26 insertions(+), 72 deletions(-) (limited to 'src') diff --git a/src/usr.bin/openssl/apps.c b/src/usr.bin/openssl/apps.c index 3febc15d2b..d8d9256dc5 100644 --- a/src/usr.bin/openssl/apps.c +++ b/src/usr.bin/openssl/apps.c @@ -1,4 +1,4 @@ -/* $OpenBSD: apps.c,v 1.49 2018/08/16 16:56:51 tb Exp $ */ +/* $OpenBSD: apps.c,v 1.50 2019/02/09 06:27:37 inoguchi Exp $ */ /* * Copyright (c) 2014 Joel Sing * @@ -2320,3 +2320,15 @@ options_parse(int argc, char **argv, struct option *opts, char **unnamed, fprintf(stderr, "unknown option '%s'\n", arg); return (1); } + +void +show_cipher(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")); +} + diff --git a/src/usr.bin/openssl/apps.h b/src/usr.bin/openssl/apps.h index cfc6036ccf..bb2340a545 100644 --- a/src/usr.bin/openssl/apps.h +++ b/src/usr.bin/openssl/apps.h @@ -1,4 +1,4 @@ -/* $OpenBSD: apps.h,v 1.21 2018/07/13 18:36:56 cheloha Exp $ */ +/* $OpenBSD: apps.h,v 1.22 2019/02/09 06:27:37 inoguchi Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -321,4 +321,6 @@ void options_usage(struct option *opts); int options_parse(int argc, char **argv, struct option *opts, char **unnamed, int *argsused); +void show_cipher(const OBJ_NAME *name, void *arg); + #endif diff --git a/src/usr.bin/openssl/dsa.c b/src/usr.bin/openssl/dsa.c index 0b99dedca6..d2460a7aaa 100644 --- a/src/usr.bin/openssl/dsa.c +++ b/src/usr.bin/openssl/dsa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dsa.c,v 1.11 2018/02/07 05:47:55 jsing Exp $ */ +/* $OpenBSD: dsa.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 /* for OPENSSL_NO_DSA */ -#include #include #include #include @@ -204,17 +203,6 @@ static struct option dsa_options[] = { { NULL }, }; -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 dsa_usage(void) { @@ -227,7 +215,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_ciphers, NULL); + OBJ_NAME_do_all_sorted(OBJ_NAME_TYPE_CIPHER_METH, show_cipher, NULL); fprintf(stderr, "\n"); } diff --git a/src/usr.bin/openssl/ec.c b/src/usr.bin/openssl/ec.c index f2dad6dfef..917a7a15e5 100644 --- a/src/usr.bin/openssl/ec.c +++ b/src/usr.bin/openssl/ec.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ec.c,v 1.11 2018/02/07 05:47:55 jsing Exp $ */ +/* $OpenBSD: ec.c,v 1.12 2019/02/09 06:27:37 inoguchi Exp $ */ /* * Written by Nils Larsch for the OpenSSL project. */ @@ -60,7 +60,6 @@ #ifndef OPENSSL_NO_EC -#include #include #include #include @@ -239,17 +238,6 @@ static struct option ec_options[] = { { NULL }, }; -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 ec_usage(void) { @@ -263,7 +251,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_ciphers, NULL); + OBJ_NAME_do_all_sorted(OBJ_NAME_TYPE_CIPHER_METH, show_cipher, NULL); fprintf(stderr, "\n"); } diff --git a/src/usr.bin/openssl/enc.c b/src/usr.bin/openssl/enc.c index 7daeafe9d7..863a048c12 100644 --- a/src/usr.bin/openssl/enc.c +++ b/src/usr.bin/openssl/enc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: enc.c,v 1.16 2019/01/18 22:47:34 naddy Exp $ */ +/* $OpenBSD: enc.c,v 1.17 2019/02/09 06:27:37 inoguchi Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -56,7 +56,6 @@ * [including the GNU Public Licence.] */ -#include #include #include #include @@ -304,17 +303,6 @@ static struct option enc_options[] = { { NULL }, }; -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 enc_usage(void) { @@ -328,7 +316,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_ciphers, NULL); + OBJ_NAME_do_all_sorted(OBJ_NAME_TYPE_CIPHER_METH, show_cipher, NULL); fprintf(stderr, "\n"); } 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 #include #include @@ -181,17 +180,6 @@ static struct option pkey_options[] = { { NULL } }; -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() { @@ -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"); } diff --git a/src/usr.bin/openssl/rsa.c b/src/usr.bin/openssl/rsa.c index c6ab617ac8..49f67a3c17 100644 --- a/src/usr.bin/openssl/rsa.c +++ b/src/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 -#include #include #include #include @@ -235,17 +234,6 @@ static struct option rsa_options[] = { { NULL } }; -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() { @@ -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"); } -- cgit v1.2.3-55-g6feb