diff options
| author | Kinichiro Inoguchi <inoguchi@cvs.openbsd.org> | 2019-02-05 12:45:48 +0000 |
|---|---|---|
| committer | Kinichiro Inoguchi <inoguchi@cvs.openbsd.org> | 2019-02-05 12:45:48 +0000 |
| commit | e7d1329f40987a09a5c240a286f97a9edf623947 (patch) | |
| tree | 6807c0b8b5f7658484b249aae61a17ad3f946f88 | |
| parent | aa586598ed58741a574d6db5e0fdafdac7becd9a (diff) | |
Add islower check to show_ciphers in pkey.c and rsa.c.
suggested by jsing@
ok tb@
| -rw-r--r-- | usr.bin/openssl/pkey.c | 6 | ||||
| -rw-r--r-- | usr.bin/openssl/rsa.c | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/usr.bin/openssl/pkey.c b/usr.bin/openssl/pkey.c index aab0b87032e..a5ed21fc3b7 100644 --- a/usr.bin/openssl/pkey.c +++ b/usr.bin/openssl/pkey.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pkey.c,v 1.11 2019/02/05 11:26:21 inoguchi Exp $ */ +/* $OpenBSD: pkey.c,v 1.12 2019/02/05 12:45:47 inoguchi Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 2006 */ @@ -56,6 +56,7 @@ * */ +#include <ctype.h> #include <stdio.h> #include <string.h> @@ -185,6 +186,9 @@ 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")); } diff --git a/usr.bin/openssl/rsa.c b/usr.bin/openssl/rsa.c index 09fe8ef0d6a..c6ab617ac82 100644 --- a/usr.bin/openssl/rsa.c +++ b/usr.bin/openssl/rsa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rsa.c,v 1.10 2018/02/07 05:47:55 jsing Exp $ */ +/* $OpenBSD: rsa.c,v 1.11 2019/02/05 12:45:47 inoguchi Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -58,6 +58,7 @@ #include <openssl/opensslconf.h> +#include <ctype.h> #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -239,6 +240,9 @@ 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")); } |