summaryrefslogtreecommitdiffstats
path: root/lib/libssl/src/ssl/s3_lib.c
diff options
context:
space:
mode:
authorguenther <guenther@openbsd.org>2014-04-19 08:52:32 +0000
committerguenther <guenther@openbsd.org>2014-04-19 08:52:32 +0000
commitdbea66cd1623e97296cb30d20896a9c0c5976d2c (patch)
tree19fdc86fc22b0040ec8adf299f852dd795e70bb8 /lib/libssl/src/ssl/s3_lib.c
parenttiny fix: Remove duplicate rows, they appeared after importing less 444 (diff)
downloadwireguard-openbsd-dbea66cd1623e97296cb30d20896a9c0c5976d2c.tar.xz
wireguard-openbsd-dbea66cd1623e97296cb30d20896a9c0c5976d2c.zip
More KNF and style consistency tweaks
Diffstat (limited to 'lib/libssl/src/ssl/s3_lib.c')
-rw-r--r--lib/libssl/src/ssl/s3_lib.c17
1 files changed, 9 insertions, 8 deletions
diff --git a/lib/libssl/src/ssl/s3_lib.c b/lib/libssl/src/ssl/s3_lib.c
index fe638e84a92..95e5c903ec8 100644
--- a/lib/libssl/src/ssl/s3_lib.c
+++ b/lib/libssl/src/ssl/s3_lib.c
@@ -2754,8 +2754,8 @@ ssl3_num_ciphers(void)
return (SSL3_NUM_CIPHERS);
}
-const SSL_CIPHER
-*ssl3_get_cipher(unsigned int u)
+const SSL_CIPHER *
+ssl3_get_cipher(unsigned int u)
{
if (u < SSL3_NUM_CIPHERS)
return (&(ssl3_ciphers[SSL3_NUM_CIPHERS - 1 - u]));
@@ -3470,8 +3470,8 @@ ssl3_ctx_callback_ctrl(SSL_CTX *ctx, int cmd, void (*fp)(void))
/* This function needs to check if the ciphers required are actually
* available */
-const SSL_CIPHER
-*ssl3_get_cipher_by_char(const unsigned char *p)
+const SSL_CIPHER *
+ssl3_get_cipher_by_char(const unsigned char *p)
{
SSL_CIPHER c;
const SSL_CIPHER *cp;
@@ -3954,10 +3954,11 @@ ssl3_renegotiate_check(SSL *s)
if (s->s3->renegotiate) {
if ((s->s3->rbuf.left == 0) && (s->s3->wbuf.left == 0) &&
!SSL_in_init(s)) {
-/*
-if we are the server, and we have sent a 'RENEGOTIATE' message, we
-need to go to SSL_ST_ACCEPT.
-*/
+ /*
+ * If we are the server, and we have sent
+ * a 'RENEGOTIATE' message, we need to go
+ * to SSL_ST_ACCEPT.
+ */
/* SSL_ST_ACCEPT */
s->state = SSL_ST_RENEGOTIATE;
s->s3->renegotiate = 0;