diff options
author | tedu <> | 2014-05-29 18:19:57 +0000 |
---|---|---|
committer | tedu <> | 2014-05-29 18:19:57 +0000 |
commit | 79d3d3375125787d87d7909cc2151955849ff4ce (patch) | |
tree | 0a06948daee094c6cde887ed5918680ed97c745c /src | |
parent | f059420ac3553b9b8e3c10b2f241536ecb40d50c (diff) | |
download | openbsd-79d3d3375125787d87d7909cc2151955849ff4ce.tar.gz openbsd-79d3d3375125787d87d7909cc2151955849ff4ce.tar.bz2 openbsd-79d3d3375125787d87d7909cc2151955849ff4ce.zip |
line up else better
Diffstat (limited to 'src')
-rw-r--r-- | src/lib/libssl/s3_clnt.c | 7 | ||||
-rw-r--r-- | src/lib/libssl/src/ssl/s3_clnt.c | 7 |
2 files changed, 4 insertions, 10 deletions
diff --git a/src/lib/libssl/s3_clnt.c b/src/lib/libssl/s3_clnt.c index 4df299de9d..7b4b3cce02 100644 --- a/src/lib/libssl/s3_clnt.c +++ b/src/lib/libssl/s3_clnt.c | |||
@@ -1413,8 +1413,7 @@ ssl3_get_key_exchange(SSL *s) | |||
1413 | } | 1413 | } |
1414 | s->session->sess_cert->peer_rsa_tmp = rsa; | 1414 | s->session->sess_cert->peer_rsa_tmp = rsa; |
1415 | rsa = NULL; | 1415 | rsa = NULL; |
1416 | } | 1416 | } else if (alg_k & SSL_kEDH) { |
1417 | else if (alg_k & SSL_kEDH) { | ||
1418 | if ((dh = DH_new()) == NULL) { | 1417 | if ((dh = DH_new()) == NULL) { |
1419 | SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE, | 1418 | SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE, |
1420 | ERR_R_DH_LIB); | 1419 | ERR_R_DH_LIB); |
@@ -1483,9 +1482,7 @@ ssl3_get_key_exchange(SSL *s) | |||
1483 | SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE, | 1482 | SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE, |
1484 | SSL_R_TRIED_TO_USE_UNSUPPORTED_CIPHER); | 1483 | SSL_R_TRIED_TO_USE_UNSUPPORTED_CIPHER); |
1485 | goto f_err; | 1484 | goto f_err; |
1486 | } | 1485 | } else if (alg_k & SSL_kEECDH) { |
1487 | |||
1488 | else if (alg_k & SSL_kEECDH) { | ||
1489 | EC_GROUP *ngroup; | 1486 | EC_GROUP *ngroup; |
1490 | const EC_GROUP *group; | 1487 | const EC_GROUP *group; |
1491 | 1488 | ||
diff --git a/src/lib/libssl/src/ssl/s3_clnt.c b/src/lib/libssl/src/ssl/s3_clnt.c index 4df299de9d..7b4b3cce02 100644 --- a/src/lib/libssl/src/ssl/s3_clnt.c +++ b/src/lib/libssl/src/ssl/s3_clnt.c | |||
@@ -1413,8 +1413,7 @@ ssl3_get_key_exchange(SSL *s) | |||
1413 | } | 1413 | } |
1414 | s->session->sess_cert->peer_rsa_tmp = rsa; | 1414 | s->session->sess_cert->peer_rsa_tmp = rsa; |
1415 | rsa = NULL; | 1415 | rsa = NULL; |
1416 | } | 1416 | } else if (alg_k & SSL_kEDH) { |
1417 | else if (alg_k & SSL_kEDH) { | ||
1418 | if ((dh = DH_new()) == NULL) { | 1417 | if ((dh = DH_new()) == NULL) { |
1419 | SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE, | 1418 | SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE, |
1420 | ERR_R_DH_LIB); | 1419 | ERR_R_DH_LIB); |
@@ -1483,9 +1482,7 @@ ssl3_get_key_exchange(SSL *s) | |||
1483 | SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE, | 1482 | SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE, |
1484 | SSL_R_TRIED_TO_USE_UNSUPPORTED_CIPHER); | 1483 | SSL_R_TRIED_TO_USE_UNSUPPORTED_CIPHER); |
1485 | goto f_err; | 1484 | goto f_err; |
1486 | } | 1485 | } else if (alg_k & SSL_kEECDH) { |
1487 | |||
1488 | else if (alg_k & SSL_kEECDH) { | ||
1489 | EC_GROUP *ngroup; | 1486 | EC_GROUP *ngroup; |
1490 | const EC_GROUP *group; | 1487 | const EC_GROUP *group; |
1491 | 1488 | ||