summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormiod <>2014-07-09 11:08:31 +0000
committermiod <>2014-07-09 11:08:31 +0000
commit1376f74654846fcb2d768de3e82a71db99af6c5d (patch)
tree93a36135f7f2dc40a1639a5e18142afa93ca2164
parent30a9e395f6ab6a5767151ca9805a33262b3acbe0 (diff)
downloadopenbsd-1376f74654846fcb2d768de3e82a71db99af6c5d.tar.gz
openbsd-1376f74654846fcb2d768de3e82a71db99af6c5d.tar.bz2
openbsd-1376f74654846fcb2d768de3e82a71db99af6c5d.zip
Make use of this wonderful modern C construct known as a `switch', instead of
8-line if() tests.
Diffstat
-rw-r--r--src/lib/libcrypto/dsa/dsa_pmeth.c28
-rw-r--r--src/lib/libssl/src/crypto/dsa/dsa_pmeth.c28
2 files changed, 34 insertions, 22 deletions
diff --git a/src/lib/libcrypto/dsa/dsa_pmeth.c b/src/lib/libcrypto/dsa/dsa_pmeth.c
index f013a3f6e7..73e0b9fb2a 100644
--- a/src/lib/libcrypto/dsa/dsa_pmeth.c
+++ b/src/lib/libcrypto/dsa/dsa_pmeth.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: dsa_pmeth.c,v 1.7 2014/07/09 10:16:24 miod Exp $ */ 1/* $OpenBSD: dsa_pmeth.c,v 1.8 2014/07/09 11:08:31 miod 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 2006. 3 * project 2006.
4 */ 4 */
@@ -182,9 +182,12 @@ pkey_dsa_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2)
182 return 1; 182 return 1;
183 183
184 case EVP_PKEY_CTRL_DSA_PARAMGEN_MD: 184 case EVP_PKEY_CTRL_DSA_PARAMGEN_MD:
185 if (EVP_MD_type((const EVP_MD *)p2) != NID_sha1 && 185 switch (EVP_MD_type((const EVP_MD *)p2)) {
186 EVP_MD_type((const EVP_MD *)p2) != NID_sha224 && 186 case NID_sha1:
187 EVP_MD_type((const EVP_MD *)p2) != NID_sha256) { 187 case NID_sha224:
188 case NID_sha256:
189 break;
190 default:
188 DSAerr(DSA_F_PKEY_DSA_CTRL, DSA_R_INVALID_DIGEST_TYPE); 191 DSAerr(DSA_F_PKEY_DSA_CTRL, DSA_R_INVALID_DIGEST_TYPE);
189 return 0; 192 return 0;
190 } 193 }
@@ -192,13 +195,16 @@ pkey_dsa_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2)
192 return 1; 195 return 1;
193 196
194 case EVP_PKEY_CTRL_MD: 197 case EVP_PKEY_CTRL_MD:
195 if (EVP_MD_type((const EVP_MD *)p2) != NID_sha1 && 198 switch (EVP_MD_type((const EVP_MD *)p2)) {
196 EVP_MD_type((const EVP_MD *)p2) != NID_dsa && 199 case NID_sha1:
197 EVP_MD_type((const EVP_MD *)p2) != NID_dsaWithSHA && 200 case NID_dsa:
198 EVP_MD_type((const EVP_MD *)p2) != NID_sha224 && 201 case NID_dsaWithSHA:
199 EVP_MD_type((const EVP_MD *)p2) != NID_sha256 && 202 case NID_sha224:
200 EVP_MD_type((const EVP_MD *)p2) != NID_sha384 && 203 case NID_sha256:
201 EVP_MD_type((const EVP_MD *)p2) != NID_sha512) { 204 case NID_sha384:
205 case NID_sha512:
206 break;
207 default:
202 DSAerr(DSA_F_PKEY_DSA_CTRL, DSA_R_INVALID_DIGEST_TYPE); 208 DSAerr(DSA_F_PKEY_DSA_CTRL, DSA_R_INVALID_DIGEST_TYPE);
203 return 0; 209 return 0;
204 } 210 }
diff --git a/src/lib/libssl/src/crypto/dsa/dsa_pmeth.c b/src/lib/libssl/src/crypto/dsa/dsa_pmeth.c
index f013a3f6e7..73e0b9fb2a 100644
--- a/src/lib/libssl/src/crypto/dsa/dsa_pmeth.c
+++ b/src/lib/libssl/src/crypto/dsa/dsa_pmeth.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: dsa_pmeth.c,v 1.7 2014/07/09 10:16:24 miod Exp $ */ 1/* $OpenBSD: dsa_pmeth.c,v 1.8 2014/07/09 11:08:31 miod 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 2006. 3 * project 2006.
4 */ 4 */
@@ -182,9 +182,12 @@ pkey_dsa_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2)
182 return 1; 182 return 1;
183 183
184 case EVP_PKEY_CTRL_DSA_PARAMGEN_MD: 184 case EVP_PKEY_CTRL_DSA_PARAMGEN_MD:
185 if (EVP_MD_type((const EVP_MD *)p2) != NID_sha1 && 185 switch (EVP_MD_type((const EVP_MD *)p2)) {
186 EVP_MD_type((const EVP_MD *)p2) != NID_sha224 && 186 case NID_sha1:
187 EVP_MD_type((const EVP_MD *)p2) != NID_sha256) { 187 case NID_sha224:
188 case NID_sha256:
189 break;
190 default:
188 DSAerr(DSA_F_PKEY_DSA_CTRL, DSA_R_INVALID_DIGEST_TYPE); 191 DSAerr(DSA_F_PKEY_DSA_CTRL, DSA_R_INVALID_DIGEST_TYPE);
189 return 0; 192 return 0;
190 } 193 }
@@ -192,13 +195,16 @@ pkey_dsa_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2)
192 return 1; 195 return 1;
193 196
194 case EVP_PKEY_CTRL_MD: 197 case EVP_PKEY_CTRL_MD:
195 if (EVP_MD_type((const EVP_MD *)p2) != NID_sha1 && 198 switch (EVP_MD_type((const EVP_MD *)p2)) {
196 EVP_MD_type((const EVP_MD *)p2) != NID_dsa && 199 case NID_sha1:
197 EVP_MD_type((const EVP_MD *)p2) != NID_dsaWithSHA && 200 case NID_dsa:
198 EVP_MD_type((const EVP_MD *)p2) != NID_sha224 && 201 case NID_dsaWithSHA:
199 EVP_MD_type((const EVP_MD *)p2) != NID_sha256 && 202 case NID_sha224:
200 EVP_MD_type((const EVP_MD *)p2) != NID_sha384 && 203 case NID_sha256:
201 EVP_MD_type((const EVP_MD *)p2) != NID_sha512) { 204 case NID_sha384:
205 case NID_sha512:
206 break;
207 default:
202 DSAerr(DSA_F_PKEY_DSA_CTRL, DSA_R_INVALID_DIGEST_TYPE); 208 DSAerr(DSA_F_PKEY_DSA_CTRL, DSA_R_INVALID_DIGEST_TYPE);
203 return 0; 209 return 0;
204 } 210 }
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-21 15:50:08 +0000