summaryrefslogtreecommitdiff
path: root/src/lib/libssl/s3_lib.c
diff options
context:
space:
mode:
authorguenther <>2014-04-19 08:52:32 +0000
committerguenther <>2014-04-19 08:52:32 +0000
commit9e60d35ac1ade619b0d44538f7f50f62c1514194 (patch)
tree1c8e1f947cd7380525a7312a9e96fad2690b90fa /src/lib/libssl/s3_lib.c
parent8ffabaf4eba42faf2565cf746f06a82adf194000 (diff)
downloadopenbsd-9e60d35ac1ade619b0d44538f7f50f62c1514194.tar.gz
openbsd-9e60d35ac1ade619b0d44538f7f50f62c1514194.tar.bz2
openbsd-9e60d35ac1ade619b0d44538f7f50f62c1514194.zip
More KNF and style consistency tweaks
Diffstat (limited to 'src/lib/libssl/s3_lib.c')
-rw-r--r--src/lib/libssl/s3_lib.c17
1 files changed, 9 insertions, 8 deletions
diff --git a/src/lib/libssl/s3_lib.c b/src/lib/libssl/s3_lib.c
index fe638e84a9..95e5c903ec 100644
--- a/src/lib/libssl/s3_lib.c
+++ b/src/lib/libssl/s3_lib.c
@@ -2754,8 +2754,8 @@ ssl3_num_ciphers(void)
2754 return (SSL3_NUM_CIPHERS); 2754 return (SSL3_NUM_CIPHERS);
2755} 2755}
2756 2756
2757const SSL_CIPHER 2757const SSL_CIPHER *
2758*ssl3_get_cipher(unsigned int u) 2758ssl3_get_cipher(unsigned int u)
2759{ 2759{
2760 if (u < SSL3_NUM_CIPHERS) 2760 if (u < SSL3_NUM_CIPHERS)
2761 return (&(ssl3_ciphers[SSL3_NUM_CIPHERS - 1 - u])); 2761 return (&(ssl3_ciphers[SSL3_NUM_CIPHERS - 1 - u]));
@@ -3470,8 +3470,8 @@ ssl3_ctx_callback_ctrl(SSL_CTX *ctx, int cmd, void (*fp)(void))
3470 3470
3471/* This function needs to check if the ciphers required are actually 3471/* This function needs to check if the ciphers required are actually
3472 * available */ 3472 * available */
3473const SSL_CIPHER 3473const SSL_CIPHER *
3474*ssl3_get_cipher_by_char(const unsigned char *p) 3474ssl3_get_cipher_by_char(const unsigned char *p)
3475{ 3475{
3476 SSL_CIPHER c; 3476 SSL_CIPHER c;
3477 const SSL_CIPHER *cp; 3477 const SSL_CIPHER *cp;
@@ -3954,10 +3954,11 @@ ssl3_renegotiate_check(SSL *s)
3954 if (s->s3->renegotiate) { 3954 if (s->s3->renegotiate) {
3955 if ((s->s3->rbuf.left == 0) && (s->s3->wbuf.left == 0) && 3955 if ((s->s3->rbuf.left == 0) && (s->s3->wbuf.left == 0) &&
3956 !SSL_in_init(s)) { 3956 !SSL_in_init(s)) {
3957/* 3957 /*
3958if we are the server, and we have sent a 'RENEGOTIATE' message, we 3958 * If we are the server, and we have sent
3959need to go to SSL_ST_ACCEPT. 3959 * a 'RENEGOTIATE' message, we need to go
3960*/ 3960 * to SSL_ST_ACCEPT.
3961 */
3961 /* SSL_ST_ACCEPT */ 3962 /* SSL_ST_ACCEPT */
3962 s->state = SSL_ST_RENEGOTIATE; 3963 s->state = SSL_ST_RENEGOTIATE;
3963 s->s3->renegotiate = 0; 3964 s->s3->renegotiate = 0;