summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authortedu <>2014-05-29 18:15:10 +0000
committertedu <>2014-05-29 18:15:10 +0000
commiteccf68c3e372817e5413e6d827b7eb1b614c15ef (patch)
tree1340a4d8774501d273a824a19354262dac0d1d06 /src
parent36abfd12740be4329b29e295bfcee8fe22c637d4 (diff)
downloadopenbsd-eccf68c3e372817e5413e6d827b7eb1b614c15ef.tar.gz
openbsd-eccf68c3e372817e5413e6d827b7eb1b614c15ef.tar.bz2
openbsd-eccf68c3e372817e5413e6d827b7eb1b614c15ef.zip
consistent braces
Diffstat (limited to 'src')
-rw-r--r--src/lib/libssl/src/ssl/ssl_lib.c26
-rw-r--r--src/lib/libssl/ssl_lib.c26
2 files changed, 26 insertions, 26 deletions
diff --git a/src/lib/libssl/src/ssl/ssl_lib.c b/src/lib/libssl/src/ssl/ssl_lib.c
index d134a4f22a..f29648d81e 100644
--- a/src/lib/libssl/src/ssl/ssl_lib.c
+++ b/src/lib/libssl/src/ssl/ssl_lib.c
@@ -2269,13 +2269,13 @@ ssl_get_server_send_pkey(const SSL *s)
2269 i = SSL_PKEY_ECC; 2269 i = SSL_PKEY_ECC;
2270 } else if (alg_a & SSL_aECDSA) { 2270 } else if (alg_a & SSL_aECDSA) {
2271 i = SSL_PKEY_ECC; 2271 i = SSL_PKEY_ECC;
2272 } else if (alg_k & SSL_kDHr) 2272 } else if (alg_k & SSL_kDHr) {
2273 i = SSL_PKEY_DH_RSA; 2273 i = SSL_PKEY_DH_RSA;
2274 else if (alg_k & SSL_kDHd) 2274 } else if (alg_k & SSL_kDHd) {
2275 i = SSL_PKEY_DH_DSA; 2275 i = SSL_PKEY_DH_DSA;
2276 else if (alg_a & SSL_aDSS) 2276 } else if (alg_a & SSL_aDSS) {
2277 i = SSL_PKEY_DSA_SIGN; 2277 i = SSL_PKEY_DSA_SIGN;
2278 else if (alg_a & SSL_aRSA) { 2278 } else if (alg_a & SSL_aRSA) {
2279 if (c->pkeys[SSL_PKEY_RSA_ENC].x509 == NULL) 2279 if (c->pkeys[SSL_PKEY_RSA_ENC].x509 == NULL)
2280 i = SSL_PKEY_RSA_SIGN; 2280 i = SSL_PKEY_RSA_SIGN;
2281 else 2281 else
@@ -2283,11 +2283,11 @@ ssl_get_server_send_pkey(const SSL *s)
2283 } else if (alg_a & SSL_aKRB5) { 2283 } else if (alg_a & SSL_aKRB5) {
2284 /* VRS something else here? */ 2284 /* VRS something else here? */
2285 return (NULL); 2285 return (NULL);
2286 } else if (alg_a & SSL_aGOST94) 2286 } else if (alg_a & SSL_aGOST94) {
2287 i = SSL_PKEY_GOST94; 2287 i = SSL_PKEY_GOST94;
2288 else if (alg_a & SSL_aGOST01) 2288 } else if (alg_a & SSL_aGOST01) {
2289 i = SSL_PKEY_GOST01; 2289 i = SSL_PKEY_GOST01;
2290 else { /* if (alg_a & SSL_aNULL) */ 2290 } else { /* if (alg_a & SSL_aNULL) */
2291 SSLerr(SSL_F_SSL_GET_SERVER_SEND_PKEY, 2291 SSLerr(SSL_F_SSL_GET_SERVER_SEND_PKEY,
2292 ERR_R_INTERNAL_ERROR); 2292 ERR_R_INTERNAL_ERROR);
2293 return (NULL); 2293 return (NULL);
@@ -2423,9 +2423,9 @@ SSL_get_error(const SSL *s, int i)
2423 2423
2424 if ((i < 0) && SSL_want_read(s)) { 2424 if ((i < 0) && SSL_want_read(s)) {
2425 bio = SSL_get_rbio(s); 2425 bio = SSL_get_rbio(s);
2426 if (BIO_should_read(bio)) 2426 if (BIO_should_read(bio)) {
2427 return (SSL_ERROR_WANT_READ); 2427 return (SSL_ERROR_WANT_READ);
2428 else if (BIO_should_write(bio)) 2428 } else if (BIO_should_write(bio)) {
2429 /* 2429 /*
2430 * This one doesn't make too much sense... We never 2430 * This one doesn't make too much sense... We never
2431 * try to write to the rbio, and an application 2431 * try to write to the rbio, and an application
@@ -2436,8 +2436,8 @@ SSL_get_error(const SSL *s, int i)
2436 * and rbio and wbio *are* the same, this test works 2436 * and rbio and wbio *are* the same, this test works
2437 * around that bug; so it might be safer to keep it. 2437 * around that bug; so it might be safer to keep it.
2438 */ 2438 */
2439 return (SSL_ERROR_WANT_WRITE); 2439 return (SSL_ERROR_WANT_WRITE);
2440 else if (BIO_should_io_special(bio)) { 2440 } else if (BIO_should_io_special(bio)) {
2441 reason = BIO_get_retry_reason(bio); 2441 reason = BIO_get_retry_reason(bio);
2442 if (reason == BIO_RR_CONNECT) 2442 if (reason == BIO_RR_CONNECT)
2443 return (SSL_ERROR_WANT_CONNECT); 2443 return (SSL_ERROR_WANT_CONNECT);
@@ -2450,9 +2450,9 @@ SSL_get_error(const SSL *s, int i)
2450 2450
2451 if ((i < 0) && SSL_want_write(s)) { 2451 if ((i < 0) && SSL_want_write(s)) {
2452 bio = SSL_get_wbio(s); 2452 bio = SSL_get_wbio(s);
2453 if (BIO_should_write(bio)) 2453 if (BIO_should_write(bio)) {
2454 return (SSL_ERROR_WANT_WRITE); 2454 return (SSL_ERROR_WANT_WRITE);
2455 else if (BIO_should_read(bio)) { 2455 } else if (BIO_should_read(bio)) {
2456 /* 2456 /*
2457 * See above (SSL_want_read(s) with 2457 * See above (SSL_want_read(s) with
2458 * BIO_should_write(bio)) 2458 * BIO_should_write(bio))
diff --git a/src/lib/libssl/ssl_lib.c b/src/lib/libssl/ssl_lib.c
index d134a4f22a..f29648d81e 100644
--- a/src/lib/libssl/ssl_lib.c
+++ b/src/lib/libssl/ssl_lib.c
@@ -2269,13 +2269,13 @@ ssl_get_server_send_pkey(const SSL *s)
2269 i = SSL_PKEY_ECC; 2269 i = SSL_PKEY_ECC;
2270 } else if (alg_a & SSL_aECDSA) { 2270 } else if (alg_a & SSL_aECDSA) {
2271 i = SSL_PKEY_ECC; 2271 i = SSL_PKEY_ECC;
2272 } else if (alg_k & SSL_kDHr) 2272 } else if (alg_k & SSL_kDHr) {
2273 i = SSL_PKEY_DH_RSA; 2273 i = SSL_PKEY_DH_RSA;
2274 else if (alg_k & SSL_kDHd) 2274 } else if (alg_k & SSL_kDHd) {
2275 i = SSL_PKEY_DH_DSA; 2275 i = SSL_PKEY_DH_DSA;
2276 else if (alg_a & SSL_aDSS) 2276 } else if (alg_a & SSL_aDSS) {
2277 i = SSL_PKEY_DSA_SIGN; 2277 i = SSL_PKEY_DSA_SIGN;
2278 else if (alg_a & SSL_aRSA) { 2278 } else if (alg_a & SSL_aRSA) {
2279 if (c->pkeys[SSL_PKEY_RSA_ENC].x509 == NULL) 2279 if (c->pkeys[SSL_PKEY_RSA_ENC].x509 == NULL)
2280 i = SSL_PKEY_RSA_SIGN; 2280 i = SSL_PKEY_RSA_SIGN;
2281 else 2281 else
@@ -2283,11 +2283,11 @@ ssl_get_server_send_pkey(const SSL *s)
2283 } else if (alg_a & SSL_aKRB5) { 2283 } else if (alg_a & SSL_aKRB5) {
2284 /* VRS something else here? */ 2284 /* VRS something else here? */
2285 return (NULL); 2285 return (NULL);
2286 } else if (alg_a & SSL_aGOST94) 2286 } else if (alg_a & SSL_aGOST94) {
2287 i = SSL_PKEY_GOST94; 2287 i = SSL_PKEY_GOST94;
2288 else if (alg_a & SSL_aGOST01) 2288 } else if (alg_a & SSL_aGOST01) {
2289 i = SSL_PKEY_GOST01; 2289 i = SSL_PKEY_GOST01;
2290 else { /* if (alg_a & SSL_aNULL) */ 2290 } else { /* if (alg_a & SSL_aNULL) */
2291 SSLerr(SSL_F_SSL_GET_SERVER_SEND_PKEY, 2291 SSLerr(SSL_F_SSL_GET_SERVER_SEND_PKEY,
2292 ERR_R_INTERNAL_ERROR); 2292 ERR_R_INTERNAL_ERROR);
2293 return (NULL); 2293 return (NULL);
@@ -2423,9 +2423,9 @@ SSL_get_error(const SSL *s, int i)
2423 2423
2424 if ((i < 0) && SSL_want_read(s)) { 2424 if ((i < 0) && SSL_want_read(s)) {
2425 bio = SSL_get_rbio(s); 2425 bio = SSL_get_rbio(s);
2426 if (BIO_should_read(bio)) 2426 if (BIO_should_read(bio)) {
2427 return (SSL_ERROR_WANT_READ); 2427 return (SSL_ERROR_WANT_READ);
2428 else if (BIO_should_write(bio)) 2428 } else if (BIO_should_write(bio)) {
2429 /* 2429 /*
2430 * This one doesn't make too much sense... We never 2430 * This one doesn't make too much sense... We never
2431 * try to write to the rbio, and an application 2431 * try to write to the rbio, and an application
@@ -2436,8 +2436,8 @@ SSL_get_error(const SSL *s, int i)
2436 * and rbio and wbio *are* the same, this test works 2436 * and rbio and wbio *are* the same, this test works
2437 * around that bug; so it might be safer to keep it. 2437 * around that bug; so it might be safer to keep it.
2438 */ 2438 */
2439 return (SSL_ERROR_WANT_WRITE); 2439 return (SSL_ERROR_WANT_WRITE);
2440 else if (BIO_should_io_special(bio)) { 2440 } else if (BIO_should_io_special(bio)) {
2441 reason = BIO_get_retry_reason(bio); 2441 reason = BIO_get_retry_reason(bio);
2442 if (reason == BIO_RR_CONNECT) 2442 if (reason == BIO_RR_CONNECT)
2443 return (SSL_ERROR_WANT_CONNECT); 2443 return (SSL_ERROR_WANT_CONNECT);
@@ -2450,9 +2450,9 @@ SSL_get_error(const SSL *s, int i)
2450 2450
2451 if ((i < 0) && SSL_want_write(s)) { 2451 if ((i < 0) && SSL_want_write(s)) {
2452 bio = SSL_get_wbio(s); 2452 bio = SSL_get_wbio(s);
2453 if (BIO_should_write(bio)) 2453 if (BIO_should_write(bio)) {
2454 return (SSL_ERROR_WANT_WRITE); 2454 return (SSL_ERROR_WANT_WRITE);
2455 else if (BIO_should_read(bio)) { 2455 } else if (BIO_should_read(bio)) {
2456 /* 2456 /*
2457 * See above (SSL_want_read(s) with 2457 * See above (SSL_want_read(s) with
2458 * BIO_should_write(bio)) 2458 * BIO_should_write(bio))
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-23 15:08:06 +0000