diff options
author | tb <> | 2025-06-07 08:33:58 +0000 |
---|---|---|
committer | tb <> | 2025-06-07 08:33:58 +0000 |
commit | 9b01e9f65b0020e9e4a1d1ac90e01d0b89dfed07 (patch) | |
tree | 2f2726b551ee8b539bf7c3bd413d9834018b78c9 | |
parent | 7d1b18e4c061d6514945c6f09c42124a41195078 (diff) | |
download | openbsd-9b01e9f65b0020e9e4a1d1ac90e01d0b89dfed07.tar.gz openbsd-9b01e9f65b0020e9e4a1d1ac90e01d0b89dfed07.tar.bz2 openbsd-9b01e9f65b0020e9e4a1d1ac90e01d0b89dfed07.zip |
KNF for variations of get_cipher_by_name()
-rw-r--r-- | src/usr.bin/openssl/gendsa.c | 5 | ||||
-rw-r--r-- | src/usr.bin/openssl/genrsa.c | 5 | ||||
-rw-r--r-- | src/usr.bin/openssl/pkcs12.c | 5 |
3 files changed, 9 insertions, 6 deletions
diff --git a/src/usr.bin/openssl/gendsa.c b/src/usr.bin/openssl/gendsa.c index 00635c4551..69a7994da7 100644 --- a/src/usr.bin/openssl/gendsa.c +++ b/src/usr.bin/openssl/gendsa.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: gendsa.c,v 1.17 2023/03/06 14:32:06 tb Exp $ */ | 1 | /* $OpenBSD: gendsa.c,v 1.18 2025/06/07 08:33:58 tb Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -80,7 +80,8 @@ static struct { | |||
80 | char *passargout; | 80 | char *passargout; |
81 | } cfg; | 81 | } cfg; |
82 | 82 | ||
83 | static const EVP_CIPHER *get_cipher_by_name(char *name) | 83 | static const EVP_CIPHER * |
84 | get_cipher_by_name(char *name) | ||
84 | { | 85 | { |
85 | if (name == NULL || strcmp(name, "") == 0) | 86 | if (name == NULL || strcmp(name, "") == 0) |
86 | return (NULL); | 87 | return (NULL); |
diff --git a/src/usr.bin/openssl/genrsa.c b/src/usr.bin/openssl/genrsa.c index 0b5323fa5f..647780d8fa 100644 --- a/src/usr.bin/openssl/genrsa.c +++ b/src/usr.bin/openssl/genrsa.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: genrsa.c,v 1.22 2023/03/06 14:32:06 tb Exp $ */ | 1 | /* $OpenBSD: genrsa.c,v 1.23 2025/06/07 08:33:58 tb Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -108,7 +108,8 @@ set_public_exponent(int argc, char **argv, int *argsused) | |||
108 | return (0); | 108 | return (0); |
109 | } | 109 | } |
110 | 110 | ||
111 | static const EVP_CIPHER *get_cipher_by_name(char *name) | 111 | static const EVP_CIPHER * |
112 | get_cipher_by_name(char *name) | ||
112 | { | 113 | { |
113 | if (name == NULL || strcmp(name, "") == 0) | 114 | if (name == NULL || strcmp(name, "") == 0) |
114 | return (NULL); | 115 | return (NULL); |
diff --git a/src/usr.bin/openssl/pkcs12.c b/src/usr.bin/openssl/pkcs12.c index 1407a96e03..efd6d59163 100644 --- a/src/usr.bin/openssl/pkcs12.c +++ b/src/usr.bin/openssl/pkcs12.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: pkcs12.c,v 1.29 2024/12/26 14:10:48 tb Exp $ */ | 1 | /* $OpenBSD: pkcs12.c,v 1.30 2025/06/07 08:33:58 tb Exp $ */ |
2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
3 | * project. | 3 | * project. |
4 | */ | 4 | */ |
@@ -152,7 +152,8 @@ pkcs12_opt_passarg(char *arg) | |||
152 | return (0); | 152 | return (0); |
153 | } | 153 | } |
154 | 154 | ||
155 | static const EVP_CIPHER *get_cipher_by_name(char *name) | 155 | static const EVP_CIPHER * |
156 | get_cipher_by_name(char *name) | ||
156 | { | 157 | { |
157 | if (name == NULL || strcmp(name, "") == 0) | 158 | if (name == NULL || strcmp(name, "") == 0) |
158 | return (NULL); | 159 | return (NULL); |