First pass at applying KNF to the OpenSSL code, which almost makes it

readable. This pass is whitespace only and can readily be verified using
tr and md5.

4 files changed, 6272 insertions, 7364 deletions

diff --git a/src/lib/libssl/s3_clnt.c b/src/lib/libssl/s3_clnt.c
index 64e7be8d67..b9ca6b6f9b 100644
--- a/src/lib/libssl/s3_clnt.c
+++ b/src/lib/libssl/s3_clnt.c
@@ -168,62 +168,60 @@
 #endif
 
 static const SSL_METHOD *ssl3_get_client_method(int ver);
-static int ca_dn_cmp(const X509_NAME * const *a,const X509_NAME * const *b);
+static int ca_dn_cmp(const X509_NAME * const *a, const X509_NAME * const *b);
 
-static const SSL_METHOD *ssl3_get_client_method(int ver)
-        {
+static const SSL_METHOD
+*ssl3_get_client_method(int ver)
+{
         if (ver == SSL3_VERSION)
-                return(SSLv3_client_method());
+                return (SSLv3_client_method());
         else
-                return(NULL);
-        }
+                return (NULL);
+}
 
 IMPLEMENT_ssl3_meth_func(SSLv3_client_method,
-                        ssl_undefined_function,
-                        ssl3_connect,
-                        ssl3_get_client_method)
+    ssl_undefined_function, ssl3_connect, ssl3_get_client_method)
 
-int ssl3_connect(SSL *s)
-        {
-        BUF_MEM *buf=NULL;
-        unsigned long Time=(unsigned long)time(NULL);
-        void (*cb)(const SSL *ssl,int type,int val)=NULL;
-        int ret= -1;
-        int new_state,state,skip=0;
+int
+ssl3_connect(SSL *s)
+{
+        BUF_MEM *buf = NULL;
+        unsigned long Time = (unsigned long)time(NULL);
+        void (*cb)(const SSL *ssl, int type, int val) = NULL;
+        int ret = -1;
+        int new_state, state, skip = 0;
 
-        RAND_add(&Time,sizeof(Time),0);
+        RAND_add(&Time, sizeof(Time), 0);
         ERR_clear_error();
         errno = 0;
 
         if (s->info_callback != NULL)
-                cb=s->info_callback;
+                cb = s->info_callback;
         else if (s->ctx->info_callback != NULL)
-                cb=s->ctx->info_callback;
-        
+                cb = s->ctx->info_callback;
+
         s->in_handshake++;
-        if (!SSL_in_init(s) || SSL_in_before(s)) SSL_clear(s); 
+        if (!SSL_in_init(s) || SSL_in_before(s))
+                SSL_clear(s);
 
 #ifndef OPENSSL_NO_HEARTBEATS
         /* If we're awaiting a HeartbeatResponse, pretend we
          * already got and don't await it anymore, because
          * Heartbeats don't make sense during handshakes anyway.
          */
-        if (s->tlsext_hb_pending)
-                {
+        if (s->tlsext_hb_pending) {
                 s->tlsext_hb_pending = 0;
                 s->tlsext_hb_seq++;
-                }
+        }
 #endif
 
-        for (;;)
-                {
-                state=s->state;
+        for (;;) {
+                state = s->state;
 
-                switch(s->state)
-                        {
+                switch (s->state) {
                 case SSL_ST_RENEGOTIATE:
-                        s->renegotiate=1;
-                        s->state=SSL_ST_CONNECT;
+                        s->renegotiate = 1;
+                        s->state = SSL_ST_CONNECT;
                         s->ctx->stats.sess_connect_renegotiate++;
                         /* break */
                 case SSL_ST_BEFORE:
@@ -231,173 +229,172 @@ int ssl3_connect(SSL *s)
                 case SSL_ST_BEFORE|SSL_ST_CONNECT:
                 case SSL_ST_OK|SSL_ST_CONNECT:
 
-                        s->server=0;
-                        if (cb != NULL) cb(s,SSL_CB_HANDSHAKE_START,1);
+                        s->server = 0;
+                        if (cb != NULL)
+                                cb(s, SSL_CB_HANDSHAKE_START, 1);
 
-                        if ((s->version & 0xff00 ) != 0x0300)
-                                {
+                        if ((s->version & 0xff00 ) != 0x0300) {
                                 SSLerr(SSL_F_SSL3_CONNECT, ERR_R_INTERNAL_ERROR);
                                 ret = -1;
                                 goto end;
-                                }
-                                
+                        }
+
                         /* s->version=SSL3_VERSION; */
-                        s->type=SSL_ST_CONNECT;
+                        s->type = SSL_ST_CONNECT;
 
-                        if (s->init_buf == NULL)
-                                {
-                                if ((buf=BUF_MEM_new()) == NULL)
-                                        {
-                                        ret= -1;
+                        if (s->init_buf == NULL) {
+                                if ((buf = BUF_MEM_new()) == NULL) {
+                                        ret = -1;
                                         goto end;
-                                        }
-                                if (!BUF_MEM_grow(buf,SSL3_RT_MAX_PLAIN_LENGTH))
-                                        {
-                                        ret= -1;
+                                }
+                                if (!BUF_MEM_grow(buf, SSL3_RT_MAX_PLAIN_LENGTH)) {
+                                        ret = -1;
                                         goto end;
-                                        }
-                                s->init_buf=buf;
-                                buf=NULL;
                                 }
+                                s->init_buf = buf;
+                                buf = NULL;
+                        }
 
-                        if (!ssl3_setup_buffers(s)) { ret= -1; goto end; }
+                        if (!ssl3_setup_buffers(s)) {
+                                ret = -1;
+                                goto end;
+                        }
 
                         /* setup buffing BIO */
-                        if (!ssl_init_wbio_buffer(s,0)) { ret= -1; goto end; }
+                        if (!ssl_init_wbio_buffer(s, 0)) {
+                                ret = -1;
+                                goto end;
+                        }
 
                         /* don't push the buffering BIO quite yet */
 
                         ssl3_init_finished_mac(s);
 
-                        s->state=SSL3_ST_CW_CLNT_HELLO_A;
+                        s->state = SSL3_ST_CW_CLNT_HELLO_A;
                         s->ctx->stats.sess_connect++;
-                        s->init_num=0;
+                        s->init_num = 0;
                         break;
 
                 case SSL3_ST_CW_CLNT_HELLO_A:
                 case SSL3_ST_CW_CLNT_HELLO_B:
 
-                        s->shutdown=0;
-                        ret=ssl3_client_hello(s);
-                        if (ret <= 0) goto end;
-                        s->state=SSL3_ST_CR_SRVR_HELLO_A;
-                        s->init_num=0;
+                        s->shutdown = 0;
+                        ret = ssl3_client_hello(s);
+                        if (ret <= 0)
+                                goto end;
+                        s->state = SSL3_ST_CR_SRVR_HELLO_A;
+                        s->init_num = 0;
 
                         /* turn on buffering for the next lot of output */
                         if (s->bbio != s->wbio)
-                                s->wbio=BIO_push(s->bbio,s->wbio);
+                                s->wbio = BIO_push(s->bbio, s->wbio);
 
                         break;
 
                 case SSL3_ST_CR_SRVR_HELLO_A:
                 case SSL3_ST_CR_SRVR_HELLO_B:
-                        ret=ssl3_get_server_hello(s);
-                        if (ret <= 0) goto end;
+                        ret = ssl3_get_server_hello(s);
+                        if (ret <= 0)
+                                goto end;
 
-                        if (s->hit)
-                                {
-                                s->state=SSL3_ST_CR_FINISHED_A;
+                        if (s->hit) {
+                                s->state = SSL3_ST_CR_FINISHED_A;
 #ifndef OPENSSL_NO_TLSEXT
-                                if (s->tlsext_ticket_expected)
-                                        {
+                                if (s->tlsext_ticket_expected) {
                                         /* receive renewed session ticket */
-                                        s->state=SSL3_ST_CR_SESSION_TICKET_A;
-                                        }
-#endif
+                                        s->state = SSL3_ST_CR_SESSION_TICKET_A;
                                 }
-                        else
-                                s->state=SSL3_ST_CR_CERT_A;
-                        s->init_num=0;
+#endif
+                        } else
+                                s->state = SSL3_ST_CR_CERT_A;
+                        s->init_num = 0;
                         break;
 
                 case SSL3_ST_CR_CERT_A:
                 case SSL3_ST_CR_CERT_B:
 #ifndef OPENSSL_NO_TLSEXT
-                        ret=ssl3_check_finished(s);
-                        if (ret <= 0) goto end;
-                        if (ret == 2)
-                                {
+                        ret = ssl3_check_finished(s);
+                        if (ret <= 0)
+                                goto end;
+                        if (ret == 2) {
                                 s->hit = 1;
                                 if (s->tlsext_ticket_expected)
-                                        s->state=SSL3_ST_CR_SESSION_TICKET_A;
+                                        s->state = SSL3_ST_CR_SESSION_TICKET_A;
                                 else
-                                        s->state=SSL3_ST_CR_FINISHED_A;
-                                s->init_num=0;
+                                        s->state = SSL3_ST_CR_FINISHED_A;
+                                s->init_num = 0;
                                 break;
-                                }
+                        }
 #endif
                         /* Check if it is anon DH/ECDH */
                         /* or PSK */
                         if (!(s->s3->tmp.new_cipher->algorithm_auth & SSL_aNULL) &&
-                            !(s->s3->tmp.new_cipher->algorithm_mkey & SSL_kPSK))
-                                {
-                                ret=ssl3_get_server_certificate(s);
-                                if (ret <= 0) goto end;
+                                !(s->s3->tmp.new_cipher->algorithm_mkey & SSL_kPSK)) {
+                                ret = ssl3_get_server_certificate(s);
+                                if (ret <= 0)
+                                        goto end;
 #ifndef OPENSSL_NO_TLSEXT
                                 if (s->tlsext_status_expected)
-                                        s->state=SSL3_ST_CR_CERT_STATUS_A;
+                                        s->state = SSL3_ST_CR_CERT_STATUS_A;
                                 else
-                                        s->state=SSL3_ST_CR_KEY_EXCH_A;
-                                }
-                        else
-                                {
+                                        s->state = SSL3_ST_CR_KEY_EXCH_A;
+                        } else {
                                 skip = 1;
-                                s->state=SSL3_ST_CR_KEY_EXCH_A;
-                                }
+                                s->state = SSL3_ST_CR_KEY_EXCH_A;
+                        }
 #else
-                                }
-                        else
-                                skip=1;
+                        } else
+                                skip = 1;
 
-                        s->state=SSL3_ST_CR_KEY_EXCH_A;
+                        s->state = SSL3_ST_CR_KEY_EXCH_A;
 #endif
-                        s->init_num=0;
+                        s->init_num = 0;
                         break;
 
                 case SSL3_ST_CR_KEY_EXCH_A:
                 case SSL3_ST_CR_KEY_EXCH_B:
-                        ret=ssl3_get_key_exchange(s);
-                        if (ret <= 0) goto end;
-                        s->state=SSL3_ST_CR_CERT_REQ_A;
-                        s->init_num=0;
+                        ret = ssl3_get_key_exchange(s);
+                        if (ret <= 0)
+                                goto end;
+                        s->state = SSL3_ST_CR_CERT_REQ_A;
+                        s->init_num = 0;
 
                         /* at this point we check that we have the
                          * required stuff from the server */
-                        if (!ssl3_check_cert_and_algorithm(s))
-                                {
-                                ret= -1;
+                        if (!ssl3_check_cert_and_algorithm(s)) {
+                                ret = -1;
                                 goto end;
-                                }
+                        }
                         break;
 
                 case SSL3_ST_CR_CERT_REQ_A:
                 case SSL3_ST_CR_CERT_REQ_B:
-                        ret=ssl3_get_certificate_request(s);
-                        if (ret <= 0) goto end;
-                        s->state=SSL3_ST_CR_SRVR_DONE_A;
-                        s->init_num=0;
+                        ret = ssl3_get_certificate_request(s);
+                        if (ret <= 0)
+                                goto end;
+                        s->state = SSL3_ST_CR_SRVR_DONE_A;
+                        s->init_num = 0;
                         break;
 
                 case SSL3_ST_CR_SRVR_DONE_A:
                 case SSL3_ST_CR_SRVR_DONE_B:
-                        ret=ssl3_get_server_done(s);
-                        if (ret <= 0) goto end;
+                        ret = ssl3_get_server_done(s);
+                        if (ret <= 0)
+                                goto end;
 #ifndef OPENSSL_NO_SRP
-                        if (s->s3->tmp.new_cipher->algorithm_mkey & SSL_kSRP)
-                                {
-                                if ((ret = SRP_Calc_A_param(s))<=0)
-                                        {
-                                        SSLerr(SSL_F_SSL3_CONNECT,SSL_R_SRP_A_CALC);
-                                        ssl3_send_alert(s,SSL3_AL_FATAL,SSL_AD_INTERNAL_ERROR);
+                        if (s->s3->tmp.new_cipher->algorithm_mkey & SSL_kSRP) {
+                                if ((ret = SRP_Calc_A_param(s)) <= 0) {
+                                        SSLerr(SSL_F_SSL3_CONNECT, SSL_R_SRP_A_CALC);
+                                        ssl3_send_alert(s, SSL3_AL_FATAL, SSL_AD_INTERNAL_ERROR);
                                         goto end;
-                                        }
                                 }
+                        }
 #endif
                         if (s->s3->tmp.cert_req)
-                                s->state=SSL3_ST_CW_CERT_A;
+                                s->state = SSL3_ST_CW_CERT_A;
                         else
-                                s->state=SSL3_ST_CW_KEY_EXCH_A;
-                        s->init_num=0;
+                                s->state = SSL3_ST_CW_KEY_EXCH_A;
+                        s->init_num = 0;
 
                         break;
 
@@ -405,16 +402,18 @@ int ssl3_connect(SSL *s)
                 case SSL3_ST_CW_CERT_B:
                 case SSL3_ST_CW_CERT_C:
                 case SSL3_ST_CW_CERT_D:
-                        ret=ssl3_send_client_certificate(s);
-                        if (ret <= 0) goto end;
-                        s->state=SSL3_ST_CW_KEY_EXCH_A;
-                        s->init_num=0;
+                        ret = ssl3_send_client_certificate(s);
+                        if (ret <= 0)
+                                goto end;
+                        s->state = SSL3_ST_CW_KEY_EXCH_A;
+                        s->init_num = 0;
                         break;
 
                 case SSL3_ST_CW_KEY_EXCH_A:
                 case SSL3_ST_CW_KEY_EXCH_B:
-                        ret=ssl3_send_client_key_exchange(s);
-                        if (ret <= 0) goto end;
+                        ret = ssl3_send_client_key_exchange(s);
+                        if (ret <= 0)
+                                goto end;
                         /* EAY EAY EAY need to check for DH fix cert
                          * sent back */
                         /* For TLS, cert_req is set to 2, so a cert chain
@@ -426,170 +425,165 @@ int ssl3_connect(SSL *s)
                          * message when client's ECDH public key is sent 
                          * inside the client certificate.
                          */
-                        if (s->s3->tmp.cert_req == 1)
-                                {
-                                s->state=SSL3_ST_CW_CERT_VRFY_A;
-                                }
-                        else
-                                {
-                                s->state=SSL3_ST_CW_CHANGE_A;
-                                s->s3->change_cipher_spec=0;
-                                }
-                        if (s->s3->flags & TLS1_FLAGS_SKIP_CERT_VERIFY)
-                                {
-                                s->state=SSL3_ST_CW_CHANGE_A;
-                                s->s3->change_cipher_spec=0;
-                                }
+                        if (s->s3->tmp.cert_req == 1) {
+                                s->state = SSL3_ST_CW_CERT_VRFY_A;
+                        } else {
+                                s->state = SSL3_ST_CW_CHANGE_A;
+                                s->s3->change_cipher_spec = 0;
+                        }
+                        if (s->s3->flags & TLS1_FLAGS_SKIP_CERT_VERIFY) {
+                                s->state = SSL3_ST_CW_CHANGE_A;
+                                s->s3->change_cipher_spec = 0;
+                        }
 
-                        s->init_num=0;
+                        s->init_num = 0;
                         break;
 
                 case SSL3_ST_CW_CERT_VRFY_A:
                 case SSL3_ST_CW_CERT_VRFY_B:
-                        ret=ssl3_send_client_verify(s);
-                        if (ret <= 0) goto end;
-                        s->state=SSL3_ST_CW_CHANGE_A;
-                        s->init_num=0;
-                        s->s3->change_cipher_spec=0;
+                        ret = ssl3_send_client_verify(s);
+                        if (ret <= 0)
+                                goto end;
+                        s->state = SSL3_ST_CW_CHANGE_A;
+                        s->init_num = 0;
+                        s->s3->change_cipher_spec = 0;
                         break;
 
                 case SSL3_ST_CW_CHANGE_A:
                 case SSL3_ST_CW_CHANGE_B:
-                        ret=ssl3_send_change_cipher_spec(s,
-                                SSL3_ST_CW_CHANGE_A,SSL3_ST_CW_CHANGE_B);
-                        if (ret <= 0) goto end;
+                        ret = ssl3_send_change_cipher_spec(s,
+                        SSL3_ST_CW_CHANGE_A, SSL3_ST_CW_CHANGE_B);
+                        if (ret <= 0)
+                                goto end;
 
 #if defined(OPENSSL_NO_TLSEXT) || defined(OPENSSL_NO_NEXTPROTONEG)
-                        s->state=SSL3_ST_CW_FINISHED_A;
+                        s->state = SSL3_ST_CW_FINISHED_A;
 #else
                         if (s->s3->next_proto_neg_seen)
-                                s->state=SSL3_ST_CW_NEXT_PROTO_A;
+                                s->state = SSL3_ST_CW_NEXT_PROTO_A;
                         else
-                                s->state=SSL3_ST_CW_FINISHED_A;
+                                s->state = SSL3_ST_CW_FINISHED_A;
 #endif
-                        s->init_num=0;
+                        s->init_num = 0;
 
-                        s->session->cipher=s->s3->tmp.new_cipher;
+                        s->session->cipher = s->s3->tmp.new_cipher;
 #ifdef OPENSSL_NO_COMP
-                        s->session->compress_meth=0;
+                        s->session->compress_meth = 0;
 #else
                         if (s->s3->tmp.new_compression == NULL)
-                                s->session->compress_meth=0;
+                                s->session->compress_meth = 0;
                         else
-                                s->session->compress_meth=
-                                        s->s3->tmp.new_compression->id;
+                                s->session->compress_meth =
+                        s->s3->tmp.new_compression->id;
 #endif
-                        if (!s->method->ssl3_enc->setup_key_block(s))
-                                {
-                                ret= -1;
+                        if (!s->method->ssl3_enc->setup_key_block(s)) {
+                                ret = -1;
                                 goto end;
-                                }
+                        }
 
                         if (!s->method->ssl3_enc->change_cipher_state(s,
-                                SSL3_CHANGE_CIPHER_CLIENT_WRITE))
-                                {
-                                ret= -1;
+                                SSL3_CHANGE_CIPHER_CLIENT_WRITE)) {
+                                ret = -1;
                                 goto end;
-                                }
+                        }
 
                         break;
 
 #if !defined(OPENSSL_NO_TLSEXT) && !defined(OPENSSL_NO_NEXTPROTONEG)
                 case SSL3_ST_CW_NEXT_PROTO_A:
                 case SSL3_ST_CW_NEXT_PROTO_B:
-                        ret=ssl3_send_next_proto(s);
-                        if (ret <= 0) goto end;
-                        s->state=SSL3_ST_CW_FINISHED_A;
+                        ret = ssl3_send_next_proto(s);
+                        if (ret <= 0)
+                                goto end;
+                        s->state = SSL3_ST_CW_FINISHED_A;
                         break;
 #endif
 
                 case SSL3_ST_CW_FINISHED_A:
                 case SSL3_ST_CW_FINISHED_B:
-                        ret=ssl3_send_finished(s,
-                                SSL3_ST_CW_FINISHED_A,SSL3_ST_CW_FINISHED_B,
-                                s->method->ssl3_enc->client_finished_label,
-                                s->method->ssl3_enc->client_finished_label_len);
-                        if (ret <= 0) goto end;
-                        s->state=SSL3_ST_CW_FLUSH;
+                        ret = ssl3_send_finished(s,
+                        SSL3_ST_CW_FINISHED_A, SSL3_ST_CW_FINISHED_B,
+                        s->method->ssl3_enc->client_finished_label,
+                        s->method->ssl3_enc->client_finished_label_len);
+                        if (ret <= 0)
+                                goto end;
+                        s->state = SSL3_ST_CW_FLUSH;
 
                         /* clear flags */
-                        s->s3->flags&= ~SSL3_FLAGS_POP_BUFFER;
-                        if (s->hit)
-                                {
-                                s->s3->tmp.next_state=SSL_ST_OK;
-                                if (s->s3->flags & SSL3_FLAGS_DELAY_CLIENT_FINISHED)
-                                        {
-                                        s->state=SSL_ST_OK;
+                        s->s3->flags &= ~SSL3_FLAGS_POP_BUFFER;
+                        if (s->hit) {
+                                s->s3->tmp.next_state = SSL_ST_OK;
+                                if (s->s3->flags & SSL3_FLAGS_DELAY_CLIENT_FINISHED) {
+                                        s->state = SSL_ST_OK;
                                         s->s3->flags|=SSL3_FLAGS_POP_BUFFER;
-                                        s->s3->delay_buf_pop_ret=0;
-                                        }
+                                        s->s3->delay_buf_pop_ret = 0;
                                 }
-                        else
-                                {
+                        } else {
 #ifndef OPENSSL_NO_TLSEXT
                                 /* Allow NewSessionTicket if ticket expected */
                                 if (s->tlsext_ticket_expected)
-                                        s->s3->tmp.next_state=SSL3_ST_CR_SESSION_TICKET_A;
+                                        s->s3->tmp.next_state = SSL3_ST_CR_SESSION_TICKET_A;
                                 else
 #endif
-                                
-                                s->s3->tmp.next_state=SSL3_ST_CR_FINISHED_A;
-                                }
-                        s->init_num=0;
+
+                                s->s3->tmp.next_state = SSL3_ST_CR_FINISHED_A;
+                        }
+                        s->init_num = 0;
                         break;
 
 #ifndef OPENSSL_NO_TLSEXT
                 case SSL3_ST_CR_SESSION_TICKET_A:
                 case SSL3_ST_CR_SESSION_TICKET_B:
-                        ret=ssl3_get_new_session_ticket(s);
-                        if (ret <= 0) goto end;
-                        s->state=SSL3_ST_CR_FINISHED_A;
-                        s->init_num=0;
-                break;
+                        ret = ssl3_get_new_session_ticket(s);
+                        if (ret <= 0)
+                                goto end;
+                        s->state = SSL3_ST_CR_FINISHED_A;
+                        s->init_num = 0;
+                        break;
 
                 case SSL3_ST_CR_CERT_STATUS_A:
                 case SSL3_ST_CR_CERT_STATUS_B:
-                        ret=ssl3_get_cert_status(s);
-                        if (ret <= 0) goto end;
-                        s->state=SSL3_ST_CR_KEY_EXCH_A;
-                        s->init_num=0;
-                break;
+                        ret = ssl3_get_cert_status(s);
+                        if (ret <= 0)
+                                goto end;
+                        s->state = SSL3_ST_CR_KEY_EXCH_A;
+                        s->init_num = 0;
+                        break;
 #endif
 
                 case SSL3_ST_CR_FINISHED_A:
                 case SSL3_ST_CR_FINISHED_B:
 
-                        ret=ssl3_get_finished(s,SSL3_ST_CR_FINISHED_A,
-                                SSL3_ST_CR_FINISHED_B);
-                        if (ret <= 0) goto end;
+                        ret = ssl3_get_finished(s, SSL3_ST_CR_FINISHED_A,
+                            SSL3_ST_CR_FINISHED_B);
+                        if (ret <= 0)
+                                goto end;
 
                         if (s->hit)
-                                s->state=SSL3_ST_CW_CHANGE_A;
+                                s->state = SSL3_ST_CW_CHANGE_A;
                         else
-                                s->state=SSL_ST_OK;
-                        s->init_num=0;
+                                s->state = SSL_ST_OK;
+                        s->init_num = 0;
                         break;
 
                 case SSL3_ST_CW_FLUSH:
-                        s->rwstate=SSL_WRITING;
-                        if (BIO_flush(s->wbio) <= 0)
-                                {
-                                ret= -1;
+                        s->rwstate = SSL_WRITING;
+                        if (BIO_flush(s->wbio) <= 0) {
+                                ret = -1;
                                 goto end;
-                                }
-                        s->rwstate=SSL_NOTHING;
-                        s->state=s->s3->tmp.next_state;
+                        }
+                        s->rwstate = SSL_NOTHING;
+                        s->state = s->s3->tmp.next_state;
                         break;
 
                 case SSL_ST_OK:
                         /* clean a few things up */
                         ssl3_cleanup_key_block(s);
 
-                        if (s->init_buf != NULL)
-                                {
+                        if (s->init_buf != NULL) {
                                 BUF_MEM_free(s->init_buf);
-                                s->init_buf=NULL;
-                                }
+                                s->init_buf = NULL;
+                        }
 
                         /* If we are not 'joining' the last two packets,
                          * remove the buffering now */
@@ -597,63 +591,63 @@ int ssl3_connect(SSL *s)
                                 ssl_free_wbio_buffer(s);
                         /* else do it later in ssl3_write */
 
-                        s->init_num=0;
-                        s->renegotiate=0;
-                        s->new_session=0;
+                        s->init_num = 0;
+                        s->renegotiate = 0;
+                        s->new_session = 0;
 
-                        ssl_update_cache(s,SSL_SESS_CACHE_CLIENT);
-                        if (s->hit) s->ctx->stats.sess_hit++;
+                        ssl_update_cache(s, SSL_SESS_CACHE_CLIENT);
+                        if (s->hit)
+                                s->ctx->stats.sess_hit++;
 
-                        ret=1;
+                        ret = 1;
                         /* s->server=0; */
-                        s->handshake_func=ssl3_connect;
+                        s->handshake_func = ssl3_connect;
                         s->ctx->stats.sess_connect_good++;
 
-                        if (cb != NULL) cb(s,SSL_CB_HANDSHAKE_DONE,1);
+                        if (cb != NULL)
+                                cb(s, SSL_CB_HANDSHAKE_DONE, 1);
 
                         goto end;
                         /* break; */
-                        
+
                 default:
-                        SSLerr(SSL_F_SSL3_CONNECT,SSL_R_UNKNOWN_STATE);
-                        ret= -1;
+                        SSLerr(SSL_F_SSL3_CONNECT, SSL_R_UNKNOWN_STATE);
+                        ret = -1;
                         goto end;
                         /* break; */
-                        }
+                }
 
                 /* did we do anything */
-                if (!s->s3->tmp.reuse_message && !skip)
-                        {
-                        if (s->debug)
-                                {
-                                if ((ret=BIO_flush(s->wbio)) <= 0)
+                if (!s->s3->tmp.reuse_message && !skip) {
+                        if (s->debug) {
+                                if ((ret = BIO_flush(s->wbio)) <= 0)
                                         goto end;
-                                }
+                        }
 
-                        if ((cb != NULL) && (s->state != state))
-                                {
-                                new_state=s->state;
-                                s->state=state;
-                                cb(s,SSL_CB_CONNECT_LOOP,1);
-                                s->state=new_state;
-                                }
+                        if ((cb != NULL) && (s->state != state)) {
+                                new_state = s->state;
+                                s->state = state;
+                                cb(s, SSL_CB_CONNECT_LOOP, 1);
+                                s->state = new_state;
                         }
-                skip=0;
                 }
+                skip = 0;
+        }
 end:
         s->in_handshake--;
         if (buf != NULL)
                 BUF_MEM_free(buf);
         if (cb != NULL)
-                cb(s,SSL_CB_CONNECT_EXIT,ret);
-        return(ret);
-        }
+                cb(s, SSL_CB_CONNECT_EXIT, ret);
+        return (ret);
+}
 
 
-int ssl3_client_hello(SSL *s)
-        {
+int
+ssl3_client_hello(SSL *s)
+{
         unsigned char *buf;
-        unsigned char *p,*d;
+        unsigned char *p, *d;
         int i;
         unsigned long l;
 #ifndef OPENSSL_NO_COMP
@@ -661,31 +655,29 @@ int ssl3_client_hello(SSL *s)
         SSL_COMP *comp;
 #endif
 
-        buf=(unsigned char *)s->init_buf->data;
-        if (s->state == SSL3_ST_CW_CLNT_HELLO_A)
-                {
+        buf = (unsigned char *)s->init_buf->data;
+        if (s->state == SSL3_ST_CW_CLNT_HELLO_A) {
                 SSL_SESSION *sess = s->session;
                 if ((sess == NULL) ||
-                        (sess->ssl_version != s->version) ||
+                    (sess->ssl_version != s->version) ||
 #ifdef OPENSSL_NO_TLSEXT
-                        !sess->session_id_length ||
+                    !sess->session_id_length ||
 #else
-                        (!sess->session_id_length && !sess->tlsext_tick) ||
+                    (!sess->session_id_length && !sess->tlsext_tick) ||
 #endif
-                        (sess->not_resumable))
-                        {
-                        if (!ssl_get_new_session(s,0))
+                    (sess->not_resumable)) {
+                        if (!ssl_get_new_session(s, 0))
                                 goto err;
-                        }
+                }
                 /* else use the pre-loaded session */
 
-                p=s->s3->client_random;
+                p = s->s3->client_random;
 
                 if (ssl_fill_hello_random(s, 0, p, SSL3_RANDOM_SIZE) <= 0)
                         goto err;
 
                 /* Do the message type and length last */
-                d=p= &(buf[4]);
+                d = p= &(buf[4]);
 
                 /* version indicates the negotiated version: for example from
                  * an SSLv2/v3 compatible client hello). The client_version
@@ -717,562 +709,510 @@ int ssl3_client_hello(SSL *s)
                  * the negotiated version.
                  */
 #if 0
-                *(p++)=s->version>>8;
-                *(p++)=s->version&0xff;
-                s->client_version=s->version;
+                *(p++) = s->version >> 8;
+                *(p++) = s->version&0xff;
+                s->client_version = s->version;
 #else
-                *(p++)=s->client_version>>8;
-                *(p++)=s->client_version&0xff;
+                *(p++) = s->client_version >> 8;
+                *(p++) = s->client_version&0xff;
 #endif
 
                 /* Random stuff */
-                memcpy(p,s->s3->client_random,SSL3_RANDOM_SIZE);
-                p+=SSL3_RANDOM_SIZE;
+                memcpy(p, s->s3->client_random, SSL3_RANDOM_SIZE);
+                p += SSL3_RANDOM_SIZE;
 
                 /* Session ID */
                 if (s->new_session)
-                        i=0;
+                        i = 0;
                 else
-                        i=s->session->session_id_length;
-                *(p++)=i;
-                if (i != 0)
-                        {
-                        if (i > (int)sizeof(s->session->session_id))
-                                {
+                        i = s->session->session_id_length;
+                *(p++) = i;
+                if (i != 0) {
+                        if (i > (int)sizeof(s->session->session_id)) {
                                 SSLerr(SSL_F_SSL3_CLIENT_HELLO, ERR_R_INTERNAL_ERROR);
                                 goto err;
-                                }
-                        memcpy(p,s->session->session_id,i);
-                        p+=i;
                         }
-                
+                        memcpy(p, s->session->session_id, i);
+                        p += i;
+                }
+
                 /* Ciphers supported */
-                i=ssl_cipher_list_to_bytes(s,SSL_get_ciphers(s),&(p[2]),0);
-                if (i == 0)
-                        {
-                        SSLerr(SSL_F_SSL3_CLIENT_HELLO,SSL_R_NO_CIPHERS_AVAILABLE);
+                i = ssl_cipher_list_to_bytes(s, SSL_get_ciphers(s), &(p[2]), 0);
+                if (i == 0) {
+                        SSLerr(SSL_F_SSL3_CLIENT_HELLO, SSL_R_NO_CIPHERS_AVAILABLE);
                         goto err;
-                        }
+                }
 #ifdef OPENSSL_MAX_TLS1_2_CIPHER_LENGTH
                         /* Some servers hang if client hello > 256 bytes
                          * as hack workaround chop number of supported ciphers
                          * to keep it well below this if we use TLS v1.2
                          */
-                        if (TLS1_get_version(s) >= TLS1_2_VERSION
-                                && i > OPENSSL_MAX_TLS1_2_CIPHER_LENGTH)
-                                i = OPENSSL_MAX_TLS1_2_CIPHER_LENGTH & ~1;
+                if (TLS1_get_version(s) >= TLS1_2_VERSION &&
+                    i > OPENSSL_MAX_TLS1_2_CIPHER_LENGTH)
+                        i = OPENSSL_MAX_TLS1_2_CIPHER_LENGTH & ~1;
 #endif
-                s2n(i,p);
-                p+=i;
+                s2n(i, p);
+                p += i;
 
                 /* COMPRESSION */
 #ifdef OPENSSL_NO_COMP
-                *(p++)=1;
+                *(p++) = 1;
 #else
 
-                if ((s->options & SSL_OP_NO_COMPRESSION)
-                                        || !s->ctx->comp_methods)
-                        j=0;
+                if ((s->options & SSL_OP_NO_COMPRESSION) ||
+                    !s->ctx->comp_methods)
+                        j = 0;
                 else
-                        j=sk_SSL_COMP_num(s->ctx->comp_methods);
-                *(p++)=1+j;
-                for (i=0; i<j; i++)
-                        {
-                        comp=sk_SSL_COMP_value(s->ctx->comp_methods,i);
-                        *(p++)=comp->id;
-                        }
+                        j = sk_SSL_COMP_num(s->ctx->comp_methods);
+                *(p++) = 1 + j;
+                for (i = 0; i < j; i++) {
+                        comp = sk_SSL_COMP_value(s->ctx->comp_methods, i);
+                        *(p++) = comp->id;
+                }
 #endif
-                *(p++)=0; /* Add the NULL method */
+                *(p++) = 0; /* Add the NULL method */
 
 #ifndef OPENSSL_NO_TLSEXT
                 /* TLS extensions*/
-                if (ssl_prepare_clienthello_tlsext(s) <= 0)
-                        {
-                        SSLerr(SSL_F_SSL3_CLIENT_HELLO,SSL_R_CLIENTHELLO_TLSEXT);
+                if (ssl_prepare_clienthello_tlsext(s) <= 0) {
+                        SSLerr(SSL_F_SSL3_CLIENT_HELLO, SSL_R_CLIENTHELLO_TLSEXT);
                         goto err;
-                        }
-                if ((p = ssl_add_clienthello_tlsext(s, p, buf+SSL3_RT_MAX_PLAIN_LENGTH)) == NULL)
-                        {
-                        SSLerr(SSL_F_SSL3_CLIENT_HELLO,ERR_R_INTERNAL_ERROR);
+                }
+                if ((p = ssl_add_clienthello_tlsext(s, p, buf + SSL3_RT_MAX_PLAIN_LENGTH)) == NULL) {
+                        SSLerr(SSL_F_SSL3_CLIENT_HELLO, ERR_R_INTERNAL_ERROR);
                         goto err;
-                        }
+                }
 #endif
-                
-                l=(p-d);
-                d=buf;
-                *(d++)=SSL3_MT_CLIENT_HELLO;
-                l2n3(l,d);
 
-                s->state=SSL3_ST_CW_CLNT_HELLO_B;
+                l = (p - d);
+                d = buf;
+                *(d++) = SSL3_MT_CLIENT_HELLO;
+                l2n3(l, d);
+
+                s->state = SSL3_ST_CW_CLNT_HELLO_B;
                 /* number of bytes to write */
-                s->init_num=p-buf;
-                s->init_off=0;
-                }
+                s->init_num = p - buf;
+                s->init_off = 0;
+        }
 
         /* SSL3_ST_CW_CLNT_HELLO_B */
-        return(ssl3_do_write(s,SSL3_RT_HANDSHAKE));
+        return (ssl3_do_write(s, SSL3_RT_HANDSHAKE));
 err:
-        return(-1);
-        }
+        return (-1);
+}
 
-int ssl3_get_server_hello(SSL *s)
-        {
+int
+ssl3_get_server_hello(SSL *s)
+{
         STACK_OF(SSL_CIPHER) *sk;
         const SSL_CIPHER *c;
-        unsigned char *p,*d;
-        int i,al,ok;
+        unsigned char *p, *d;
+        int i, al, ok;
         unsigned int j;
         long n;
 #ifndef OPENSSL_NO_COMP
         SSL_COMP *comp;
 #endif
 
-        n=s->method->ssl_get_message(s,
-                SSL3_ST_CR_SRVR_HELLO_A,
-                SSL3_ST_CR_SRVR_HELLO_B,
-                -1,
-                20000, /* ?? */
-                &ok);
+        n = s->method->ssl_get_message(s, SSL3_ST_CR_SRVR_HELLO_A,
+            SSL3_ST_CR_SRVR_HELLO_B, -1, 20000, /* ?? */ &ok);
 
-        if (!ok) return((int)n);
+        if (!ok)
+                return ((int)n);
 
-        if ( SSL_version(s) == DTLS1_VERSION || SSL_version(s) == DTLS1_BAD_VER)
-                {
-                if ( s->s3->tmp.message_type == DTLS1_MT_HELLO_VERIFY_REQUEST)
-                        {
-                        if ( s->d1->send_cookie == 0)
-                                {
+        if (SSL_version(s) == DTLS1_VERSION || SSL_version(s) == DTLS1_BAD_VER) {
+                if (s->s3->tmp.message_type == DTLS1_MT_HELLO_VERIFY_REQUEST) {
+                        if (s->d1->send_cookie == 0) {
                                 s->s3->tmp.reuse_message = 1;
                                 return 1;
-                                }
+                        }
                         else /* already sent a cookie */
-                                {
-                                al=SSL_AD_UNEXPECTED_MESSAGE;
-                                SSLerr(SSL_F_SSL3_GET_SERVER_HELLO,SSL_R_BAD_MESSAGE_TYPE);
+                        {
+                                al = SSL_AD_UNEXPECTED_MESSAGE;
+                                SSLerr(SSL_F_SSL3_GET_SERVER_HELLO, SSL_R_BAD_MESSAGE_TYPE);
                                 goto f_err;
-                                }
                         }
                 }
-        
-        if ( s->s3->tmp.message_type != SSL3_MT_SERVER_HELLO)
-                {
-                al=SSL_AD_UNEXPECTED_MESSAGE;
-                SSLerr(SSL_F_SSL3_GET_SERVER_HELLO,SSL_R_BAD_MESSAGE_TYPE);
+        }
+
+        if (s->s3->tmp.message_type != SSL3_MT_SERVER_HELLO) {
+                al = SSL_AD_UNEXPECTED_MESSAGE;
+                SSLerr(SSL_F_SSL3_GET_SERVER_HELLO, SSL_R_BAD_MESSAGE_TYPE);
                 goto f_err;
-                }
+        }
 
-        d=p=(unsigned char *)s->init_msg;
+        d = p=(unsigned char *)s->init_msg;
 
-        if ((p[0] != (s->version>>8)) || (p[1] != (s->version&0xff)))
-                {
-                SSLerr(SSL_F_SSL3_GET_SERVER_HELLO,SSL_R_WRONG_SSL_VERSION);
-                s->version=(s->version&0xff00)|p[1];
-                al=SSL_AD_PROTOCOL_VERSION;
+        if ((p[0] != (s->version >> 8)) || (p[1] != (s->version & 0xff))) {
+                SSLerr(SSL_F_SSL3_GET_SERVER_HELLO, SSL_R_WRONG_SSL_VERSION);
+                s->version = (s->version&0xff00)|p[1];
+                al = SSL_AD_PROTOCOL_VERSION;
                 goto f_err;
-                }
-        p+=2;
+        }
+        p += 2;
 
         /* load the server hello data */
         /* load the server random */
-        memcpy(s->s3->server_random,p,SSL3_RANDOM_SIZE);
-        p+=SSL3_RANDOM_SIZE;
+        memcpy(s->s3->server_random, p, SSL3_RANDOM_SIZE);
+        p += SSL3_RANDOM_SIZE;
 
         /* get the session-id */
         j= *(p++);
 
-        if ((j > sizeof s->session->session_id) || (j > SSL3_SESSION_ID_SIZE))
-                {
-                al=SSL_AD_ILLEGAL_PARAMETER;
-                SSLerr(SSL_F_SSL3_GET_SERVER_HELLO,SSL_R_SSL3_SESSION_ID_TOO_LONG);
+        if ((j > sizeof s->session->session_id) || (j > SSL3_SESSION_ID_SIZE)) {
+                al = SSL_AD_ILLEGAL_PARAMETER;
+                SSLerr(SSL_F_SSL3_GET_SERVER_HELLO, SSL_R_SSL3_SESSION_ID_TOO_LONG);
                 goto f_err;
-                }
+        }
 
 #ifndef OPENSSL_NO_TLSEXT
         /* check if we want to resume the session based on external pre-shared secret */
-        if (s->version >= TLS1_VERSION && s->tls_session_secret_cb)
-                {
-                SSL_CIPHER *pref_cipher=NULL;
-                s->session->master_key_length=sizeof(s->session->master_key);
+        if (s->version >= TLS1_VERSION && s->tls_session_secret_cb) {
+                SSL_CIPHER *pref_cipher = NULL;
+                s->session->master_key_length = sizeof(s->session->master_key);
                 if (s->tls_session_secret_cb(s, s->session->master_key,
-                                             &s->session->master_key_length,
-                                             NULL, &pref_cipher,
-                                             s->tls_session_secret_cb_arg))
-                        {
+                    &s->session->master_key_length, NULL, &pref_cipher,
+                    s->tls_session_secret_cb_arg)) {
                         s->session->cipher = pref_cipher ?
-                                pref_cipher : ssl_get_cipher_by_char(s, p+j);
-                        }
+                        pref_cipher : ssl_get_cipher_by_char(s, p + j);
                 }
+        }
 #endif /* OPENSSL_NO_TLSEXT */
 
-        if (j != 0 && j == s->session->session_id_length
-            && memcmp(p,s->session->session_id,j) == 0)
-            {
-            if(s->sid_ctx_length != s->session->sid_ctx_length
-               || memcmp(s->session->sid_ctx,s->sid_ctx,s->sid_ctx_length))
-                {
-                /* actually a client application bug */
-                al=SSL_AD_ILLEGAL_PARAMETER;
-                SSLerr(SSL_F_SSL3_GET_SERVER_HELLO,SSL_R_ATTEMPT_TO_REUSE_SESSION_IN_DIFFERENT_CONTEXT);
-                goto f_err;
+        if (j != 0 && j == s->session->session_id_length &&
+            memcmp(p, s->session->session_id, j) == 0) {
+                if (s->sid_ctx_length != s->session->sid_ctx_length ||
+                    memcmp(s->session->sid_ctx, s->sid_ctx, s->sid_ctx_length)) {
+                        /* actually a client application bug */
+                        al = SSL_AD_ILLEGAL_PARAMETER;
+                        SSLerr(SSL_F_SSL3_GET_SERVER_HELLO, SSL_R_ATTEMPT_TO_REUSE_SESSION_IN_DIFFERENT_CONTEXT);
+                        goto f_err;
                 }
-            s->hit=1;
-            }
+                s->hit = 1;
+        }
         else    /* a miss or crap from the other end */
-                {
+        {
                 /* If we were trying for session-id reuse, make a new
                  * SSL_SESSION so we don't stuff up other people */
-                s->hit=0;
-                if (s->session->session_id_length > 0)
-                        {
-                        if (!ssl_get_new_session(s,0))
-                                {
-                                al=SSL_AD_INTERNAL_ERROR;
+                s->hit = 0;
+                if (s->session->session_id_length > 0) {
+                        if (!ssl_get_new_session(s, 0)) {
+                                al = SSL_AD_INTERNAL_ERROR;
                                 goto f_err;
-                                }
                         }
-                s->session->session_id_length=j;
-                memcpy(s->session->session_id,p,j); /* j could be 0 */
                 }
-        p+=j;
-        c=ssl_get_cipher_by_char(s,p);
-        if (c == NULL)
-                {
+                s->session->session_id_length = j;
+                memcpy(s->session->session_id,p,j); /* j could be 0 */
+        }
+        p += j;
+        c = ssl_get_cipher_by_char(s, p);
+        if (c == NULL) {
                 /* unknown cipher */
-                al=SSL_AD_ILLEGAL_PARAMETER;
-                SSLerr(SSL_F_SSL3_GET_SERVER_HELLO,SSL_R_UNKNOWN_CIPHER_RETURNED);
+                al = SSL_AD_ILLEGAL_PARAMETER;
+                SSLerr(SSL_F_SSL3_GET_SERVER_HELLO, SSL_R_UNKNOWN_CIPHER_RETURNED);
                 goto f_err;
-                }
+        }
         /* TLS v1.2 only ciphersuites require v1.2 or later */
-        if ((c->algorithm_ssl & SSL_TLSV1_2) && 
-                (TLS1_get_version(s) < TLS1_2_VERSION))
-                {
-                al=SSL_AD_ILLEGAL_PARAMETER;
-                SSLerr(SSL_F_SSL3_GET_SERVER_HELLO,SSL_R_WRONG_CIPHER_RETURNED);
+        if ((c->algorithm_ssl & SSL_TLSV1_2) &&
+            (TLS1_get_version(s) < TLS1_2_VERSION)) {
+                al = SSL_AD_ILLEGAL_PARAMETER;
+                SSLerr(SSL_F_SSL3_GET_SERVER_HELLO, SSL_R_WRONG_CIPHER_RETURNED);
                 goto f_err;
-                }
-        p+=ssl_put_cipher_by_char(s,NULL,NULL);
+        }
+        p += ssl_put_cipher_by_char(s, NULL, NULL);
 
-        sk=ssl_get_ciphers_by_id(s);
-        i=sk_SSL_CIPHER_find(sk,c);
-        if (i < 0)
-                {
+        sk = ssl_get_ciphers_by_id(s);
+        i = sk_SSL_CIPHER_find(sk, c);
+        if (i < 0) {
                 /* we did not say we would use this cipher */
-                al=SSL_AD_ILLEGAL_PARAMETER;
-                SSLerr(SSL_F_SSL3_GET_SERVER_HELLO,SSL_R_WRONG_CIPHER_RETURNED);
+                al = SSL_AD_ILLEGAL_PARAMETER;
+                SSLerr(SSL_F_SSL3_GET_SERVER_HELLO, SSL_R_WRONG_CIPHER_RETURNED);
                 goto f_err;
-                }
+        }
 
         /* Depending on the session caching (internal/external), the cipher
            and/or cipher_id values may not be set. Make sure that
            cipher_id is set and use it for comparison. */
         if (s->session->cipher)
                 s->session->cipher_id = s->session->cipher->id;
-        if (s->hit && (s->session->cipher_id != c->id))
-                {
+        if (s->hit && (s->session->cipher_id != c->id)) {
 /* Workaround is now obsolete */
 #if 0
-                if (!(s->options &
-                        SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG))
+                if (!(s->options & SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG))
 #endif
-                        {
-                        al=SSL_AD_ILLEGAL_PARAMETER;
-                        SSLerr(SSL_F_SSL3_GET_SERVER_HELLO,SSL_R_OLD_SESSION_CIPHER_NOT_RETURNED);
+                {
+                        al = SSL_AD_ILLEGAL_PARAMETER;
+                        SSLerr(SSL_F_SSL3_GET_SERVER_HELLO, SSL_R_OLD_SESSION_CIPHER_NOT_RETURNED);
                         goto f_err;
-                        }
                 }
-        s->s3->tmp.new_cipher=c;
+        }
+        s->s3->tmp.new_cipher = c;
         /* Don't digest cached records if TLS v1.2: we may need them for
          * client authentication.
          */
-        if (TLS1_get_version(s) < TLS1_2_VERSION && !ssl3_digest_cached_records(s))
-                {
+        if (TLS1_get_version(s) < TLS1_2_VERSION && !ssl3_digest_cached_records(s)) {
                 al = SSL_AD_INTERNAL_ERROR;
                 goto f_err;
-                }
+        }
         /* lets get the compression algorithm */
         /* COMPRESSION */
 #ifdef OPENSSL_NO_COMP
-        if (*(p++) != 0)
-                {
-                al=SSL_AD_ILLEGAL_PARAMETER;
-                SSLerr(SSL_F_SSL3_GET_SERVER_HELLO,SSL_R_UNSUPPORTED_COMPRESSION_ALGORITHM);
+        if (*(p++) != 0) {
+                al = SSL_AD_ILLEGAL_PARAMETER;
+                SSLerr(SSL_F_SSL3_GET_SERVER_HELLO, SSL_R_UNSUPPORTED_COMPRESSION_ALGORITHM);
                 goto f_err;
-                }
+        }
         /* If compression is disabled we'd better not try to resume a session
          * using compression.
          */
-        if (s->session->compress_meth != 0)
-                {
-                al=SSL_AD_INTERNAL_ERROR;
-                SSLerr(SSL_F_SSL3_GET_SERVER_HELLO,SSL_R_INCONSISTENT_COMPRESSION);
+        if (s->session->compress_meth != 0) {
+                al = SSL_AD_INTERNAL_ERROR;
+                SSLerr(SSL_F_SSL3_GET_SERVER_HELLO, SSL_R_INCONSISTENT_COMPRESSION);
                 goto f_err;
-                }
+        }
 #else
         j= *(p++);
-        if (s->hit && j != s->session->compress_meth)
-                {
-                al=SSL_AD_ILLEGAL_PARAMETER;
-                SSLerr(SSL_F_SSL3_GET_SERVER_HELLO,SSL_R_OLD_SESSION_COMPRESSION_ALGORITHM_NOT_RETURNED);
+        if (s->hit && j != s->session->compress_meth) {
+                al = SSL_AD_ILLEGAL_PARAMETER;
+                SSLerr(SSL_F_SSL3_GET_SERVER_HELLO, SSL_R_OLD_SESSION_COMPRESSION_ALGORITHM_NOT_RETURNED);
                 goto f_err;
-                }
+        }
         if (j == 0)
-                comp=NULL;
-        else if (s->options & SSL_OP_NO_COMPRESSION)
-                {
-                al=SSL_AD_ILLEGAL_PARAMETER;
-                SSLerr(SSL_F_SSL3_GET_SERVER_HELLO,SSL_R_COMPRESSION_DISABLED);
+                comp = NULL;
+        else if (s->options & SSL_OP_NO_COMPRESSION) {
+                al = SSL_AD_ILLEGAL_PARAMETER;
+                SSLerr(SSL_F_SSL3_GET_SERVER_HELLO, SSL_R_COMPRESSION_DISABLED);
                 goto f_err;
-                }
-        else
-                comp=ssl3_comp_find(s->ctx->comp_methods,j);
-        
-        if ((j != 0) && (comp == NULL))
-                {
-                al=SSL_AD_ILLEGAL_PARAMETER;
-                SSLerr(SSL_F_SSL3_GET_SERVER_HELLO,SSL_R_UNSUPPORTED_COMPRESSION_ALGORITHM);
+        } else
+                comp = ssl3_comp_find(s->ctx->comp_methods, j);
+
+        if ((j != 0) && (comp == NULL)) {
+                al = SSL_AD_ILLEGAL_PARAMETER;
+                SSLerr(SSL_F_SSL3_GET_SERVER_HELLO, SSL_R_UNSUPPORTED_COMPRESSION_ALGORITHM);
                 goto f_err;
-                }
-        else
-                {
-                s->s3->tmp.new_compression=comp;
-                }
+        } else {
+                s->s3->tmp.new_compression = comp;
+        }
 #endif
 
 #ifndef OPENSSL_NO_TLSEXT
         /* TLS extensions*/
-        if (s->version >= SSL3_VERSION)
-                {
-                if (!ssl_parse_serverhello_tlsext(s,&p,d,n, &al))
-                        {
+        if (s->version >= SSL3_VERSION) {
+                if (!ssl_parse_serverhello_tlsext(s, &p, d, n, &al)) {
                         /* 'al' set by ssl_parse_serverhello_tlsext */
-                        SSLerr(SSL_F_SSL3_GET_SERVER_HELLO,SSL_R_PARSE_TLSEXT);
-                        goto f_err; 
-                        }
-                if (ssl_check_serverhello_tlsext(s) <= 0)
-                        {
-                        SSLerr(SSL_F_SSL3_GET_SERVER_HELLO,SSL_R_SERVERHELLO_TLSEXT);
-                                goto err;
-                        }
+                        SSLerr(SSL_F_SSL3_GET_SERVER_HELLO, SSL_R_PARSE_TLSEXT);
+                        goto f_err;
+
                 }
+                if (ssl_check_serverhello_tlsext(s) <= 0) {
+                        SSLerr(SSL_F_SSL3_GET_SERVER_HELLO, SSL_R_SERVERHELLO_TLSEXT);
+                        goto err;
+                }
+        }
 #endif
 
-        if (p != (d+n))
-                {
+        if (p != (d + n)) {
                 /* wrong packet length */
-                al=SSL_AD_DECODE_ERROR;
-                SSLerr(SSL_F_SSL3_GET_SERVER_HELLO,SSL_R_BAD_PACKET_LENGTH);
+                al = SSL_AD_DECODE_ERROR;
+                SSLerr(SSL_F_SSL3_GET_SERVER_HELLO, SSL_R_BAD_PACKET_LENGTH);
                 goto f_err;
-                }
+        }
 
-        return(1);
+        return (1);
 f_err:
-        ssl3_send_alert(s,SSL3_AL_FATAL,al);
+        ssl3_send_alert(s, SSL3_AL_FATAL, al);
 err:
-        return(-1);
-        }
+        return (-1);
+}
 
-int ssl3_get_server_certificate(SSL *s)
-        {
-        int al,i,ok,ret= -1;
-        unsigned long n,nc,llen,l;
-        X509 *x=NULL;
-        const unsigned char *q,*p;
+int
+ssl3_get_server_certificate(SSL *s)
+{
+        int al, i, ok, ret = -1;
+        unsigned long n, nc, llen, l;
+        X509 *x = NULL;
+        const unsigned char *q, *p;
         unsigned char *d;
-        STACK_OF(X509) *sk=NULL;
+        STACK_OF(X509) *sk = NULL;
         SESS_CERT *sc;
-        EVP_PKEY *pkey=NULL;
+        EVP_PKEY *pkey = NULL;
         int need_cert = 1; /* VRS: 0=> will allow null cert if auth == KRB5 */
 
-        n=s->method->ssl_get_message(s,
-                SSL3_ST_CR_CERT_A,
-                SSL3_ST_CR_CERT_B,
-                -1,
-                s->max_cert_list,
-                &ok);
+        n = s->method->ssl_get_message(s, SSL3_ST_CR_CERT_A,
+            SSL3_ST_CR_CERT_B, -1, s->max_cert_list, &ok);
 
-        if (!ok) return((int)n);
+        if (!ok)
+                return ((int)n);
 
         if ((s->s3->tmp.message_type == SSL3_MT_SERVER_KEY_EXCHANGE) ||
-                ((s->s3->tmp.new_cipher->algorithm_auth & SSL_aKRB5) && 
-                (s->s3->tmp.message_type == SSL3_MT_SERVER_DONE)))
-                {
-                s->s3->tmp.reuse_message=1;
-                return(1);
-                }
+            ((s->s3->tmp.new_cipher->algorithm_auth & SSL_aKRB5) &&
+            (s->s3->tmp.message_type == SSL3_MT_SERVER_DONE))) {
+                s->s3->tmp.reuse_message = 1;
+                return (1);
+        }
 
-        if (s->s3->tmp.message_type != SSL3_MT_CERTIFICATE)
-                {
-                al=SSL_AD_UNEXPECTED_MESSAGE;
-                SSLerr(SSL_F_SSL3_GET_SERVER_CERTIFICATE,SSL_R_BAD_MESSAGE_TYPE);
+        if (s->s3->tmp.message_type != SSL3_MT_CERTIFICATE) {
+                al = SSL_AD_UNEXPECTED_MESSAGE;
+                SSLerr(SSL_F_SSL3_GET_SERVER_CERTIFICATE, SSL_R_BAD_MESSAGE_TYPE);
                 goto f_err;
-                }
-        p=d=(unsigned char *)s->init_msg;
+        }
+        p = d = (unsigned char *)s->init_msg;
 
-        if ((sk=sk_X509_new_null()) == NULL)
-                {
-                SSLerr(SSL_F_SSL3_GET_SERVER_CERTIFICATE,ERR_R_MALLOC_FAILURE);
+        if ((sk = sk_X509_new_null()) == NULL) {
+                SSLerr(SSL_F_SSL3_GET_SERVER_CERTIFICATE, ERR_R_MALLOC_FAILURE);
                 goto err;
-                }
+        }
 
-        n2l3(p,llen);
-        if (llen+3 != n)
-                {
-                al=SSL_AD_DECODE_ERROR;
-                SSLerr(SSL_F_SSL3_GET_SERVER_CERTIFICATE,SSL_R_LENGTH_MISMATCH);
+        n2l3(p, llen);
+        if (llen + 3 != n) {
+                al = SSL_AD_DECODE_ERROR;
+                SSLerr(SSL_F_SSL3_GET_SERVER_CERTIFICATE, SSL_R_LENGTH_MISMATCH);
                 goto f_err;
-                }
-        for (nc=0; nc<llen; )
-                {
-                n2l3(p,l);
-                if ((l+nc+3) > llen)
-                        {
-                        al=SSL_AD_DECODE_ERROR;
-                        SSLerr(SSL_F_SSL3_GET_SERVER_CERTIFICATE,SSL_R_CERT_LENGTH_MISMATCH);
+        }
+        for (nc = 0; nc < llen; ) {
+                n2l3(p, l);
+                if ((l + nc + 3) > llen) {
+                        al = SSL_AD_DECODE_ERROR;
+                        SSLerr(SSL_F_SSL3_GET_SERVER_CERTIFICATE, SSL_R_CERT_LENGTH_MISMATCH);
                         goto f_err;
-                        }
+                }
 
-                q=p;
-                x=d2i_X509(NULL,&q,l);
-                if (x == NULL)
-                        {
-                        al=SSL_AD_BAD_CERTIFICATE;
-                        SSLerr(SSL_F_SSL3_GET_SERVER_CERTIFICATE,ERR_R_ASN1_LIB);
+                q = p;
+                x = d2i_X509(NULL, &q, l);
+                if (x == NULL) {
+                        al = SSL_AD_BAD_CERTIFICATE;
+                        SSLerr(SSL_F_SSL3_GET_SERVER_CERTIFICATE, ERR_R_ASN1_LIB);
                         goto f_err;
-                        }
-                if (q != (p+l))
-                        {
-                        al=SSL_AD_DECODE_ERROR;
-                        SSLerr(SSL_F_SSL3_GET_SERVER_CERTIFICATE,SSL_R_CERT_LENGTH_MISMATCH);
+                }
+                if (q != (p + l)) {
+                        al = SSL_AD_DECODE_ERROR;
+                        SSLerr(SSL_F_SSL3_GET_SERVER_CERTIFICATE, SSL_R_CERT_LENGTH_MISMATCH);
                         goto f_err;
-                        }
-                if (!sk_X509_push(sk,x))
-                        {
-                        SSLerr(SSL_F_SSL3_GET_SERVER_CERTIFICATE,ERR_R_MALLOC_FAILURE);
+                }
+                if (!sk_X509_push(sk, x)) {
+                        SSLerr(SSL_F_SSL3_GET_SERVER_CERTIFICATE, ERR_R_MALLOC_FAILURE);
                         goto err;
-                        }
-                x=NULL;
-                nc+=l+3;
-                p=q;
                 }
+                x = NULL;
+                nc += l + 3;
+                p = q;
+        }
 
-        i=ssl_verify_cert_chain(s,sk);
+        i = ssl_verify_cert_chain(s, sk);
         if ((s->verify_mode != SSL_VERIFY_NONE) && (i <= 0)
 #ifndef OPENSSL_NO_KRB5
             && !((s->s3->tmp.new_cipher->algorithm_mkey & SSL_kKRB5) &&
-                 (s->s3->tmp.new_cipher->algorithm_auth & SSL_aKRB5))
+            (s->s3->tmp.new_cipher->algorithm_auth & SSL_aKRB5))
 #endif /* OPENSSL_NO_KRB5 */
-                )
-                {
-                al=ssl_verify_alarm_type(s->verify_result);
-                SSLerr(SSL_F_SSL3_GET_SERVER_CERTIFICATE,SSL_R_CERTIFICATE_VERIFY_FAILED);
-                goto f_err; 
-                }
+            ) {
+                al = ssl_verify_alarm_type(s->verify_result);
+                SSLerr(SSL_F_SSL3_GET_SERVER_CERTIFICATE, SSL_R_CERTIFICATE_VERIFY_FAILED);
+                goto f_err;
+
+        }
         ERR_clear_error(); /* but we keep s->verify_result */
 
-        sc=ssl_sess_cert_new();
-        if (sc == NULL) goto err;
+        sc = ssl_sess_cert_new();
+        if (sc == NULL)
+                goto err;
 
-        if (s->session->sess_cert) ssl_sess_cert_free(s->session->sess_cert);
-        s->session->sess_cert=sc;
+        if (s->session->sess_cert)
+                ssl_sess_cert_free(s->session->sess_cert);
+        s->session->sess_cert = sc;
 
-        sc->cert_chain=sk;
+        sc->cert_chain = sk;
         /* Inconsistency alert: cert_chain does include the peer's
          * certificate, which we don't include in s3_srvr.c */
-        x=sk_X509_value(sk,0);
-        sk=NULL;
-        /* VRS 19990621: possible memory leak; sk=null ==> !sk_pop_free() @end*/
+        x = sk_X509_value(sk, 0);
+        sk = NULL;
+        /* VRS 19990621: possible memory leak; sk=null ==> !sk_pop_free() @end*/
 
-        pkey=X509_get_pubkey(x);
+        pkey = X509_get_pubkey(x);
 
         /* VRS: allow null cert if auth == KRB5 */
         need_cert = ((s->s3->tmp.new_cipher->algorithm_mkey & SSL_kKRB5) &&
-                    (s->s3->tmp.new_cipher->algorithm_auth & SSL_aKRB5))
-                    ? 0 : 1;
+        (s->s3->tmp.new_cipher->algorithm_auth & SSL_aKRB5))
+        ? 0 : 1;
 
 #ifdef KSSL_DEBUG
-        printf("pkey,x = %p, %p\n", pkey,x);
-        printf("ssl_cert_type(x,pkey) = %d\n", ssl_cert_type(x,pkey));
+        printf("pkey, x = %p, %p\n", pkey, x);
+        printf("ssl_cert_type(x, pkey) = %d\n", ssl_cert_type(x, pkey));
         printf("cipher, alg, nc = %s, %lx, %lx, %d\n", s->s3->tmp.new_cipher->name,
-                s->s3->tmp.new_cipher->algorithm_mkey, s->s3->tmp.new_cipher->algorithm_auth, need_cert);
+        s->s3->tmp.new_cipher->algorithm_mkey, s->s3->tmp.new_cipher->algorithm_auth, need_cert);
 #endif    /* KSSL_DEBUG */
 
-        if (need_cert && ((pkey == NULL) || EVP_PKEY_missing_parameters(pkey)))
-                {
-                x=NULL;
-                al=SSL3_AL_FATAL;
+        if (need_cert && ((pkey == NULL) || EVP_PKEY_missing_parameters(pkey))) {
+                x = NULL;
+                al = SSL3_AL_FATAL;
                 SSLerr(SSL_F_SSL3_GET_SERVER_CERTIFICATE,
-                        SSL_R_UNABLE_TO_FIND_PUBLIC_KEY_PARAMETERS);
+                SSL_R_UNABLE_TO_FIND_PUBLIC_KEY_PARAMETERS);
                 goto f_err;
-                }
+        }
 
-        i=ssl_cert_type(x,pkey);
-        if (need_cert && i < 0)
-                {
-                x=NULL;
-                al=SSL3_AL_FATAL;
+        i = ssl_cert_type(x, pkey);
+        if (need_cert && i < 0) {
+                x = NULL;
+                al = SSL3_AL_FATAL;
                 SSLerr(SSL_F_SSL3_GET_SERVER_CERTIFICATE,
-                        SSL_R_UNKNOWN_CERTIFICATE_TYPE);
+                SSL_R_UNKNOWN_CERTIFICATE_TYPE);
                 goto f_err;
-                }
+        }
 
-        if (need_cert)
-                {
-                sc->peer_cert_type=i;
-                CRYPTO_add(&x->references,1,CRYPTO_LOCK_X509);
+        if (need_cert) {
+                sc->peer_cert_type = i;
+                CRYPTO_add(&x->references, 1, CRYPTO_LOCK_X509);
                 /* Why would the following ever happen?
                  * We just created sc a couple of lines ago. */
                 if (sc->peer_pkeys[i].x509 != NULL)
                         X509_free(sc->peer_pkeys[i].x509);
-                sc->peer_pkeys[i].x509=x;
-                sc->peer_key= &(sc->peer_pkeys[i]);
+                sc->peer_pkeys[i].x509 = x;
+                sc->peer_key = &(sc->peer_pkeys[i]);
 
                 if (s->session->peer != NULL)
                         X509_free(s->session->peer);
-                CRYPTO_add(&x->references,1,CRYPTO_LOCK_X509);
-                s->session->peer=x;
-                }
-        else
-                {
-                sc->peer_cert_type=i;
-                sc->peer_key= NULL;
+                CRYPTO_add(&x->references, 1, CRYPTO_LOCK_X509);
+                s->session->peer = x;
+        } else {
+                sc->peer_cert_type = i;
+                sc->peer_key = NULL;
 
                 if (s->session->peer != NULL)
                         X509_free(s->session->peer);
-                s->session->peer=NULL;
-                }
+                s->session->peer = NULL;
+        }
         s->session->verify_result = s->verify_result;
 
-        x=NULL;
-        ret=1;
+        x = NULL;
+        ret = 1;
 
-        if (0)
-                {
+        if (0) {
 f_err:
-                ssl3_send_alert(s,SSL3_AL_FATAL,al);
-                }
+                ssl3_send_alert(s, SSL3_AL_FATAL, al);
+        }
 err:
         EVP_PKEY_free(pkey);
         X509_free(x);
-        sk_X509_pop_free(sk,X509_free);
-        return(ret);
-        }
+        sk_X509_pop_free(sk, X509_free);
+        return (ret);
+}
 
-int ssl3_get_key_exchange(SSL *s)
-        {
+int
+ssl3_get_key_exchange(SSL *s)
+{
 #ifndef OPENSSL_NO_RSA
-        unsigned char *q,md_buf[EVP_MAX_MD_SIZE*2];
+        unsigned char *q, md_buf[EVP_MAX_MD_SIZE*2];
 #endif
         EVP_MD_CTX md_ctx;
-        unsigned char *param,*p;
-        int al,i,j,param_len,ok;
-        long n,alg_k,alg_a;
-        EVP_PKEY *pkey=NULL;
+        unsigned char *param, *p;
+        int al, i, j, param_len, ok;
+        long n, alg_k, alg_a;
+        EVP_PKEY *pkey = NULL;
         const EVP_MD *md = NULL;
 #ifndef OPENSSL_NO_RSA
-        RSA *rsa=NULL;
+        RSA *rsa = NULL;
 #endif
 #ifndef OPENSSL_NO_DH
-        DH *dh=NULL;
+        DH *dh = NULL;
 #endif
 #ifndef OPENSSL_NO_ECDH
         EC_KEY *ecdh = NULL;
@@ -1284,336 +1224,291 @@ int ssl3_get_key_exchange(SSL *s)
 
         /* use same message size as in ssl3_get_certificate_request()
          * as ServerKeyExchange message may be skipped */
-        n=s->method->ssl_get_message(s,
-                SSL3_ST_CR_KEY_EXCH_A,
-                SSL3_ST_CR_KEY_EXCH_B,
-                -1,
-                s->max_cert_list,
-                &ok);
-        if (!ok) return((int)n);
-
-        if (s->s3->tmp.message_type != SSL3_MT_SERVER_KEY_EXCHANGE)
-                {
+        n = s->method->ssl_get_message(s, SSL3_ST_CR_KEY_EXCH_A,
+            SSL3_ST_CR_KEY_EXCH_B, -1, s->max_cert_list, &ok);
+        if (!ok)
+                return ((int)n);
+
+        if (s->s3->tmp.message_type != SSL3_MT_SERVER_KEY_EXCHANGE) {
 #ifndef OPENSSL_NO_PSK
                 /* In plain PSK ciphersuite, ServerKeyExchange can be
                    omitted if no identity hint is sent. Set
                    session->sess_cert anyway to avoid problems
                    later.*/
-                if (s->s3->tmp.new_cipher->algorithm_mkey & SSL_kPSK)
-                        {
-                        s->session->sess_cert=ssl_sess_cert_new();
+                if (s->s3->tmp.new_cipher->algorithm_mkey & SSL_kPSK) {
+                        s->session->sess_cert = ssl_sess_cert_new();
                         if (s->ctx->psk_identity_hint)
                                 OPENSSL_free(s->ctx->psk_identity_hint);
                         s->ctx->psk_identity_hint = NULL;
-                        }
-#endif
-                s->s3->tmp.reuse_message=1;
-                return(1);
                 }
+#endif
+                s->s3->tmp.reuse_message = 1;
+                return (1);
+        }
 
-        param=p=(unsigned char *)s->init_msg;
-        if (s->session->sess_cert != NULL)
-                {
+        param = p = (unsigned char *)s->init_msg;
+        if (s->session->sess_cert != NULL) {
 #ifndef OPENSSL_NO_RSA
-                if (s->session->sess_cert->peer_rsa_tmp != NULL)
-                        {
+                if (s->session->sess_cert->peer_rsa_tmp != NULL) {
                         RSA_free(s->session->sess_cert->peer_rsa_tmp);
-                        s->session->sess_cert->peer_rsa_tmp=NULL;
-                        }
+                        s->session->sess_cert->peer_rsa_tmp = NULL;
+                }
 #endif
 #ifndef OPENSSL_NO_DH
-                if (s->session->sess_cert->peer_dh_tmp)
-                        {
+                if (s->session->sess_cert->peer_dh_tmp) {
                         DH_free(s->session->sess_cert->peer_dh_tmp);
-                        s->session->sess_cert->peer_dh_tmp=NULL;
-                        }
+                        s->session->sess_cert->peer_dh_tmp = NULL;
+                }
 #endif
 #ifndef OPENSSL_NO_ECDH
-                if (s->session->sess_cert->peer_ecdh_tmp)
-                        {
+                if (s->session->sess_cert->peer_ecdh_tmp) {
                         EC_KEY_free(s->session->sess_cert->peer_ecdh_tmp);
-                        s->session->sess_cert->peer_ecdh_tmp=NULL;
-                        }
-#endif
-                }
-        else
-                {
-                s->session->sess_cert=ssl_sess_cert_new();
+                        s->session->sess_cert->peer_ecdh_tmp = NULL;
                 }
+#endif
+        } else {
+                s->session->sess_cert = ssl_sess_cert_new();
+        }
 
-        param_len=0;
-        alg_k=s->s3->tmp.new_cipher->algorithm_mkey;
-        alg_a=s->s3->tmp.new_cipher->algorithm_auth;
+        param_len = 0;
+        alg_k = s->s3->tmp.new_cipher->algorithm_mkey;
+        alg_a = s->s3->tmp.new_cipher->algorithm_auth;
         EVP_MD_CTX_init(&md_ctx);
 
 #ifndef OPENSSL_NO_PSK
-        if (alg_k & SSL_kPSK)
-                {
-                char tmp_id_hint[PSK_MAX_IDENTITY_LEN+1];
+        if (alg_k & SSL_kPSK) {
+                char tmp_id_hint[PSK_MAX_IDENTITY_LEN + 1];
 
-                al=SSL_AD_HANDSHAKE_FAILURE;
-                n2s(p,i);
-                param_len=i+2;
+                al = SSL_AD_HANDSHAKE_FAILURE;
+                n2s(p, i);
+                param_len = i + 2;
                 /* Store PSK identity hint for later use, hint is used
                  * in ssl3_send_client_key_exchange.  Assume that the
                  * maximum length of a PSK identity hint can be as
                  * long as the maximum length of a PSK identity. */
-                if (i > PSK_MAX_IDENTITY_LEN)
-                        {
+                if (i > PSK_MAX_IDENTITY_LEN) {
                         SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,
-                                SSL_R_DATA_LENGTH_TOO_LONG);
+                        SSL_R_DATA_LENGTH_TOO_LONG);
                         goto f_err;
-                        }
-                if (param_len > n)
-                        {
-                        al=SSL_AD_DECODE_ERROR;
+                }
+                if (param_len > n) {
+                        al = SSL_AD_DECODE_ERROR;
                         SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,
-                                SSL_R_BAD_PSK_IDENTITY_HINT_LENGTH);
+                        SSL_R_BAD_PSK_IDENTITY_HINT_LENGTH);
                         goto f_err;
-                        }
+                }
                 /* If received PSK identity hint contains NULL
                  * characters, the hint is truncated from the first
                  * NULL. p may not be ending with NULL, so create a
                  * NULL-terminated string. */
                 memcpy(tmp_id_hint, p, i);
-                memset(tmp_id_hint+i, 0, PSK_MAX_IDENTITY_LEN+1-i);
+                memset(tmp_id_hint + i, 0, PSK_MAX_IDENTITY_LEN + 1 - i);
                 if (s->ctx->psk_identity_hint != NULL)
                         OPENSSL_free(s->ctx->psk_identity_hint);
                 s->ctx->psk_identity_hint = BUF_strdup(tmp_id_hint);
-                if (s->ctx->psk_identity_hint == NULL)
-                        {
+                if (s->ctx->psk_identity_hint == NULL) {
                         SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE, ERR_R_MALLOC_FAILURE);
                         goto f_err;
-                        }          
-
-                p+=i;
-                n-=param_len;
                 }
-        else
+
+                p += i;
+                n -= param_len;
+        } else
 #endif /* !OPENSSL_NO_PSK */
 #ifndef OPENSSL_NO_SRP
-        if (alg_k & SSL_kSRP)
-                {
-                n2s(p,i);
-                param_len=i+2;
-                if (param_len > n)
-                        {
-                        al=SSL_AD_DECODE_ERROR;
-                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_BAD_SRP_N_LENGTH);
+        if (alg_k & SSL_kSRP) {
+                n2s(p, i);
+                param_len = i + 2;
+                if (param_len > n) {
+                        al = SSL_AD_DECODE_ERROR;
+                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE, SSL_R_BAD_SRP_N_LENGTH);
                         goto f_err;
-                        }
-                if (!(s->srp_ctx.N=BN_bin2bn(p,i,NULL)))
-                        {
-                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,ERR_R_BN_LIB);
+                }
+                if (!(s->srp_ctx.N = BN_bin2bn(p, i, NULL))) {
+                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE, ERR_R_BN_LIB);
                         goto err;
-                        }
-                p+=i;
+                }
+                p += i;
 
-                n2s(p,i);
-                param_len+=i+2;
-                if (param_len > n)
-                        {
-                        al=SSL_AD_DECODE_ERROR;
-                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_BAD_SRP_G_LENGTH);
+                n2s(p, i);
+                param_len += i + 2;
+                if (param_len > n) {
+                        al = SSL_AD_DECODE_ERROR;
+                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE, SSL_R_BAD_SRP_G_LENGTH);
                         goto f_err;
-                        }
-                if (!(s->srp_ctx.g=BN_bin2bn(p,i,NULL)))
-                        {
-                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,ERR_R_BN_LIB);
+                }
+                if (!(s->srp_ctx.g = BN_bin2bn(p, i, NULL))) {
+                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE, ERR_R_BN_LIB);
                         goto err;
-                        }
-                p+=i;
+                }
+                p += i;
 
                 i = (unsigned int)(p[0]);
                 p++;
-                param_len+=i+1;
-                if (param_len > n)
-                        {
-                        al=SSL_AD_DECODE_ERROR;
-                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_BAD_SRP_S_LENGTH);
+                param_len += i + 1;
+                if (param_len > n) {
+                        al = SSL_AD_DECODE_ERROR;
+                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE, SSL_R_BAD_SRP_S_LENGTH);
                         goto f_err;
-                        }
-                if (!(s->srp_ctx.s=BN_bin2bn(p,i,NULL)))
-                        {
-                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,ERR_R_BN_LIB);
+                }
+                if (!(s->srp_ctx.s = BN_bin2bn(p, i, NULL))) {
+                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE, ERR_R_BN_LIB);
                         goto err;
-                        }
-                p+=i;
+                }
+                p += i;
 
-                n2s(p,i);
-                param_len+=i+2;
-                if (param_len > n)
-                        {
-                        al=SSL_AD_DECODE_ERROR;
-                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_BAD_SRP_B_LENGTH);
+                n2s(p, i);
+                param_len += i + 2;
+                if (param_len > n) {
+                        al = SSL_AD_DECODE_ERROR;
+                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE, SSL_R_BAD_SRP_B_LENGTH);
                         goto f_err;
-                        }
-                if (!(s->srp_ctx.B=BN_bin2bn(p,i,NULL)))
-                        {
-                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,ERR_R_BN_LIB);
+                }
+                if (!(s->srp_ctx.B = BN_bin2bn(p, i, NULL))) {
+                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE, ERR_R_BN_LIB);
                         goto err;
-                        }
-                p+=i;
-                n-=param_len;
+                }
+                p += i;
+                n -= param_len;
 
 /* We must check if there is a certificate */
 #ifndef OPENSSL_NO_RSA
                 if (alg_a & SSL_aRSA)
-                        pkey=X509_get_pubkey(s->session->sess_cert->peer_pkeys[SSL_PKEY_RSA_ENC].x509);
+                        pkey = X509_get_pubkey(s->session->sess_cert->peer_pkeys[SSL_PKEY_RSA_ENC].x509);
 #else
                 if (0)
-                        ;
+;
 #endif
 #ifndef OPENSSL_NO_DSA
                 else if (alg_a & SSL_aDSS)
-                        pkey=X509_get_pubkey(s->session->sess_cert->peer_pkeys[SSL_PKEY_DSA_SIGN].x509);
+                        pkey = X509_get_pubkey(s->session->sess_cert->peer_pkeys[SSL_PKEY_DSA_SIGN].x509);
 #endif
-                }
-        else
+        } else
 #endif /* !OPENSSL_NO_SRP */
 #ifndef OPENSSL_NO_RSA
-        if (alg_k & SSL_kRSA)
-                {
-                if ((rsa=RSA_new()) == NULL)
-                        {
-                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,ERR_R_MALLOC_FAILURE);
+        if (alg_k & SSL_kRSA) {
+                if ((rsa = RSA_new()) == NULL) {
+                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE, ERR_R_MALLOC_FAILURE);
                         goto err;
-                        }
-                n2s(p,i);
-                param_len=i+2;
-                if (param_len > n)
-                        {
-                        al=SSL_AD_DECODE_ERROR;
-                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_BAD_RSA_MODULUS_LENGTH);
+                }
+                n2s(p, i);
+                param_len = i + 2;
+                if (param_len > n) {
+                        al = SSL_AD_DECODE_ERROR;
+                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE, SSL_R_BAD_RSA_MODULUS_LENGTH);
                         goto f_err;
-                        }
-                if (!(rsa->n=BN_bin2bn(p,i,rsa->n)))
-                        {
-                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,ERR_R_BN_LIB);
+                }
+                if (!(rsa->n = BN_bin2bn(p, i, rsa->n))) {
+                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE, ERR_R_BN_LIB);
                         goto err;
-                        }
-                p+=i;
+                }
+                p += i;
 
-                n2s(p,i);
-                param_len+=i+2;
-                if (param_len > n)
-                        {
-                        al=SSL_AD_DECODE_ERROR;
-                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_BAD_RSA_E_LENGTH);
+                n2s(p, i);
+                param_len += i + 2;
+                if (param_len > n) {
+                        al = SSL_AD_DECODE_ERROR;
+                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE, SSL_R_BAD_RSA_E_LENGTH);
                         goto f_err;
-                        }
-                if (!(rsa->e=BN_bin2bn(p,i,rsa->e)))
-                        {
-                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,ERR_R_BN_LIB);
+                }
+                if (!(rsa->e = BN_bin2bn(p, i, rsa->e))) {
+                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE, ERR_R_BN_LIB);
                         goto err;
-                        }
-                p+=i;
-                n-=param_len;
+                }
+                p += i;
+                n -= param_len;
 
                 /* this should be because we are using an export cipher */
                 if (alg_a & SSL_aRSA)
-                        pkey=X509_get_pubkey(s->session->sess_cert->peer_pkeys[SSL_PKEY_RSA_ENC].x509);
-                else
-                        {
-                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,ERR_R_INTERNAL_ERROR);
+                        pkey = X509_get_pubkey(s->session->sess_cert->peer_pkeys[SSL_PKEY_RSA_ENC].x509);
+                else {
+                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE, ERR_R_INTERNAL_ERROR);
                         goto err;
-                        }
-                s->session->sess_cert->peer_rsa_tmp=rsa;
-                rsa=NULL;
                 }
+                s->session->sess_cert->peer_rsa_tmp = rsa;
+                rsa = NULL;
+        }
 #else /* OPENSSL_NO_RSA */
         if (0)
-                ;
+;
 #endif
 #ifndef OPENSSL_NO_DH
-        else if (alg_k & SSL_kEDH)
-                {
-                if ((dh=DH_new()) == NULL)
-                        {
-                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,ERR_R_DH_LIB);
+        else if (alg_k & SSL_kEDH) {
+                if ((dh = DH_new()) == NULL) {
+                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE, ERR_R_DH_LIB);
                         goto err;
-                        }
-                n2s(p,i);
-                param_len=i+2;
-                if (param_len > n)
-                        {
-                        al=SSL_AD_DECODE_ERROR;
-                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_BAD_DH_P_LENGTH);
+                }
+                n2s(p, i);
+                param_len = i + 2;
+                if (param_len > n) {
+                        al = SSL_AD_DECODE_ERROR;
+                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE, SSL_R_BAD_DH_P_LENGTH);
                         goto f_err;
-                        }
-                if (!(dh->p=BN_bin2bn(p,i,NULL)))
-                        {
-                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,ERR_R_BN_LIB);
+                }
+                if (!(dh->p = BN_bin2bn(p, i, NULL))) {
+                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE, ERR_R_BN_LIB);
                         goto err;
-                        }
-                p+=i;
+                }
+                p += i;
 
-                n2s(p,i);
-                param_len+=i+2;
-                if (param_len > n)
-                        {
-                        al=SSL_AD_DECODE_ERROR;
-                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_BAD_DH_G_LENGTH);
+                n2s(p, i);
+                param_len += i + 2;
+                if (param_len > n) {
+                        al = SSL_AD_DECODE_ERROR;
+                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE, SSL_R_BAD_DH_G_LENGTH);
                         goto f_err;
-                        }
-                if (!(dh->g=BN_bin2bn(p,i,NULL)))
-                        {
-                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,ERR_R_BN_LIB);
+                }
+                if (!(dh->g = BN_bin2bn(p, i, NULL))) {
+                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE, ERR_R_BN_LIB);
                         goto err;
-                        }
-                p+=i;
+                }
+                p += i;
 
-                n2s(p,i);
-                param_len+=i+2;
-                if (param_len > n)
-                        {
-                        al=SSL_AD_DECODE_ERROR;
-                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_BAD_DH_PUB_KEY_LENGTH);
+                n2s(p, i);
+                param_len += i + 2;
+                if (param_len > n) {
+                        al = SSL_AD_DECODE_ERROR;
+                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE, SSL_R_BAD_DH_PUB_KEY_LENGTH);
                         goto f_err;
-                        }
-                if (!(dh->pub_key=BN_bin2bn(p,i,NULL)))
-                        {
-                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,ERR_R_BN_LIB);
+                }
+                if (!(dh->pub_key = BN_bin2bn(p, i, NULL))) {
+                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE, ERR_R_BN_LIB);
                         goto err;
-                        }
-                p+=i;
-                n-=param_len;
+                }
+                p += i;
+                n -= param_len;
 
 #ifndef OPENSSL_NO_RSA
                 if (alg_a & SSL_aRSA)
-                        pkey=X509_get_pubkey(s->session->sess_cert->peer_pkeys[SSL_PKEY_RSA_ENC].x509);
+                        pkey = X509_get_pubkey(s->session->sess_cert->peer_pkeys[SSL_PKEY_RSA_ENC].x509);
 #else
                 if (0)
-                        ;
+;
 #endif
 #ifndef OPENSSL_NO_DSA
                 else if (alg_a & SSL_aDSS)
-                        pkey=X509_get_pubkey(s->session->sess_cert->peer_pkeys[SSL_PKEY_DSA_SIGN].x509);
+                        pkey = X509_get_pubkey(s->session->sess_cert->peer_pkeys[SSL_PKEY_DSA_SIGN].x509);
 #endif
                 /* else anonymous DH, so no certificate or pkey. */
 
-                s->session->sess_cert->peer_dh_tmp=dh;
-                dh=NULL;
-                }
-        else if ((alg_k & SSL_kDHr) || (alg_k & SSL_kDHd))
-                {
-                al=SSL_AD_ILLEGAL_PARAMETER;
-                SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_TRIED_TO_USE_UNSUPPORTED_CIPHER);
+                s->session->sess_cert->peer_dh_tmp = dh;
+                dh = NULL;
+        } else if ((alg_k & SSL_kDHr) || (alg_k & SSL_kDHd)) {
+                al = SSL_AD_ILLEGAL_PARAMETER;
+                SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE, SSL_R_TRIED_TO_USE_UNSUPPORTED_CIPHER);
                 goto f_err;
-                }
+        }
 #endif /* !OPENSSL_NO_DH */
 
 #ifndef OPENSSL_NO_ECDH
-        else if (alg_k & SSL_kEECDH)
-                {
+        else if (alg_k & SSL_kEECDH) {
                 EC_GROUP *ngroup;
                 const EC_GROUP *group;
 
-                if ((ecdh=EC_KEY_new()) == NULL)
-                        {
-                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,ERR_R_MALLOC_FAILURE);
+                if ((ecdh = EC_KEY_new()) == NULL) {
+                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE, ERR_R_MALLOC_FAILURE);
                         goto err;
-                        }
+                }
 
                 /* Extract elliptic curve parameters and the
                  * server's ephemeral ECDH public key.
@@ -1624,217 +1519,194 @@ int ssl3_get_key_exchange(SSL *s)
                 /* XXX: For now we only support named (not generic) curves
                  * and the ECParameters in this case is just three bytes.
                  */
-                param_len=3;
+                param_len = 3;
                 if ((param_len > n) ||
-                    (*p != NAMED_CURVE_TYPE) || 
-                    ((curve_nid = tls1_ec_curve_id2nid(*(p + 2))) == 0)) 
-                        {
-                        al=SSL_AD_INTERNAL_ERROR;
-                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_UNABLE_TO_FIND_ECDH_PARAMETERS);
+                        (*p != NAMED_CURVE_TYPE) ||
+                ((curve_nid = tls1_ec_curve_id2nid(*(p + 2))) == 0)) {
+                        al = SSL_AD_INTERNAL_ERROR;
+                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE, SSL_R_UNABLE_TO_FIND_ECDH_PARAMETERS);
                         goto f_err;
-                        }
+                }
 
                 ngroup = EC_GROUP_new_by_curve_name(curve_nid);
-                if (ngroup == NULL)
-                        {
-                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,ERR_R_EC_LIB);
+                if (ngroup == NULL) {
+                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE, ERR_R_EC_LIB);
                         goto err;
-                        }
-                if (EC_KEY_set_group(ecdh, ngroup) == 0)
-                        {
-                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,ERR_R_EC_LIB);
+                }
+                if (EC_KEY_set_group(ecdh, ngroup) == 0) {
+                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE, ERR_R_EC_LIB);
                         goto err;
-                        }
+                }
                 EC_GROUP_free(ngroup);
 
                 group = EC_KEY_get0_group(ecdh);
 
                 if (SSL_C_IS_EXPORT(s->s3->tmp.new_cipher) &&
-                    (EC_GROUP_get_degree(group) > 163))
-                        {
-                        al=SSL_AD_EXPORT_RESTRICTION;
-                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_ECGROUP_TOO_LARGE_FOR_CIPHER);
+                        (EC_GROUP_get_degree(group) > 163)) {
+                        al = SSL_AD_EXPORT_RESTRICTION;
+                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE, SSL_R_ECGROUP_TOO_LARGE_FOR_CIPHER);
                         goto f_err;
-                        }
+                }
 
-                p+=3;
+                p += 3;
 
                 /* Next, get the encoded ECPoint */
                 if (((srvr_ecpoint = EC_POINT_new(group)) == NULL) ||
-                    ((bn_ctx = BN_CTX_new()) == NULL))
-                        {
-                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,ERR_R_MALLOC_FAILURE);
+                        ((bn_ctx = BN_CTX_new()) == NULL)) {
+                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE, ERR_R_MALLOC_FAILURE);
                         goto err;
-                        }
+                }
 
-                encoded_pt_len = *p;  /* length of encoded point */
-                p+=1;
+                encoded_pt_len = *p;
+                /* length of encoded point */
+                p += 1;
                 param_len += (1 + encoded_pt_len);
                 if ((param_len > n) ||
-                    (EC_POINT_oct2point(group, srvr_ecpoint, 
-                        p, encoded_pt_len, bn_ctx) == 0))
-                        {
-                        al=SSL_AD_DECODE_ERROR;
-                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_BAD_ECPOINT);
+                        (EC_POINT_oct2point(group, srvr_ecpoint,
+                p, encoded_pt_len, bn_ctx) == 0)) {
+                        al = SSL_AD_DECODE_ERROR;
+                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE, SSL_R_BAD_ECPOINT);
                         goto f_err;
-                        }
+                }
 
-                n-=param_len;
-                p+=encoded_pt_len;
+                n -= param_len;
+                p += encoded_pt_len;
 
                 /* The ECC/TLS specification does not mention
                  * the use of DSA to sign ECParameters in the server
                  * key exchange message. We do support RSA and ECDSA.
                  */
-                if (0) ;
+                if (0);
 #ifndef OPENSSL_NO_RSA
                 else if (alg_a & SSL_aRSA)
-                        pkey=X509_get_pubkey(s->session->sess_cert->peer_pkeys[SSL_PKEY_RSA_ENC].x509);
+                        pkey = X509_get_pubkey(s->session->sess_cert->peer_pkeys[SSL_PKEY_RSA_ENC].x509);
 #endif
 #ifndef OPENSSL_NO_ECDSA
                 else if (alg_a & SSL_aECDSA)
-                        pkey=X509_get_pubkey(s->session->sess_cert->peer_pkeys[SSL_PKEY_ECC].x509);
+                        pkey = X509_get_pubkey(s->session->sess_cert->peer_pkeys[SSL_PKEY_ECC].x509);
 #endif
                 /* else anonymous ECDH, so no certificate or pkey. */
                 EC_KEY_set_public_key(ecdh, srvr_ecpoint);
-                s->session->sess_cert->peer_ecdh_tmp=ecdh;
-                ecdh=NULL;
+                s->session->sess_cert->peer_ecdh_tmp = ecdh;
+                ecdh = NULL;
                 BN_CTX_free(bn_ctx);
                 bn_ctx = NULL;
                 EC_POINT_free(srvr_ecpoint);
                 srvr_ecpoint = NULL;
-                }
-        else if (alg_k)
-                {
-                al=SSL_AD_UNEXPECTED_MESSAGE;
-                SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_UNEXPECTED_MESSAGE);
+        } else if (alg_k) {
+                al = SSL_AD_UNEXPECTED_MESSAGE;
+                SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE, SSL_R_UNEXPECTED_MESSAGE);
                 goto f_err;
-                }
+        }
 #endif /* !OPENSSL_NO_ECDH */
 
 
         /* p points to the next byte, there are 'n' bytes left */
 
         /* if it was signed, check the signature */
-        if (pkey != NULL)
-                {
-                if (TLS1_get_version(s) >= TLS1_2_VERSION)
-                        {
+        if (pkey != NULL) {
+                if (TLS1_get_version(s) >= TLS1_2_VERSION) {
                         int sigalg = tls12_get_sigid(pkey);
                         /* Should never happen */
-                        if (sigalg == -1)
-                                {
-                                SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,ERR_R_INTERNAL_ERROR);
+                        if (sigalg == -1) {
+                                SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE, ERR_R_INTERNAL_ERROR);
                                 goto err;
-                                }
+                        }
                         /* Check key type is consistent with signature */
-                        if (sigalg != (int)p[1])
-                                {
-                                SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_WRONG_SIGNATURE_TYPE);
-                                al=SSL_AD_DECODE_ERROR;
+                        if (sigalg != (int)p[1]) {
+                                SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE, SSL_R_WRONG_SIGNATURE_TYPE);
+                                al = SSL_AD_DECODE_ERROR;
                                 goto f_err;
-                                }
+                        }
                         md = tls12_get_hash(p[0]);
-                        if (md == NULL)
-                                {
-                                SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_UNKNOWN_DIGEST);
-                                al=SSL_AD_DECODE_ERROR;
+                        if (md == NULL) {
+                                SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE, SSL_R_UNKNOWN_DIGEST);
+                                al = SSL_AD_DECODE_ERROR;
                                 goto f_err;
-                                }
+                        }
 #ifdef SSL_DEBUG
-fprintf(stderr, "USING TLSv1.2 HASH %s\n", EVP_MD_name(md));
+                        fprintf(stderr, "USING TLSv1.2 HASH %s\n", EVP_MD_name(md));
 #endif
                         p += 2;
                         n -= 2;
-                        }
-                else
+                } else
                         md = EVP_sha1();
-                        
-                n2s(p,i);
-                n-=2;
-                j=EVP_PKEY_size(pkey);
 
-                if ((i != n) || (n > j) || (n <= 0))
-                        {
+                n2s(p, i);
+                n -= 2;
+                j = EVP_PKEY_size(pkey);
+
+                if ((i != n) || (n > j) || (n <= 0)) {
                         /* wrong packet length */
-                        al=SSL_AD_DECODE_ERROR;
-                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_WRONG_SIGNATURE_LENGTH);
+                        al = SSL_AD_DECODE_ERROR;
+                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE, SSL_R_WRONG_SIGNATURE_LENGTH);
                         goto f_err;
-                        }
+                }
 
 #ifndef OPENSSL_NO_RSA
-                if (pkey->type == EVP_PKEY_RSA && TLS1_get_version(s) < TLS1_2_VERSION)
-                        {
+                if (pkey->type == EVP_PKEY_RSA && TLS1_get_version(s) < TLS1_2_VERSION) {
                         int num;
 
-                        j=0;
-                        q=md_buf;
-                        for (num=2; num > 0; num--)
-                                {
+                        j = 0;
+                        q = md_buf;
+                        for (num = 2; num > 0; num--) {
                                 EVP_MD_CTX_set_flags(&md_ctx,
-                                        EVP_MD_CTX_FLAG_NON_FIPS_ALLOW);
+                                EVP_MD_CTX_FLAG_NON_FIPS_ALLOW);
                                 EVP_DigestInit_ex(&md_ctx,(num == 2)
-                                        ?s->ctx->md5:s->ctx->sha1, NULL);
-                                EVP_DigestUpdate(&md_ctx,&(s->s3->client_random[0]),SSL3_RANDOM_SIZE);
-                                EVP_DigestUpdate(&md_ctx,&(s->s3->server_random[0]),SSL3_RANDOM_SIZE);
-                                EVP_DigestUpdate(&md_ctx,param,param_len);
-                                EVP_DigestFinal_ex(&md_ctx,q,(unsigned int *)&i);
-                                q+=i;
-                                j+=i;
-                                }
-                        i=RSA_verify(NID_md5_sha1, md_buf, j, p, n,
-                                                                pkey->pkey.rsa);
-                        if (i < 0)
-                                {
-                                al=SSL_AD_DECRYPT_ERROR;
-                                SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_BAD_RSA_DECRYPT);
+                                ?s->ctx->md5 : s->ctx->sha1, NULL);
+                                EVP_DigestUpdate(&md_ctx, &(s->s3->client_random[0]), SSL3_RANDOM_SIZE);
+                                EVP_DigestUpdate(&md_ctx, &(s->s3->server_random[0]), SSL3_RANDOM_SIZE);
+                                EVP_DigestUpdate(&md_ctx, param, param_len);
+                                EVP_DigestFinal_ex(&md_ctx, q,(unsigned int *)&i);
+                                q += i;
+                                j += i;
+                        }
+                        i = RSA_verify(NID_md5_sha1, md_buf, j, p, n,
+                        pkey->pkey.rsa);
+                        if (i < 0) {
+                                al = SSL_AD_DECRYPT_ERROR;
+                                SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE, SSL_R_BAD_RSA_DECRYPT);
                                 goto f_err;
-                                }
-                        if (i == 0)
-                                {
+                        }
+                        if (i == 0) {
                                 /* bad signature */
-                                al=SSL_AD_DECRYPT_ERROR;
-                                SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_BAD_SIGNATURE);
+                                al = SSL_AD_DECRYPT_ERROR;
+                                SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE, SSL_R_BAD_SIGNATURE);
                                 goto f_err;
-                                }
                         }
-                else
+                } else
 #endif
-                        {
+                {
                         EVP_VerifyInit_ex(&md_ctx, md, NULL);
-                        EVP_VerifyUpdate(&md_ctx,&(s->s3->client_random[0]),SSL3_RANDOM_SIZE);
-                        EVP_VerifyUpdate(&md_ctx,&(s->s3->server_random[0]),SSL3_RANDOM_SIZE);
-                        EVP_VerifyUpdate(&md_ctx,param,param_len);
-                        if (EVP_VerifyFinal(&md_ctx,p,(int)n,pkey) <= 0)
-                                {
+                        EVP_VerifyUpdate(&md_ctx, &(s->s3->client_random[0]), SSL3_RANDOM_SIZE);
+                        EVP_VerifyUpdate(&md_ctx, &(s->s3->server_random[0]), SSL3_RANDOM_SIZE);
+                        EVP_VerifyUpdate(&md_ctx, param, param_len);
+                        if (EVP_VerifyFinal(&md_ctx, p,(int)n, pkey) <= 0) {
                                 /* bad signature */
-                                al=SSL_AD_DECRYPT_ERROR;
-                                SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_BAD_SIGNATURE);
+                                al = SSL_AD_DECRYPT_ERROR;
+                                SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE, SSL_R_BAD_SIGNATURE);
                                 goto f_err;
-                                }
                         }
                 }
-        else
-                {
+        } else {
                 if (!(alg_a & SSL_aNULL) && !(alg_k & SSL_kPSK))
                         /* aNULL or kPSK do not need public keys */
-                        {
-                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,ERR_R_INTERNAL_ERROR);
+                {
+                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE, ERR_R_INTERNAL_ERROR);
                         goto err;
-                        }
+                }
                 /* still data left over */
-                if (n != 0)
-                        {
-                        al=SSL_AD_DECODE_ERROR;
-                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_EXTRA_DATA_IN_MESSAGE);
+                if (n != 0) {
+                        al = SSL_AD_DECODE_ERROR;
+                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE, SSL_R_EXTRA_DATA_IN_MESSAGE);
                         goto f_err;
-                        }
                 }
+        }
         EVP_PKEY_free(pkey);
         EVP_MD_CTX_cleanup(&md_ctx);
-        return(1);
+        return (1);
 f_err:
-        ssl3_send_alert(s,SSL3_AL_FATAL,al);
+        ssl3_send_alert(s, SSL3_AL_FATAL, al);
 err:
         EVP_PKEY_free(pkey);
 #ifndef OPENSSL_NO_RSA
@@ -1852,241 +1724,219 @@ err:
                 EC_KEY_free(ecdh);
 #endif
         EVP_MD_CTX_cleanup(&md_ctx);
-        return(-1);
-        }
+        return (-1);
+}
 
-int ssl3_get_certificate_request(SSL *s)
-        {
-        int ok,ret=0;
-        unsigned long n,nc,l;
-        unsigned int llen, ctype_num,i;
-        X509_NAME *xn=NULL;
-        const unsigned char *p,*q;
+int
+ssl3_get_certificate_request(SSL *s)
+{
+        int ok, ret = 0;
+        unsigned long n, nc, l;
+        unsigned int llen, ctype_num, i;
+        X509_NAME *xn = NULL;
+        const unsigned char *p, *q;
         unsigned char *d;
-        STACK_OF(X509_NAME) *ca_sk=NULL;
+        STACK_OF(X509_NAME) *ca_sk = NULL;
 
-        n=s->method->ssl_get_message(s,
-                SSL3_ST_CR_CERT_REQ_A,
-                SSL3_ST_CR_CERT_REQ_B,
-                -1,
-                s->max_cert_list,
-                &ok);
+        n = s->method->ssl_get_message(s,
+        SSL3_ST_CR_CERT_REQ_A,
+        SSL3_ST_CR_CERT_REQ_B,
+        -1,
+        s->max_cert_list,
+        &ok);
 
-        if (!ok) return((int)n);
+        if (!ok)
+                return ((int)n);
 
-        s->s3->tmp.cert_req=0;
+        s->s3->tmp.cert_req = 0;
 
-        if (s->s3->tmp.message_type == SSL3_MT_SERVER_DONE)
-                {
-                s->s3->tmp.reuse_message=1;
+        if (s->s3->tmp.message_type == SSL3_MT_SERVER_DONE) {
+                s->s3->tmp.reuse_message = 1;
                 /* If we get here we don't need any cached handshake records
                  * as we wont be doing client auth.
                  */
-                if (s->s3->handshake_buffer)
-                        {
+                if (s->s3->handshake_buffer) {
                         if (!ssl3_digest_cached_records(s))
                                 goto err;
-                        }
-                return(1);
                 }
+                return (1);
+        }
 
-        if (s->s3->tmp.message_type != SSL3_MT_CERTIFICATE_REQUEST)
-                {
-                ssl3_send_alert(s,SSL3_AL_FATAL,SSL_AD_UNEXPECTED_MESSAGE);
-                SSLerr(SSL_F_SSL3_GET_CERTIFICATE_REQUEST,SSL_R_WRONG_MESSAGE_TYPE);
+        if (s->s3->tmp.message_type != SSL3_MT_CERTIFICATE_REQUEST) {
+                ssl3_send_alert(s, SSL3_AL_FATAL, SSL_AD_UNEXPECTED_MESSAGE);
+                SSLerr(SSL_F_SSL3_GET_CERTIFICATE_REQUEST, SSL_R_WRONG_MESSAGE_TYPE);
                 goto err;
-                }
+        }
 
         /* TLS does not like anon-DH with client cert */
-        if (s->version > SSL3_VERSION)
-                {
-                if (s->s3->tmp.new_cipher->algorithm_auth & SSL_aNULL)
-                        {
-                        ssl3_send_alert(s,SSL3_AL_FATAL,SSL_AD_UNEXPECTED_MESSAGE);
-                        SSLerr(SSL_F_SSL3_GET_CERTIFICATE_REQUEST,SSL_R_TLS_CLIENT_CERT_REQ_WITH_ANON_CIPHER);
+        if (s->version > SSL3_VERSION) {
+                if (s->s3->tmp.new_cipher->algorithm_auth & SSL_aNULL) {
+                        ssl3_send_alert(s, SSL3_AL_FATAL, SSL_AD_UNEXPECTED_MESSAGE);
+                        SSLerr(SSL_F_SSL3_GET_CERTIFICATE_REQUEST, SSL_R_TLS_CLIENT_CERT_REQ_WITH_ANON_CIPHER);
                         goto err;
-                        }
                 }
+        }
 
-        p=d=(unsigned char *)s->init_msg;
+        p = d=(unsigned char *)s->init_msg;
 
-        if ((ca_sk=sk_X509_NAME_new(ca_dn_cmp)) == NULL)
-                {
-                SSLerr(SSL_F_SSL3_GET_CERTIFICATE_REQUEST,ERR_R_MALLOC_FAILURE);
+        if ((ca_sk = sk_X509_NAME_new(ca_dn_cmp)) == NULL) {
+                SSLerr(SSL_F_SSL3_GET_CERTIFICATE_REQUEST, ERR_R_MALLOC_FAILURE);
                 goto err;
-                }
+        }
 
         /* get the certificate types */
         ctype_num= *(p++);
         if (ctype_num > SSL3_CT_NUMBER)
-                ctype_num=SSL3_CT_NUMBER;
-        for (i=0; i<ctype_num; i++)
-                s->s3->tmp.ctype[i]= p[i];
-        p+=ctype_num;
-        if (TLS1_get_version(s) >= TLS1_2_VERSION)
-                {
+                ctype_num = SSL3_CT_NUMBER;
+        for (i = 0; i < ctype_num; i++)
+                s->s3->tmp.ctype[i] = p[i];
+        p += ctype_num;
+        if (TLS1_get_version(s) >= TLS1_2_VERSION) {
                 n2s(p, llen);
                 /* Check we have enough room for signature algorithms and
                  * following length value.
                  */
-                if ((unsigned long)(p - d + llen + 2) > n)
-                        {
-                        ssl3_send_alert(s,SSL3_AL_FATAL,SSL_AD_DECODE_ERROR);
-                        SSLerr(SSL_F_SSL3_GET_CERTIFICATE_REQUEST,SSL_R_DATA_LENGTH_TOO_LONG);
+                if ((unsigned long)(p - d + llen + 2) > n) {
+                        ssl3_send_alert(s, SSL3_AL_FATAL, SSL_AD_DECODE_ERROR);
+                        SSLerr(SSL_F_SSL3_GET_CERTIFICATE_REQUEST, SSL_R_DATA_LENGTH_TOO_LONG);
                         goto err;
-                        }
-                if ((llen & 1) || !tls1_process_sigalgs(s, p, llen))
-                        {
-                        ssl3_send_alert(s,SSL3_AL_FATAL,SSL_AD_DECODE_ERROR);
-                        SSLerr(SSL_F_SSL3_GET_CERTIFICATE_REQUEST,SSL_R_SIGNATURE_ALGORITHMS_ERROR);
+                }
+                if ((llen & 1) || !tls1_process_sigalgs(s, p, llen)) {
+                        ssl3_send_alert(s, SSL3_AL_FATAL, SSL_AD_DECODE_ERROR);
+                        SSLerr(SSL_F_SSL3_GET_CERTIFICATE_REQUEST, SSL_R_SIGNATURE_ALGORITHMS_ERROR);
                         goto err;
-                        }
-                p += llen;
                 }
+                p += llen;
+        }
 
         /* get the CA RDNs */
-        n2s(p,llen);
+        n2s(p, llen);
 #if 0
-{
-FILE *out;
-out=fopen("/tmp/vsign.der","w");
-fwrite(p,1,llen,out);
-fclose(out);
-}
+        {
+                FILE *out;
+                out = fopen("/tmp/vsign.der", "w");
+                fwrite(p, 1, llen, out);
+                fclose(out);
+        }
 #endif
 
-        if ((unsigned long)(p - d + llen) != n)
-                {
-                ssl3_send_alert(s,SSL3_AL_FATAL,SSL_AD_DECODE_ERROR);
-                SSLerr(SSL_F_SSL3_GET_CERTIFICATE_REQUEST,SSL_R_LENGTH_MISMATCH);
+        if ((unsigned long)(p - d + llen) != n) {
+                ssl3_send_alert(s, SSL3_AL_FATAL, SSL_AD_DECODE_ERROR);
+                SSLerr(SSL_F_SSL3_GET_CERTIFICATE_REQUEST, SSL_R_LENGTH_MISMATCH);
                 goto err;
-                }
+        }
 
-        for (nc=0; nc<llen; )
-                {
-                n2s(p,l);
-                if ((l+nc+2) > llen)
-                        {
+        for (nc = 0; nc < llen; ) {
+                n2s(p, l);
+                if ((l + nc + 2) > llen) {
                         if ((s->options & SSL_OP_NETSCAPE_CA_DN_BUG))
                                 goto cont; /* netscape bugs */
-                        ssl3_send_alert(s,SSL3_AL_FATAL,SSL_AD_DECODE_ERROR);
-                        SSLerr(SSL_F_SSL3_GET_CERTIFICATE_REQUEST,SSL_R_CA_DN_TOO_LONG);
+                        ssl3_send_alert(s, SSL3_AL_FATAL, SSL_AD_DECODE_ERROR);
+                        SSLerr(SSL_F_SSL3_GET_CERTIFICATE_REQUEST, SSL_R_CA_DN_TOO_LONG);
                         goto err;
-                        }
+                }
 
-                q=p;
+                q = p;
 
-                if ((xn=d2i_X509_NAME(NULL,&q,l)) == NULL)
-                        {
+                if ((xn = d2i_X509_NAME(NULL, &q, l)) == NULL) {
                         /* If netscape tolerance is on, ignore errors */
                         if (s->options & SSL_OP_NETSCAPE_CA_DN_BUG)
                                 goto cont;
-                        else
-                                {
-                                ssl3_send_alert(s,SSL3_AL_FATAL,SSL_AD_DECODE_ERROR);
-                                SSLerr(SSL_F_SSL3_GET_CERTIFICATE_REQUEST,ERR_R_ASN1_LIB);
+                        else {
+                                ssl3_send_alert(s, SSL3_AL_FATAL, SSL_AD_DECODE_ERROR);
+                                SSLerr(SSL_F_SSL3_GET_CERTIFICATE_REQUEST, ERR_R_ASN1_LIB);
                                 goto err;
-                                }
                         }
+                }
 
-                if (q != (p+l))
-                        {
-                        ssl3_send_alert(s,SSL3_AL_FATAL,SSL_AD_DECODE_ERROR);
-                        SSLerr(SSL_F_SSL3_GET_CERTIFICATE_REQUEST,SSL_R_CA_DN_LENGTH_MISMATCH);
+                if (q != (p + l)) {
+                        ssl3_send_alert(s, SSL3_AL_FATAL, SSL_AD_DECODE_ERROR);
+                        SSLerr(SSL_F_SSL3_GET_CERTIFICATE_REQUEST, SSL_R_CA_DN_LENGTH_MISMATCH);
                         goto err;
-                        }
-                if (!sk_X509_NAME_push(ca_sk,xn))
-                        {
-                        SSLerr(SSL_F_SSL3_GET_CERTIFICATE_REQUEST,ERR_R_MALLOC_FAILURE);
+                }
+                if (!sk_X509_NAME_push(ca_sk, xn)) {
+                        SSLerr(SSL_F_SSL3_GET_CERTIFICATE_REQUEST, ERR_R_MALLOC_FAILURE);
                         goto err;
-                        }
-
-                p+=l;
-                nc+=l+2;
                 }
 
-        if (0)
-                {
+                p += l;
+                nc += l + 2;
+        }
+
+        if (0) {
 cont:
                 ERR_clear_error();
-                }
+        }
 
         /* we should setup a certificate to return.... */
-        s->s3->tmp.cert_req=1;
-        s->s3->tmp.ctype_num=ctype_num;
+        s->s3->tmp.cert_req = 1;
+        s->s3->tmp.ctype_num = ctype_num;
         if (s->s3->tmp.ca_names != NULL)
-                sk_X509_NAME_pop_free(s->s3->tmp.ca_names,X509_NAME_free);
-        s->s3->tmp.ca_names=ca_sk;
-        ca_sk=NULL;
+                sk_X509_NAME_pop_free(s->s3->tmp.ca_names, X509_NAME_free);
+        s->s3->tmp.ca_names = ca_sk;
+        ca_sk = NULL;
 
-        ret=1;
+        ret = 1;
 err:
-        if (ca_sk != NULL) sk_X509_NAME_pop_free(ca_sk,X509_NAME_free);
-        return(ret);
-        }
+        if (ca_sk != NULL)
+                sk_X509_NAME_pop_free(ca_sk, X509_NAME_free);
+        return (ret);
+}
+
+static int
+ca_dn_cmp(const X509_NAME * const *a, const X509_NAME * const *b)
+{
+        return (X509_NAME_cmp(*a, *b));
+}
 
-static int ca_dn_cmp(const X509_NAME * const *a, const X509_NAME * const *b)
-        {
-        return(X509_NAME_cmp(*a,*b));
-        }
 #ifndef OPENSSL_NO_TLSEXT
-int ssl3_get_new_session_ticket(SSL *s)
-        {
-        int ok,al,ret=0, ticklen;
+int
+ssl3_get_new_session_ticket(SSL *s)
+{
+        int ok, al, ret = 0, ticklen;
         long n;
         const unsigned char *p;
         unsigned char *d;
 
-        n=s->method->ssl_get_message(s,
-                SSL3_ST_CR_SESSION_TICKET_A,
-                SSL3_ST_CR_SESSION_TICKET_B,
-                -1,
-                16384,
-                &ok);
-
+        n = s->method->ssl_get_message(s, SSL3_ST_CR_SESSION_TICKET_A,
+            SSL3_ST_CR_SESSION_TICKET_B, -1, 16384, &ok);
         if (!ok)
-                return((int)n);
+                return ((int)n);
 
-        if (s->s3->tmp.message_type == SSL3_MT_FINISHED)
-                {
-                s->s3->tmp.reuse_message=1;
-                return(1);
-                }
-        if (s->s3->tmp.message_type != SSL3_MT_NEWSESSION_TICKET)
-                {
-                al=SSL_AD_UNEXPECTED_MESSAGE;
-                SSLerr(SSL_F_SSL3_GET_NEW_SESSION_TICKET,SSL_R_BAD_MESSAGE_TYPE);
+        if (s->s3->tmp.message_type == SSL3_MT_FINISHED) {
+                s->s3->tmp.reuse_message = 1;
+                return (1);
+        }
+        if (s->s3->tmp.message_type != SSL3_MT_NEWSESSION_TICKET) {
+                al = SSL_AD_UNEXPECTED_MESSAGE;
+                SSLerr(SSL_F_SSL3_GET_NEW_SESSION_TICKET, SSL_R_BAD_MESSAGE_TYPE);
                 goto f_err;
-                }
-        if (n < 6)
-                {
+        }
+        if (n < 6) {
                 /* need at least ticket_lifetime_hint + ticket length */
                 al = SSL_AD_DECODE_ERROR;
-                SSLerr(SSL_F_SSL3_GET_NEW_SESSION_TICKET,SSL_R_LENGTH_MISMATCH);
+                SSLerr(SSL_F_SSL3_GET_NEW_SESSION_TICKET, SSL_R_LENGTH_MISMATCH);
                 goto f_err;
-                }
+        }
 
-        p=d=(unsigned char *)s->init_msg;
+        p = d = (unsigned char *)s->init_msg;
         n2l(p, s->session->tlsext_tick_lifetime_hint);
         n2s(p, ticklen);
         /* ticket_lifetime_hint + ticket_length + ticket */
-        if (ticklen + 6 != n)
-                {
+        if (ticklen + 6 != n) {
                 al = SSL_AD_DECODE_ERROR;
-                SSLerr(SSL_F_SSL3_GET_NEW_SESSION_TICKET,SSL_R_LENGTH_MISMATCH);
+                SSLerr(SSL_F_SSL3_GET_NEW_SESSION_TICKET, SSL_R_LENGTH_MISMATCH);
                 goto f_err;
-                }
-        if (s->session->tlsext_tick)
-                {
+        }
+        if (s->session->tlsext_tick) {
                 OPENSSL_free(s->session->tlsext_tick);
                 s->session->tlsext_ticklen = 0;
-                }
+        }
         s->session->tlsext_tick = OPENSSL_malloc(ticklen);
-        if (!s->session->tlsext_tick)
-                {
-                SSLerr(SSL_F_SSL3_GET_NEW_SESSION_TICKET,ERR_R_MALLOC_FAILURE);
+        if (!s->session->tlsext_tick) {
+                SSLerr(SSL_F_SSL3_GET_NEW_SESSION_TICKET, ERR_R_MALLOC_FAILURE);
                 goto err;
-                }
+        }
         memcpy(s->session->tlsext_tick, p, ticklen);
         s->session->tlsext_ticklen = ticklen;
         /* There are two ways to detect a resumed ticket sesion.
@@ -2105,122 +1955,116 @@ int ssl3_get_new_session_ticket(SSL *s)
          * ticket.
          */ 
         EVP_Digest(p, ticklen,
-                        s->session->session_id, &s->session->session_id_length,
+        s->session->session_id, &s->session->session_id_length,
 #ifndef OPENSSL_NO_SHA256
-                                                        EVP_sha256(), NULL);
+        EVP_sha256(), NULL);
 #else
-                                                        EVP_sha1(), NULL);
+        EVP_sha1(), NULL);
 #endif
-        ret=1;
-        return(ret);
+        ret = 1;
+        return (ret);
 f_err:
-        ssl3_send_alert(s,SSL3_AL_FATAL,al);
+        ssl3_send_alert(s, SSL3_AL_FATAL, al);
 err:
-        return(-1);
-        }
+        return (-1);
+}
 
-int ssl3_get_cert_status(SSL *s)
-        {
+int
+ssl3_get_cert_status(SSL *s)
+{
         int ok, al;
-        unsigned long resplen,n;
+        unsigned long resplen, n;
         const unsigned char *p;
 
-        n=s->method->ssl_get_message(s,
-                SSL3_ST_CR_CERT_STATUS_A,
-                SSL3_ST_CR_CERT_STATUS_B,
-                SSL3_MT_CERTIFICATE_STATUS,
-                16384,
-                &ok);
+        n = s->method->ssl_get_message(s,
+        SSL3_ST_CR_CERT_STATUS_A,
+        SSL3_ST_CR_CERT_STATUS_B,
+        SSL3_MT_CERTIFICATE_STATUS,
+        16384,
+        &ok);
 
-        if (!ok) return((int)n);
-        if (n < 4)
-                {
+        if (!ok)
+                return ((int)n);
+        if (n < 4) {
                 /* need at least status type + length */
                 al = SSL_AD_DECODE_ERROR;
-                SSLerr(SSL_F_SSL3_GET_CERT_STATUS,SSL_R_LENGTH_MISMATCH);
+                SSLerr(SSL_F_SSL3_GET_CERT_STATUS, SSL_R_LENGTH_MISMATCH);
                 goto f_err;
-                }
+        }
         p = (unsigned char *)s->init_msg;
-        if (*p++ != TLSEXT_STATUSTYPE_ocsp)
-                {
+        if (*p++ != TLSEXT_STATUSTYPE_ocsp) {
                 al = SSL_AD_DECODE_ERROR;
-                SSLerr(SSL_F_SSL3_GET_CERT_STATUS,SSL_R_UNSUPPORTED_STATUS_TYPE);
+                SSLerr(SSL_F_SSL3_GET_CERT_STATUS, SSL_R_UNSUPPORTED_STATUS_TYPE);
                 goto f_err;
-                }
+        }
         n2l3(p, resplen);
-        if (resplen + 4 != n)
-                {
+        if (resplen + 4 != n) {
                 al = SSL_AD_DECODE_ERROR;
-                SSLerr(SSL_F_SSL3_GET_CERT_STATUS,SSL_R_LENGTH_MISMATCH);
+                SSLerr(SSL_F_SSL3_GET_CERT_STATUS, SSL_R_LENGTH_MISMATCH);
                 goto f_err;
-                }
+        }
         if (s->tlsext_ocsp_resp)
                 OPENSSL_free(s->tlsext_ocsp_resp);
         s->tlsext_ocsp_resp = BUF_memdup(p, resplen);
-        if (!s->tlsext_ocsp_resp)
-                {
+        if (!s->tlsext_ocsp_resp) {
                 al = SSL_AD_INTERNAL_ERROR;
-                SSLerr(SSL_F_SSL3_GET_CERT_STATUS,ERR_R_MALLOC_FAILURE);
+                SSLerr(SSL_F_SSL3_GET_CERT_STATUS, ERR_R_MALLOC_FAILURE);
                 goto f_err;
-                }
+        }
         s->tlsext_ocsp_resplen = resplen;
-        if (s->ctx->tlsext_status_cb)
-                {
+        if (s->ctx->tlsext_status_cb) {
                 int ret;
                 ret = s->ctx->tlsext_status_cb(s, s->ctx->tlsext_status_arg);
-                if (ret == 0)
-                        {
+                if (ret == 0) {
                         al = SSL_AD_BAD_CERTIFICATE_STATUS_RESPONSE;
-                        SSLerr(SSL_F_SSL3_GET_CERT_STATUS,SSL_R_INVALID_STATUS_RESPONSE);
+                        SSLerr(SSL_F_SSL3_GET_CERT_STATUS, SSL_R_INVALID_STATUS_RESPONSE);
                         goto f_err;
-                        }
-                if (ret < 0)
-                        {
+                }
+                if (ret < 0) {
                         al = SSL_AD_INTERNAL_ERROR;
-                        SSLerr(SSL_F_SSL3_GET_CERT_STATUS,ERR_R_MALLOC_FAILURE);
+                        SSLerr(SSL_F_SSL3_GET_CERT_STATUS, ERR_R_MALLOC_FAILURE);
                         goto f_err;
-                        }
                 }
+        }
         return 1;
 f_err:
-        ssl3_send_alert(s,SSL3_AL_FATAL,al);
-        return(-1);
-        }
+        ssl3_send_alert(s, SSL3_AL_FATAL, al);
+        return (-1);
+}
 #endif
 
-int ssl3_get_server_done(SSL *s)
-        {
-        int ok,ret=0;
+int
+ssl3_get_server_done(SSL *s)
+{
+        int ok, ret = 0;
         long n;
 
-        n=s->method->ssl_get_message(s,
-                SSL3_ST_CR_SRVR_DONE_A,
-                SSL3_ST_CR_SRVR_DONE_B,
-                SSL3_MT_SERVER_DONE,
-                30, /* should be very small, like 0 :-) */
-                &ok);
+        n = s->method->ssl_get_message(s, SSL3_ST_CR_SRVR_DONE_A,
+            SSL3_ST_CR_SRVR_DONE_B, SSL3_MT_SERVER_DONE,
+            30, /* should be very small, like 0 :-) */ &ok);
 
-        if (!ok) return((int)n);
-        if (n > 0)
-                {
+        if (!ok)
+                return ((int)n);
+        if (n > 0) {
                 /* should contain no data */
-                ssl3_send_alert(s,SSL3_AL_FATAL,SSL_AD_DECODE_ERROR);
-                SSLerr(SSL_F_SSL3_GET_SERVER_DONE,SSL_R_LENGTH_MISMATCH);
+                ssl3_send_alert(s, SSL3_AL_FATAL, SSL_AD_DECODE_ERROR);
+                SSLerr(SSL_F_SSL3_GET_SERVER_DONE, SSL_R_LENGTH_MISMATCH);
                 return -1;
-                }
-        ret=1;
-        return(ret);
         }
+        ret = 1;
+        return (ret);
+}
 
 
-int ssl3_send_client_key_exchange(SSL *s)
-        {
-        unsigned char *p,*d;
+int
+ssl3_send_client_key_exchange(SSL *s)
+{
+        unsigned char *p, *d;
         int n;
         unsigned long alg_k;
 #ifndef OPENSSL_NO_RSA
         unsigned char *q;
-        EVP_PKEY *pkey=NULL;
+        EVP_PKEY *pkey = NULL;
 #endif
 #ifndef OPENSSL_NO_KRB5
         KSSL_ERR kssl_err;
@@ -2234,77 +2078,73 @@ int ssl3_send_client_key_exchange(SSL *s)
         BN_CTX * bn_ctx = NULL;
 #endif
 
-        if (s->state == SSL3_ST_CW_KEY_EXCH_A)
-                {
-                d=(unsigned char *)s->init_buf->data;
-                p= &(d[4]);
+        if (s->state == SSL3_ST_CW_KEY_EXCH_A) {
+                d = (unsigned char *)s->init_buf->data;
+                p = &(d[4]);
 
-                alg_k=s->s3->tmp.new_cipher->algorithm_mkey;
+                alg_k = s->s3->tmp.new_cipher->algorithm_mkey;
 
                 /* Fool emacs indentation */
-                if (0) {}
+                if (0) {
+                }
 #ifndef OPENSSL_NO_RSA
-                else if (alg_k & SSL_kRSA)
-                        {
+                else if (alg_k & SSL_kRSA) {
                         RSA *rsa;
                         unsigned char tmp_buf[SSL_MAX_MASTER_KEY_LENGTH];
 
                         if (s->session->sess_cert->peer_rsa_tmp != NULL)
-                                rsa=s->session->sess_cert->peer_rsa_tmp;
-                        else
-                                {
-                                pkey=X509_get_pubkey(s->session->sess_cert->peer_pkeys[SSL_PKEY_RSA_ENC].x509);
+                                rsa = s->session->sess_cert->peer_rsa_tmp;
+                        else {
+                                pkey = X509_get_pubkey(s->session->sess_cert->peer_pkeys[SSL_PKEY_RSA_ENC].x509);
                                 if ((pkey == NULL) ||
-                                        (pkey->type != EVP_PKEY_RSA) ||
-                                        (pkey->pkey.rsa == NULL))
-                                        {
-                                        SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,ERR_R_INTERNAL_ERROR);
+                                    (pkey->type != EVP_PKEY_RSA) ||
+                                    (pkey->pkey.rsa == NULL)) {
+                                        SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE, ERR_R_INTERNAL_ERROR);
                                         goto err;
-                                        }
-                                rsa=pkey->pkey.rsa;
-                                EVP_PKEY_free(pkey);
                                 }
-                                
-                        tmp_buf[0]=s->client_version>>8;
-                        tmp_buf[1]=s->client_version&0xff;
-                        if (RAND_bytes(&(tmp_buf[2]),sizeof tmp_buf-2) <= 0)
-                                        goto err;
+                                rsa = pkey->pkey.rsa;
+                                EVP_PKEY_free(pkey);
+                        }
+
+                        tmp_buf[0] = s->client_version >> 8;
+                        tmp_buf[1] = s->client_version & 0xff;
+                        if (RAND_bytes(&(tmp_buf[2]), sizeof tmp_buf - 2) <= 0)
+                                goto err;
 
-                        s->session->master_key_length=sizeof tmp_buf;
+                        s->session->master_key_length = sizeof tmp_buf;
 
-                        q=p;
+                        q = p;
                         /* Fix buf for TLS and beyond */
                         if (s->version > SSL3_VERSION)
-                                p+=2;
-                        n=RSA_public_encrypt(sizeof tmp_buf,
-                                tmp_buf,p,rsa,RSA_PKCS1_PADDING);
+                                p += 2;
+                        n = RSA_public_encrypt(sizeof tmp_buf,
+                        tmp_buf, p, rsa, RSA_PKCS1_PADDING);
 #ifdef PKCS1_CHECK
-                        if (s->options & SSL_OP_PKCS1_CHECK_1) p[1]++;
-                        if (s->options & SSL_OP_PKCS1_CHECK_2) tmp_buf[0]=0x70;
+                        if (s->options & SSL_OP_PKCS1_CHECK_1)
+                                p[1]++;
+                        if (s->options & SSL_OP_PKCS1_CHECK_2)
+                                tmp_buf[0] = 0x70;
 #endif
-                        if (n <= 0)
-                                {
-                                SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,SSL_R_BAD_RSA_ENCRYPT);
+                        if (n <= 0) {
+                                SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE, SSL_R_BAD_RSA_ENCRYPT);
                                 goto err;
-                                }
+                        }
 
                         /* Fix buf for TLS and beyond */
-                        if (s->version > SSL3_VERSION)
-                                {
-                                s2n(n,q);
-                                n+=2;
-                                }
-
-                        s->session->master_key_length=
-                                s->method->ssl3_enc->generate_master_secret(s,
-                                        s->session->master_key,
-                                        tmp_buf,sizeof tmp_buf);
-                        OPENSSL_cleanse(tmp_buf,sizeof tmp_buf);
+                        if (s->version > SSL3_VERSION) {
+                                s2n(n, q);
+                                n += 2;
                         }
+
+                        s->session->master_key_length =
+                            s->method->ssl3_enc->generate_master_secret(
+                                s, s->session->master_key, tmp_buf,
+                                sizeof tmp_buf);
+                        OPENSSL_cleanse(tmp_buf, sizeof tmp_buf);
+                }
 #endif
 #ifndef OPENSSL_NO_KRB5
-                else if (alg_k & SSL_kKRB5)
-                        {
+                else if (alg_k & SSL_kKRB5) {
                         krb5_error_code krb5rc;
                         KSSL_CTX        *kssl_ctx = s->kssl_ctx;
                         /*  krb5_data   krb5_ap_req;  */
@@ -2314,43 +2154,43 @@ int ssl3_send_client_key_exchange(SSL *s)
                         const EVP_CIPHER *enc = NULL;
                         unsigned char   iv[EVP_MAX_IV_LENGTH];
                         unsigned char   tmp_buf[SSL_MAX_MASTER_KEY_LENGTH];
-                        unsigned char   epms[SSL_MAX_MASTER_KEY_LENGTH 
-                                                + EVP_MAX_IV_LENGTH];
+                        unsigned char   epms[SSL_MAX_MASTER_KEY_LENGTH
+                        + EVP_MAX_IV_LENGTH];
                         int             padl, outl = sizeof(epms);
 
                         EVP_CIPHER_CTX_init(&ciph_ctx);
 
 #ifdef KSSL_DEBUG
                         printf("ssl3_send_client_key_exchange(%lx & %lx)\n",
-                                alg_k, SSL_kKRB5);
+                        alg_k, SSL_kKRB5);
 #endif  /* KSSL_DEBUG */
 
                         authp = NULL;
 #ifdef KRB5SENDAUTH
-                        if (KRB5SENDAUTH)  authp = &authenticator;
+                        if (KRB5SENDAUTH)
+                                authp = &authenticator;
 #endif  /* KRB5SENDAUTH */
 
-                        krb5rc = kssl_cget_tkt(kssl_ctx, &enc_ticket, authp,
-                                &kssl_err);
+                        krb5rc = kssl_cget_tkt(kssl_ctx, &enc_ticket,
+                            authp, &kssl_err);
                         enc = kssl_map_enc(kssl_ctx->enctype);
                         if (enc == NULL)
-                            goto err;
+                                goto err;
 #ifdef KSSL_DEBUG
                         {
-                        printf("kssl_cget_tkt rtn %d\n", krb5rc);
-                        if (krb5rc && kssl_err.text)
-                          printf("kssl_cget_tkt kssl_err=%s\n", kssl_err.text);
+                                printf("kssl_cget_tkt rtn %d\n", krb5rc);
+                                if (krb5rc && kssl_err.text)
+                                        printf("kssl_cget_tkt kssl_err=%s\n", kssl_err.text);
                         }
 #endif  /* KSSL_DEBUG */
 
-                        if (krb5rc)
-                                {
-                                ssl3_send_alert(s,SSL3_AL_FATAL,
-                                                SSL_AD_HANDSHAKE_FAILURE);
+                        if (krb5rc) {
+                                ssl3_send_alert(s, SSL3_AL_FATAL,
+                                SSL_AD_HANDSHAKE_FAILURE);
                                 SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,
-                                                kssl_err.reason);
+                                kssl_err.reason);
                                 goto err;
-                                }
+                        }
 
                         /*  20010406 VRS - Earlier versions used KRB5 AP_REQ
                         **  in place of RFC 2712 KerberosWrapper, as in:
@@ -2372,32 +2212,29 @@ int ssl3_send_client_key_exchange(SSL *s)
                         */
 
                         /*  KerberosWrapper.Ticket              */
-                        s2n(enc_ticket->length,p);
+                        s2n(enc_ticket->length, p);
                         memcpy(p, enc_ticket->data, enc_ticket->length);
-                        p+= enc_ticket->length;
+                        p += enc_ticket->length;
                         n = enc_ticket->length + 2;
 
                         /*  KerberosWrapper.Authenticator       */
-                        if (authp  &&  authp->length)  
-                                {
-                                s2n(authp->length,p);
+                        if (authp && authp->length) {
+                                s2n(authp->length, p);
                                 memcpy(p, authp->data, authp->length);
-                                p+= authp->length;
-                                n+= authp->length + 2;
-                                
+                                p += authp->length;
+                                n += authp->length + 2;
+
                                 free(authp->data);
                                 authp->data = NULL;
                                 authp->length = 0;
-                                }
-                        else
-                                {
+                        } else {
                                 s2n(0,p);/*  null authenticator length  */
-                                n+=2;
-                                }
- 
-                            tmp_buf[0]=s->client_version>>8;
-                            tmp_buf[1]=s->client_version&0xff;
-                            if (RAND_bytes(&(tmp_buf[2]),sizeof tmp_buf-2) <= 0)
+                                n += 2;
+                        }
+
+                        tmp_buf[0] = s->client_version >> 8;
+                        tmp_buf[1] = s->client_version&0xff;
+                        if (RAND_bytes(&(tmp_buf[2]), sizeof tmp_buf - 2) <= 0)
                                 goto err;
 
                         /*  20010420 VRS.  Tried it this way; failed.
@@ -2407,104 +2244,97 @@ int ssl3_send_client_key_exchange(SSL *s)
                         **      EVP_EncryptInit_ex(&ciph_ctx,NULL, key,iv);
                         */
 
-                        memset(iv, 0, sizeof iv);  /* per RFC 1510 */
-                        EVP_EncryptInit_ex(&ciph_ctx,enc, NULL,
-                                kssl_ctx->key,iv);
-                        EVP_EncryptUpdate(&ciph_ctx,epms,&outl,tmp_buf,
-                                sizeof tmp_buf);
-                        EVP_EncryptFinal_ex(&ciph_ctx,&(epms[outl]),&padl);
+                        memset(iv, 0, sizeof iv);
+                        /* per RFC 1510 */
+                        EVP_EncryptInit_ex(&ciph_ctx, enc, NULL,
+                        kssl_ctx->key, iv);
+                        EVP_EncryptUpdate(&ciph_ctx, epms, &outl, tmp_buf,
+                        sizeof tmp_buf);
+                        EVP_EncryptFinal_ex(&ciph_ctx, &(epms[outl]), &padl);
                         outl += padl;
-                        if (outl > (int)sizeof epms)
-                                {
+                        if (outl > (int)sizeof epms) {
                                 SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE, ERR_R_INTERNAL_ERROR);
                                 goto err;
-                                }
+                        }
                         EVP_CIPHER_CTX_cleanup(&ciph_ctx);
 
                         /*  KerberosWrapper.EncryptedPreMasterSecret    */
-                        s2n(outl,p);
+                        s2n(outl, p);
                         memcpy(p, epms, outl);
-                        p+=outl;
-                        n+=outl + 2;
+                        p += outl;
+                        n += outl + 2;
 
-                        s->session->master_key_length=
-                                s->method->ssl3_enc->generate_master_secret(s,
-                                        s->session->master_key,
-                                        tmp_buf, sizeof tmp_buf);
+                        s->session->master_key_length =
+                        s->method->ssl3_enc->generate_master_secret(s,
+                        s->session->master_key,
+                        tmp_buf, sizeof tmp_buf);
 
                         OPENSSL_cleanse(tmp_buf, sizeof tmp_buf);
                         OPENSSL_cleanse(epms, outl);
-                        }
+                }
 #endif
 #ifndef OPENSSL_NO_DH
-                else if (alg_k & (SSL_kEDH|SSL_kDHr|SSL_kDHd))
-                        {
-                        DH *dh_srvr,*dh_clnt;
+                else if (alg_k & (SSL_kEDH|SSL_kDHr|SSL_kDHd)) {
+                        DH *dh_srvr, *dh_clnt;
 
-                        if (s->session->sess_cert == NULL) 
-                                {
-                                ssl3_send_alert(s,SSL3_AL_FATAL,SSL_AD_UNEXPECTED_MESSAGE);
-                                SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,SSL_R_UNEXPECTED_MESSAGE);
+                        if (s->session->sess_cert == NULL) {
+                                ssl3_send_alert(s, SSL3_AL_FATAL, SSL_AD_UNEXPECTED_MESSAGE);
+                                SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE, SSL_R_UNEXPECTED_MESSAGE);
                                 goto err;
-                                }
+                        }
 
                         if (s->session->sess_cert->peer_dh_tmp != NULL)
-                                dh_srvr=s->session->sess_cert->peer_dh_tmp;
-                        else
-                                {
+                                dh_srvr = s->session->sess_cert->peer_dh_tmp;
+                        else {
                                 /* we get them from the cert */
-                                ssl3_send_alert(s,SSL3_AL_FATAL,SSL_AD_HANDSHAKE_FAILURE);
-                                SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,SSL_R_UNABLE_TO_FIND_DH_PARAMETERS);
+                                ssl3_send_alert(s, SSL3_AL_FATAL, SSL_AD_HANDSHAKE_FAILURE);
+                                SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE, SSL_R_UNABLE_TO_FIND_DH_PARAMETERS);
                                 goto err;
-                                }
-                        
+                        }
+
                         /* generate a new random key */
-                        if ((dh_clnt=DHparams_dup(dh_srvr)) == NULL)
-                                {
-                                SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,ERR_R_DH_LIB);
+                        if ((dh_clnt = DHparams_dup(dh_srvr)) == NULL) {
+                                SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE, ERR_R_DH_LIB);
                                 goto err;
-                                }
-                        if (!DH_generate_key(dh_clnt))
-                                {
-                                SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,ERR_R_DH_LIB);
+                        }
+                        if (!DH_generate_key(dh_clnt)) {
+                                SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE, ERR_R_DH_LIB);
                                 DH_free(dh_clnt);
                                 goto err;
-                                }
+                        }
 
                         /* use the 'p' output buffer for the DH key, but
                          * make sure to clear it out afterwards */
 
-                        n=DH_compute_key(p,dh_srvr->pub_key,dh_clnt);
+                        n = DH_compute_key(p, dh_srvr->pub_key, dh_clnt);
 
-                        if (n <= 0)
-                                {
-                                SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,ERR_R_DH_LIB);
+                        if (n <= 0) {
+                                SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE, ERR_R_DH_LIB);
                                 DH_free(dh_clnt);
                                 goto err;
-                                }
+                        }
 
                         /* generate master key from the result */
-                        s->session->master_key_length=
-                                s->method->ssl3_enc->generate_master_secret(s,
-                                        s->session->master_key,p,n);
+                        s->session->master_key_length =
+                        s->method->ssl3_enc->generate_master_secret(s,
+                        s->session->master_key, p, n);
                         /* clean up */
-                        memset(p,0,n);
+                        memset(p, 0, n);
 
                         /* send off the data */
-                        n=BN_num_bytes(dh_clnt->pub_key);
-                        s2n(n,p);
-                        BN_bn2bin(dh_clnt->pub_key,p);
-                        n+=2;
+                        n = BN_num_bytes(dh_clnt->pub_key);
+                        s2n(n, p);
+                        BN_bn2bin(dh_clnt->pub_key, p);
+                        n += 2;
 
                         DH_free(dh_clnt);
 
                         /* perhaps clean things up a bit EAY EAY EAY EAY*/
-                        }
+                }
 #endif
 
 #ifndef OPENSSL_NO_ECDH 
-                else if (alg_k & (SSL_kEECDH|SSL_kECDHr|SSL_kECDHe))
-                        {
+                else if (alg_k & (SSL_kEECDH|SSL_kECDHr|SSL_kECDHe)) {
                         const EC_GROUP *srvr_group = NULL;
                         EC_KEY *tkey;
                         int ecdh_clnt_cert = 0;
@@ -2515,8 +2345,7 @@ int ssl3_send_client_key_exchange(SSL *s)
                          * computation as part of client certificate?
                          * If so, set ecdh_clnt_cert to 1.
                          */
-                        if ((alg_k & (SSL_kECDHr|SSL_kECDHe)) && (s->cert != NULL)) 
-                                {
+                        if ((alg_k & (SSL_kECDHr|SSL_kECDHe)) && (s->cert != NULL)) {
                                 /* XXX: For now, we do not support client
                                  * authentication using ECDH certificates.
                                  * To add such support, one needs to add
@@ -2536,52 +2365,44 @@ int ssl3_send_client_key_exchange(SSL *s)
                                  *      EVP_PKEY_EC) && ...)
                                  * ecdh_clnt_cert = 1;
                                  */
-                                }
+                        }
 
-                        if (s->session->sess_cert->peer_ecdh_tmp != NULL)
-                                {
+                        if (s->session->sess_cert->peer_ecdh_tmp != NULL) {
                                 tkey = s->session->sess_cert->peer_ecdh_tmp;
-                                }
-                        else
-                                {
+                        } else {
                                 /* Get the Server Public Key from Cert */
                                 srvr_pub_pkey = X509_get_pubkey(s->session-> \
                                     sess_cert->peer_pkeys[SSL_PKEY_ECC].x509);
                                 if ((srvr_pub_pkey == NULL) ||
-                                    (srvr_pub_pkey->type != EVP_PKEY_EC) ||
-                                    (srvr_pub_pkey->pkey.ec == NULL))
-                                        {
+                                        (srvr_pub_pkey->type != EVP_PKEY_EC) ||
+                                (srvr_pub_pkey->pkey.ec == NULL)) {
                                         SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,
-                                            ERR_R_INTERNAL_ERROR);
+                                        ERR_R_INTERNAL_ERROR);
                                         goto err;
-                                        }
+                                }
 
                                 tkey = srvr_pub_pkey->pkey.ec;
-                                }
+                        }
 
-                        srvr_group   = EC_KEY_get0_group(tkey);
+                        srvr_group = EC_KEY_get0_group(tkey);
                         srvr_ecpoint = EC_KEY_get0_public_key(tkey);
 
-                        if ((srvr_group == NULL) || (srvr_ecpoint == NULL))
-                                {
+                        if ((srvr_group == NULL) || (srvr_ecpoint == NULL)) {
                                 SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,
-                                    ERR_R_INTERNAL_ERROR);
+                                ERR_R_INTERNAL_ERROR);
                                 goto err;
-                                }
+                        }
 
-                        if ((clnt_ecdh=EC_KEY_new()) == NULL) 
-                                {
-                                SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,ERR_R_MALLOC_FAILURE);
+                        if ((clnt_ecdh = EC_KEY_new()) == NULL) {
+                                SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE, ERR_R_MALLOC_FAILURE);
                                 goto err;
-                                }
+                        }
 
-                        if (!EC_KEY_set_group(clnt_ecdh, srvr_group))
-                                {
-                                SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,ERR_R_EC_LIB);
+                        if (!EC_KEY_set_group(clnt_ecdh, srvr_group)) {
+                                SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE, ERR_R_EC_LIB);
                                 goto err;
-                                }
-                        if (ecdh_clnt_cert) 
-                                { 
+                        }
+                        if (ecdh_clnt_cert) {
                                 /* Reuse key info from our certificate
                                  * We only need our private key to perform
                                  * the ECDH computation.
@@ -2589,581 +2410,529 @@ int ssl3_send_client_key_exchange(SSL *s)
                                 const BIGNUM *priv_key;
                                 tkey = s->cert->key->privatekey->pkey.ec;
                                 priv_key = EC_KEY_get0_private_key(tkey);
-                                if (priv_key == NULL)
-                                        {
-                                        SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,ERR_R_MALLOC_FAILURE);
+                                if (priv_key == NULL) {
+                                        SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE, ERR_R_MALLOC_FAILURE);
                                         goto err;
-                                        }
-                                if (!EC_KEY_set_private_key(clnt_ecdh, priv_key))
-                                        {
-                                        SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,ERR_R_EC_LIB);
+                                }
+                                if (!EC_KEY_set_private_key(clnt_ecdh, priv_key)) {
+                                        SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE, ERR_R_EC_LIB);
                                         goto err;
-                                        }
                                 }
-                        else 
-                                {
+                        } else {
                                 /* Generate a new ECDH key pair */
-                                if (!(EC_KEY_generate_key(clnt_ecdh)))
-                                        {
+                                if (!(EC_KEY_generate_key(clnt_ecdh))) {
                                         SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE, ERR_R_ECDH_LIB);
                                         goto err;
-                                        }
                                 }
+                        }
 
                         /* use the 'p' output buffer for the ECDH key, but
                          * make sure to clear it out afterwards
                          */
 
                         field_size = EC_GROUP_get_degree(srvr_group);
-                        if (field_size <= 0)
-                                {
-                                SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE, 
-                                       ERR_R_ECDH_LIB);
+                        if (field_size <= 0) {
+                                SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,
+                                ERR_R_ECDH_LIB);
                                 goto err;
-                                }
-                        n=ECDH_compute_key(p, (field_size+7)/8, srvr_ecpoint, clnt_ecdh, NULL);
-                        if (n <= 0)
-                                {
-                                SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE, 
-                                       ERR_R_ECDH_LIB);
+                        }
+                        n = ECDH_compute_key(p, (field_size + 7)/8, srvr_ecpoint, clnt_ecdh, NULL);
+                        if (n <= 0) {
+                                SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,
+                                ERR_R_ECDH_LIB);
                                 goto err;
-                                }
+                        }
 
                         /* generate master key from the result */
                         s->session->master_key_length = s->method->ssl3_enc \
                             -> generate_master_secret(s, 
-                                s->session->master_key,
-                                p, n);
+                        s->session->master_key,
+                        p, n);
 
                         memset(p, 0, n); /* clean up */
 
-                        if (ecdh_clnt_cert) 
-                                {
+                        if (ecdh_clnt_cert) {
                                 /* Send empty client key exch message */
                                 n = 0;
-                                }
-                        else 
-                                {
+                        } else {
                                 /* First check the size of encoding and
                                  * allocate memory accordingly.
                                  */
-                                encoded_pt_len = 
-                                    EC_POINT_point2oct(srvr_group, 
-                                        EC_KEY_get0_public_key(clnt_ecdh), 
-                                        POINT_CONVERSION_UNCOMPRESSED, 
-                                        NULL, 0, NULL);
-
-                                encodedPoint = (unsigned char *) 
-                                    OPENSSL_malloc(encoded_pt_len * 
-                                        sizeof(unsigned char)); 
+                                encoded_pt_len =
+                                   EC_POINT_point2oct(srvr_group,
+                                       EC_KEY_get0_public_key(clnt_ecdh),
+                                       POINT_CONVERSION_UNCOMPRESSED,
+                                       NULL, 0, NULL);
+
+                                encodedPoint =
+                                    (unsigned char *)OPENSSL_malloc(
+                                        encoded_pt_len * sizeof(unsigned char));
+
                                 bn_ctx = BN_CTX_new();
-                                if ((encodedPoint == NULL) || 
-                                    (bn_ctx == NULL)) 
-                                        {
-                                        SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,ERR_R_MALLOC_FAILURE);
+                                if ((encodedPoint == NULL) ||
+                                    (bn_ctx == NULL)) {
+                                        SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE, ERR_R_MALLOC_FAILURE);
                                         goto err;
-                                        }
+                                }
 
                                 /* Encode the public key */
-                                n = EC_POINT_point2oct(srvr_group, 
-                                    EC_KEY_get0_public_key(clnt_ecdh), 
-                                    POINT_CONVERSION_UNCOMPRESSED, 
-                                    encodedPoint, encoded_pt_len, bn_ctx);
+                                n = EC_POINT_point2oct(srvr_group,
+                                EC_KEY_get0_public_key(clnt_ecdh),
+                                POINT_CONVERSION_UNCOMPRESSED,
+                                encodedPoint, encoded_pt_len, bn_ctx);
 
                                 *p = n; /* length of encoded point */
                                 /* Encoded point will be copied here */
-                                p += 1; 
+                                p += 1;
+
                                 /* copy the point */
                                 memcpy((unsigned char *)p, encodedPoint, n);
                                 /* increment n to account for length field */
-                                n += 1; 
-                                }
+                                n += 1;
+
+                        }
 
                         /* Free allocated memory */
                         BN_CTX_free(bn_ctx);
-                        if (encodedPoint != NULL) OPENSSL_free(encodedPoint);
-                        if (clnt_ecdh != NULL) 
-                                 EC_KEY_free(clnt_ecdh);
+                        if (encodedPoint != NULL)
+                                OPENSSL_free(encodedPoint);
+                        if (clnt_ecdh != NULL)
+                                EC_KEY_free(clnt_ecdh);
                         EVP_PKEY_free(srvr_pub_pkey);
-                        }
+                }
 #endif /* !OPENSSL_NO_ECDH */
-                else if (alg_k & SSL_kGOST) 
-                        {
+                else if (alg_k & SSL_kGOST) {
                         /* GOST key exchange message creation */
                         EVP_PKEY_CTX *pkey_ctx;
-                        X509 *peer_cert; 
+                        X509 *peer_cert;
+
                         size_t msglen;
                         unsigned int md_len;
                         int keytype;
-                        unsigned char premaster_secret[32],shared_ukm[32], tmp[256];
+                        unsigned char premaster_secret[32], shared_ukm[32], tmp[256];
                         EVP_MD_CTX *ukm_hash;
                         EVP_PKEY *pub_key;
 
                         /* Get server sertificate PKEY and create ctx from it */
-                        peer_cert=s->session->sess_cert->peer_pkeys[(keytype=SSL_PKEY_GOST01)].x509;
-                        if (!peer_cert) 
-                                peer_cert=s->session->sess_cert->peer_pkeys[(keytype=SSL_PKEY_GOST94)].x509;
-                        if (!peer_cert)         {
-                                        SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,SSL_R_NO_GOST_CERTIFICATE_SENT_BY_PEER);
-                                        goto err;
-                                }       
-                                
-                        pkey_ctx=EVP_PKEY_CTX_new(pub_key=X509_get_pubkey(peer_cert),NULL);
+                        peer_cert = s->session->sess_cert->peer_pkeys[(keytype = SSL_PKEY_GOST01)].x509;
+                        if (!peer_cert)
+                                peer_cert = s->session->sess_cert->peer_pkeys[(keytype = SSL_PKEY_GOST94)].x509;
+                        if (!peer_cert) {
+                                SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE, SSL_R_NO_GOST_CERTIFICATE_SENT_BY_PEER);
+                                goto err;
+                        }
+
+                        pkey_ctx = EVP_PKEY_CTX_new(pub_key = X509_get_pubkey(peer_cert), NULL);
                         /* If we have send a certificate, and certificate key
 
                          * parameters match those of server certificate, use
                          * certificate key for key exchange
                          */
 
-                         /* Otherwise, generate ephemeral key pair */
-                                        
+                        /* Otherwise, generate ephemeral key pair */
+
                         EVP_PKEY_encrypt_init(pkey_ctx);
-                          /* Generate session key */    
-                    RAND_bytes(premaster_secret,32);
+                        /* Generate session key */
+                        RAND_bytes(premaster_secret, 32);
                         /* If we have client certificate, use its secret as peer key */
                         if (s->s3->tmp.cert_req && s->cert->key->privatekey) {
-                                if (EVP_PKEY_derive_set_peer(pkey_ctx,s->cert->key->privatekey) <=0) {
+                                if (EVP_PKEY_derive_set_peer(pkey_ctx, s->cert->key->privatekey) <=0) {
                                         /* If there was an error - just ignore it. Ephemeral key
                                         * would be used
                                         */
                                         ERR_clear_error();
                                 }
-                        }                       
+                        }
                         /* Compute shared IV and store it in algorithm-specific
                          * context data */
                         ukm_hash = EVP_MD_CTX_create();
-                        EVP_DigestInit(ukm_hash,EVP_get_digestbynid(NID_id_GostR3411_94));
-                        EVP_DigestUpdate(ukm_hash,s->s3->client_random,SSL3_RANDOM_SIZE);
-                        EVP_DigestUpdate(ukm_hash,s->s3->server_random,SSL3_RANDOM_SIZE);
+                        EVP_DigestInit(ukm_hash, EVP_get_digestbynid(NID_id_GostR3411_94));
+                        EVP_DigestUpdate(ukm_hash, s->s3->client_random, SSL3_RANDOM_SIZE);
+                        EVP_DigestUpdate(ukm_hash, s->s3->server_random, SSL3_RANDOM_SIZE);
                         EVP_DigestFinal_ex(ukm_hash, shared_ukm, &md_len);
                         EVP_MD_CTX_destroy(ukm_hash);
-                        if (EVP_PKEY_CTX_ctrl(pkey_ctx,-1,EVP_PKEY_OP_ENCRYPT,EVP_PKEY_CTRL_SET_IV,
-                                8,shared_ukm)<0) {
-                                        SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,
-                                                SSL_R_LIBRARY_BUG);
-                                        goto err;
-                                }       
+                        if (EVP_PKEY_CTX_ctrl(pkey_ctx, -1, EVP_PKEY_OP_ENCRYPT, EVP_PKEY_CTRL_SET_IV,
+                                8, shared_ukm) < 0) {
+                                SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,
+                                SSL_R_LIBRARY_BUG);
+                                goto err;
+                        }
                         /* Make GOST keytransport blob message */
                         /*Encapsulate it into sequence */
-                        *(p++)=V_ASN1_SEQUENCE | V_ASN1_CONSTRUCTED;
-                        msglen=255;
-                        if (EVP_PKEY_encrypt(pkey_ctx,tmp,&msglen,premaster_secret,32)<0) {
-                        SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,
-                                        SSL_R_LIBRARY_BUG);
+                        *(p++) = V_ASN1_SEQUENCE | V_ASN1_CONSTRUCTED;
+                        msglen = 255;
+                        if (EVP_PKEY_encrypt(pkey_ctx, tmp, &msglen, premaster_secret, 32) < 0) {
+                                SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,
+                                SSL_R_LIBRARY_BUG);
                                 goto err;
                         }
-                        if (msglen >= 0x80)
-                                {
-                                *(p++)=0x81;
-                                *(p++)= msglen & 0xff;
-                                n=msglen+3;
-                                }
-                        else
-                                {
-                                *(p++)= msglen & 0xff;
-                                n=msglen+2;
-                                }
+                        if (msglen >= 0x80) {
+                                *(p++) = 0x81;
+                                *(p++) = msglen & 0xff;
+                                n = msglen + 3;
+                        } else {
+                                *(p++) = msglen & 0xff;
+                                n = msglen + 2;
+                        }
                         memcpy(p, tmp, msglen);
                         /* Check if pubkey from client certificate was used */
-                        if (EVP_PKEY_CTX_ctrl(pkey_ctx, -1, -1, EVP_PKEY_CTRL_PEER_KEY, 2, NULL) > 0)
-                                {
+                        if (EVP_PKEY_CTX_ctrl(pkey_ctx, -1, -1, EVP_PKEY_CTRL_PEER_KEY, 2, NULL) > 0) {
                                 /* Set flag "skip certificate verify" */
                                 s->s3->flags |= TLS1_FLAGS_SKIP_CERT_VERIFY;
-                                }
+                        }
                         EVP_PKEY_CTX_free(pkey_ctx);
-                        s->session->master_key_length=
-                                s->method->ssl3_enc->generate_master_secret(s,
-                                        s->session->master_key,premaster_secret,32);
+                        s->session->master_key_length =
+                        s->method->ssl3_enc->generate_master_secret(s,
+                        s->session->master_key, premaster_secret, 32);
                         EVP_PKEY_free(pub_key);
 
-                        }
+                }
 #ifndef OPENSSL_NO_SRP
-                else if (alg_k & SSL_kSRP)
-                        {
-                        if (s->srp_ctx.A != NULL)
-                                {
+                else if (alg_k & SSL_kSRP) {
+                        if (s->srp_ctx.A != NULL) {
                                 /* send off the data */
-                                n=BN_num_bytes(s->srp_ctx.A);
-                                s2n(n,p);
-                                BN_bn2bin(s->srp_ctx.A,p);
-                                n+=2;
-                                }
-                        else
-                                {
-                                SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,ERR_R_INTERNAL_ERROR);
+                                n = BN_num_bytes(s->srp_ctx.A);
+                                s2n(n, p);
+                                BN_bn2bin(s->srp_ctx.A, p);
+                                n += 2;
+                        } else {
+                                SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE, ERR_R_INTERNAL_ERROR);
                                 goto err;
-                                }
+                        }
                         if (s->session->srp_username != NULL)
                                 OPENSSL_free(s->session->srp_username);
                         s->session->srp_username = BUF_strdup(s->srp_ctx.login);
-                        if (s->session->srp_username == NULL)
-                                {
+                        if (s->session->srp_username == NULL) {
                                 SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,
-                                        ERR_R_MALLOC_FAILURE);
+                                ERR_R_MALLOC_FAILURE);
                                 goto err;
-                                }
+                        }
 
-                        if ((s->session->master_key_length = SRP_generate_client_master_secret(s,s->session->master_key))<0)
-                                {
-                                SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,ERR_R_INTERNAL_ERROR);
+                        if ((s->session->master_key_length = SRP_generate_client_master_secret(s, s->session->master_key)) < 0) {
+                                SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE, ERR_R_INTERNAL_ERROR);
                                 goto err;
-                                }
                         }
+                }
 #endif
 #ifndef OPENSSL_NO_PSK
-                else if (alg_k & SSL_kPSK)
-                        {
+                else if (alg_k & SSL_kPSK) {
                         char identity[PSK_MAX_IDENTITY_LEN];
                         unsigned char *t = NULL;
-                        unsigned char psk_or_pre_ms[PSK_MAX_PSK_LEN*2+4];
+                        unsigned char psk_or_pre_ms[PSK_MAX_PSK_LEN*2 + 4];
                         unsigned int pre_ms_len = 0, psk_len = 0;
                         int psk_err = 1;
 
                         n = 0;
-                        if (s->psk_client_callback == NULL)
-                                {
+                        if (s->psk_client_callback == NULL) {
                                 SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,
-                                        SSL_R_PSK_NO_CLIENT_CB);
+                                SSL_R_PSK_NO_CLIENT_CB);
                                 goto err;
-                                }
+                        }
 
                         psk_len = s->psk_client_callback(s, s->ctx->psk_identity_hint,
-                                identity, PSK_MAX_IDENTITY_LEN,
-                                psk_or_pre_ms, sizeof(psk_or_pre_ms));
-                        if (psk_len > PSK_MAX_PSK_LEN)
-                                {
+                        identity, PSK_MAX_IDENTITY_LEN,
+                        psk_or_pre_ms, sizeof(psk_or_pre_ms));
+                        if (psk_len > PSK_MAX_PSK_LEN) {
                                 SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,
-                                        ERR_R_INTERNAL_ERROR);
+                                ERR_R_INTERNAL_ERROR);
                                 goto psk_err;
-                                }
-                        else if (psk_len == 0)
-                                {
+                        } else if (psk_len == 0) {
                                 SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,
-                                        SSL_R_PSK_IDENTITY_NOT_FOUND);
+                                SSL_R_PSK_IDENTITY_NOT_FOUND);
                                 goto psk_err;
-                                }
+                        }
 
                         /* create PSK pre_master_secret */
-                        pre_ms_len = 2+psk_len+2+psk_len;
+                        pre_ms_len = 2 + psk_len + 2 + psk_len;
                         t = psk_or_pre_ms;
-                        memmove(psk_or_pre_ms+psk_len+4, psk_or_pre_ms, psk_len);
+                        memmove(psk_or_pre_ms + psk_len + 4, psk_or_pre_ms, psk_len);
                         s2n(psk_len, t);
                         memset(t, 0, psk_len);
-                        t+=psk_len;
+                        t += psk_len;
                         s2n(psk_len, t);
 
                         if (s->session->psk_identity_hint != NULL)
                                 OPENSSL_free(s->session->psk_identity_hint);
                         s->session->psk_identity_hint = BUF_strdup(s->ctx->psk_identity_hint);
                         if (s->ctx->psk_identity_hint != NULL &&
-                                s->session->psk_identity_hint == NULL)
-                                {
+                            s->session->psk_identity_hint == NULL) {
                                 SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,
-                                        ERR_R_MALLOC_FAILURE);
+                                ERR_R_MALLOC_FAILURE);
                                 goto psk_err;
-                                }
+                        }
 
                         if (s->session->psk_identity != NULL)
                                 OPENSSL_free(s->session->psk_identity);
                         s->session->psk_identity = BUF_strdup(identity);
-                        if (s->session->psk_identity == NULL)
-                                {
+                        if (s->session->psk_identity == NULL) {
                                 SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,
-                                        ERR_R_MALLOC_FAILURE);
+                                ERR_R_MALLOC_FAILURE);
                                 goto psk_err;
-                                }
+                        }
 
                         s->session->master_key_length =
-                                s->method->ssl3_enc->generate_master_secret(s,
-                                        s->session->master_key,
-                                        psk_or_pre_ms, pre_ms_len); 
+                            s->method->ssl3_enc->generate_master_secret(
+                                s, s->session->master_key, psk_or_pre_ms,
+                                pre_ms_len);
+
                         n = strlen(identity);
                         s2n(n, p);
                         memcpy(p, identity, n);
-                        n+=2;
+                        n += 2;
                         psk_err = 0;
-                psk_err:
+                        psk_err:
                         OPENSSL_cleanse(identity, PSK_MAX_IDENTITY_LEN);
                         OPENSSL_cleanse(psk_or_pre_ms, sizeof(psk_or_pre_ms));
-                        if (psk_err != 0)
-                                {
+                        if (psk_err != 0) {
                                 ssl3_send_alert(s, SSL3_AL_FATAL, SSL_AD_HANDSHAKE_FAILURE);
                                 goto err;
-                                }
                         }
+                }
 #endif
-                else
-                        {
+                else {
                         ssl3_send_alert(s, SSL3_AL_FATAL,
-                            SSL_AD_HANDSHAKE_FAILURE);
+                        SSL_AD_HANDSHAKE_FAILURE);
                         SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,
-                            ERR_R_INTERNAL_ERROR);
+                        ERR_R_INTERNAL_ERROR);
                         goto err;
-                        }
-                
-                *(d++)=SSL3_MT_CLIENT_KEY_EXCHANGE;
-                l2n3(n,d);
+                }
 
-                s->state=SSL3_ST_CW_KEY_EXCH_B;
+                *(d++) = SSL3_MT_CLIENT_KEY_EXCHANGE;
+                l2n3(n, d);
+
+                s->state = SSL3_ST_CW_KEY_EXCH_B;
                 /* number of bytes to write */
-                s->init_num=n+4;
-                s->init_off=0;
-                }
+                s->init_num = n + 4;
+                s->init_off = 0;
+        }
 
         /* SSL3_ST_CW_KEY_EXCH_B */
-        return(ssl3_do_write(s,SSL3_RT_HANDSHAKE));
+        return (ssl3_do_write(s, SSL3_RT_HANDSHAKE));
 err:
 #ifndef OPENSSL_NO_ECDH
         BN_CTX_free(bn_ctx);
-        if (encodedPoint != NULL) OPENSSL_free(encodedPoint);
-        if (clnt_ecdh != NULL) 
+        if (encodedPoint != NULL)
+                OPENSSL_free(encodedPoint);
+        if (clnt_ecdh != NULL)
                 EC_KEY_free(clnt_ecdh);
         EVP_PKEY_free(srvr_pub_pkey);
 #endif
-        return(-1);
-        }
+        return (-1);
+}
 
-int ssl3_send_client_verify(SSL *s)
-        {
-        unsigned char *p,*d;
-        unsigned char data[MD5_DIGEST_LENGTH+SHA_DIGEST_LENGTH];
+int
+ssl3_send_client_verify(SSL *s)
+{
+        unsigned char *p, *d;
+        unsigned char data[MD5_DIGEST_LENGTH + SHA_DIGEST_LENGTH];
         EVP_PKEY *pkey;
-        EVP_PKEY_CTX *pctx=NULL;
+        EVP_PKEY_CTX *pctx = NULL;
         EVP_MD_CTX mctx;
-        unsigned u=0;
+        unsigned u = 0;
         unsigned long n;
         int j;
 
         EVP_MD_CTX_init(&mctx);
 
-        if (s->state == SSL3_ST_CW_CERT_VRFY_A)
-                {
-                d=(unsigned char *)s->init_buf->data;
-                p= &(d[4]);
-                pkey=s->cert->key->privatekey;
+        if (s->state == SSL3_ST_CW_CERT_VRFY_A) {
+                d = (unsigned char *)s->init_buf->data;
+                p = &(d[4]);
+                pkey = s->cert->key->privatekey;
 /* Create context from key and test if sha1 is allowed as digest */
-                pctx = EVP_PKEY_CTX_new(pkey,NULL);
+                pctx = EVP_PKEY_CTX_new(pkey, NULL);
                 EVP_PKEY_sign_init(pctx);
-                if (EVP_PKEY_CTX_set_signature_md(pctx, EVP_sha1())>0)
-                        {
+                if (EVP_PKEY_CTX_set_signature_md(pctx, EVP_sha1()) > 0) {
                         if (TLS1_get_version(s) < TLS1_2_VERSION)
                                 s->method->ssl3_enc->cert_verify_mac(s,
-                                                NID_sha1,
-                                                &(data[MD5_DIGEST_LENGTH]));
-                        }
-                else
-                        {
+                        NID_sha1,
+                        &(data[MD5_DIGEST_LENGTH]));
+                } else {
                         ERR_clear_error();
-                        }
+                }
                 /* For TLS v1.2 send signature algorithm and signature
                  * using agreed digest and cached handshake records.
                  */
-                if (TLS1_get_version(s) >= TLS1_2_VERSION)
-                        {
+                if (TLS1_get_version(s) >= TLS1_2_VERSION) {
                         long hdatalen = 0;
                         void *hdata;
                         const EVP_MD *md = s->cert->key->digest;
                         hdatalen = BIO_get_mem_data(s->s3->handshake_buffer,
-                                                                &hdata);
-                        if (hdatalen <= 0 || !tls12_get_sigandhash(p, pkey, md))
-                                {
+                        &hdata);
+                        if (hdatalen <= 0 || !tls12_get_sigandhash(p, pkey, md)) {
                                 SSLerr(SSL_F_SSL3_SEND_CLIENT_VERIFY,
-                                                ERR_R_INTERNAL_ERROR);
+                                ERR_R_INTERNAL_ERROR);
                                 goto err;
-                                }
+                        }
                         p += 2;
 #ifdef SSL_DEBUG
                         fprintf(stderr, "Using TLS 1.2 with client alg %s\n",
-                                                        EVP_MD_name(md));
+                        EVP_MD_name(md));
 #endif
-                        if (!EVP_SignInit_ex(&mctx, md, NULL)
-                                || !EVP_SignUpdate(&mctx, hdata, hdatalen)
-                                || !EVP_SignFinal(&mctx, p + 2, &u, pkey))
-                                {
+                        if (!EVP_SignInit_ex(&mctx, md, NULL) ||
+                            !EVP_SignUpdate(&mctx, hdata, hdatalen) ||
+                            !EVP_SignFinal(&mctx, p + 2, &u, pkey)) {
                                 SSLerr(SSL_F_SSL3_SEND_CLIENT_VERIFY,
-                                                ERR_R_EVP_LIB);
+                                ERR_R_EVP_LIB);
                                 goto err;
-                                }
-                        s2n(u,p);
+                        }
+                        s2n(u, p);
                         n = u + 4;
                         if (!ssl3_digest_cached_records(s))
                                 goto err;
-                        }
-                else
+                } else
 #ifndef OPENSSL_NO_RSA
-                if (pkey->type == EVP_PKEY_RSA)
-                        {
-                        s->method->ssl3_enc->cert_verify_mac(s,
-                                NID_md5,
-                                &(data[0]));
+                if (pkey->type == EVP_PKEY_RSA) {
+                        s->method->ssl3_enc->cert_verify_mac(
+                            s, NID_md5, &(data[0]));
                         if (RSA_sign(NID_md5_sha1, data,
-                                         MD5_DIGEST_LENGTH+SHA_DIGEST_LENGTH,
-                                        &(p[2]), &u, pkey->pkey.rsa) <= 0 )
-                                {
-                                SSLerr(SSL_F_SSL3_SEND_CLIENT_VERIFY,ERR_R_RSA_LIB);
+                            MD5_DIGEST_LENGTH + SHA_DIGEST_LENGTH, &(p[2]),
+                            &u, pkey->pkey.rsa) <= 0 ) {
+                                SSLerr(SSL_F_SSL3_SEND_CLIENT_VERIFY, ERR_R_RSA_LIB);
                                 goto err;
-                                }
-                        s2n(u,p);
-                        n=u+2;
                         }
-                else
+                        s2n(u, p);
+                        n = u + 2;
+                } else
 #endif
 #ifndef OPENSSL_NO_DSA
-                        if (pkey->type == EVP_PKEY_DSA)
-                        {
+                if (pkey->type == EVP_PKEY_DSA) {
                         if (!DSA_sign(pkey->save_type,
-                                &(data[MD5_DIGEST_LENGTH]),
-                                SHA_DIGEST_LENGTH,&(p[2]),
-                                (unsigned int *)&j,pkey->pkey.dsa))
-                                {
-                                SSLerr(SSL_F_SSL3_SEND_CLIENT_VERIFY,ERR_R_DSA_LIB);
+                            &(data[MD5_DIGEST_LENGTH]),
+                            SHA_DIGEST_LENGTH, &(p[2]),
+                            (unsigned int *)&j, pkey->pkey.dsa)) {
+                                SSLerr(SSL_F_SSL3_SEND_CLIENT_VERIFY, ERR_R_DSA_LIB);
                                 goto err;
-                                }
-                        s2n(j,p);
-                        n=j+2;
                         }
-                else
+                        s2n(j, p);
+                        n = j + 2;
+                } else
 #endif
 #ifndef OPENSSL_NO_ECDSA
-                        if (pkey->type == EVP_PKEY_EC)
-                        {
+                if (pkey->type == EVP_PKEY_EC) {
                         if (!ECDSA_sign(pkey->save_type,
-                                &(data[MD5_DIGEST_LENGTH]),
-                                SHA_DIGEST_LENGTH,&(p[2]),
-                                (unsigned int *)&j,pkey->pkey.ec))
-                                {
+                            &(data[MD5_DIGEST_LENGTH]),
+                            SHA_DIGEST_LENGTH, &(p[2]),
+                            (unsigned int *)&j, pkey->pkey.ec)) {
                                 SSLerr(SSL_F_SSL3_SEND_CLIENT_VERIFY,
-                                    ERR_R_ECDSA_LIB);
+                                ERR_R_ECDSA_LIB);
                                 goto err;
-                                }
-                        s2n(j,p);
-                        n=j+2;
                         }
-                else
+                        s2n(j, p);
+                        n = j + 2;
+                } else
 #endif
-                if (pkey->type == NID_id_GostR3410_94 || pkey->type == NID_id_GostR3410_2001) 
-                {
-                unsigned char signbuf[64];
-                int i;
-                size_t sigsize=64;
-                s->method->ssl3_enc->cert_verify_mac(s,
+                if (pkey->type == NID_id_GostR3410_94 || pkey->type == NID_id_GostR3410_2001) {
+                        unsigned char signbuf[64];
+                        int i;
+                        size_t sigsize = 64;
+                        s->method->ssl3_enc->cert_verify_mac(s,
                         NID_id_GostR3411_94,
                         data);
-                if (EVP_PKEY_sign(pctx, signbuf, &sigsize, data, 32) <= 0) {
-                        SSLerr(SSL_F_SSL3_SEND_CLIENT_VERIFY,
-                        ERR_R_INTERNAL_ERROR);
-                        goto err;
-                }
-                for (i=63,j=0; i>=0; j++, i--) {
-                        p[2+j]=signbuf[i];
-                }       
-                s2n(j,p);
-                n=j+2;
-                }
-                else
-                {
-                        SSLerr(SSL_F_SSL3_SEND_CLIENT_VERIFY,ERR_R_INTERNAL_ERROR);
+                        if (EVP_PKEY_sign(pctx, signbuf, &sigsize, data, 32) <= 0) {
+                                SSLerr(SSL_F_SSL3_SEND_CLIENT_VERIFY,
+                                ERR_R_INTERNAL_ERROR);
+                                goto err;
+                        }
+                        for (i = 63, j = 0; i >= 0; j++, i--) {
+                                p[2 + j] = signbuf[i];
+                        }
+                        s2n(j, p);
+                        n = j + 2;
+                } else {
+                        SSLerr(SSL_F_SSL3_SEND_CLIENT_VERIFY, ERR_R_INTERNAL_ERROR);
                         goto err;
                 }
-                *(d++)=SSL3_MT_CERTIFICATE_VERIFY;
-                l2n3(n,d);
+                *(d++) = SSL3_MT_CERTIFICATE_VERIFY;
+                l2n3(n, d);
 
-                s->state=SSL3_ST_CW_CERT_VRFY_B;
-                s->init_num=(int)n+4;
-                s->init_off=0;
-                }
+                s->state = SSL3_ST_CW_CERT_VRFY_B;
+                s->init_num = (int)n + 4;
+                s->init_off = 0;
+        }
         EVP_MD_CTX_cleanup(&mctx);
         EVP_PKEY_CTX_free(pctx);
-        return(ssl3_do_write(s,SSL3_RT_HANDSHAKE));
+        return (ssl3_do_write(s, SSL3_RT_HANDSHAKE));
 err:
         EVP_MD_CTX_cleanup(&mctx);
         EVP_PKEY_CTX_free(pctx);
-        return(-1);
-        }
+        return (-1);
+}
 
-int ssl3_send_client_certificate(SSL *s)
-        {
-        X509 *x509=NULL;
-        EVP_PKEY *pkey=NULL;
+int
+ssl3_send_client_certificate(SSL *s)
+{
+        X509 *x509 = NULL;
+        EVP_PKEY *pkey = NULL;
         int i;
         unsigned long l;
 
-        if (s->state == SSL3_ST_CW_CERT_A)
-                {
-                if ((s->cert == NULL) ||
-                        (s->cert->key->x509 == NULL) ||
-                        (s->cert->key->privatekey == NULL))
-                        s->state=SSL3_ST_CW_CERT_B;
+        if (s->state == SSL3_ST_CW_CERT_A) {
+                if ((s->cert == NULL) || (s->cert->key->x509 == NULL) ||
+                    (s->cert->key->privatekey == NULL))
+                        s->state = SSL3_ST_CW_CERT_B;
                 else
-                        s->state=SSL3_ST_CW_CERT_C;
-                }
+                        s->state = SSL3_ST_CW_CERT_C;
+        }
 
         /* We need to get a client cert */
-        if (s->state == SSL3_ST_CW_CERT_B)
-                {
+        if (s->state == SSL3_ST_CW_CERT_B) {
                 /* If we get an error, we need to
                  * ssl->rwstate=SSL_X509_LOOKUP; return(-1);
                  * We then get retied later */
-                i=0;
+                i = 0;
                 i = ssl_do_client_cert_cb(s, &x509, &pkey);
-                if (i < 0)
-                        {
-                        s->rwstate=SSL_X509_LOOKUP;
-                        return(-1);
-                        }
-                s->rwstate=SSL_NOTHING;
-                if ((i == 1) && (pkey != NULL) && (x509 != NULL))
-                        {
-                        s->state=SSL3_ST_CW_CERT_B;
-                        if (    !SSL_use_certificate(s,x509) ||
-                                !SSL_use_PrivateKey(s,pkey))
-                                i=0;
-                        }
-                else if (i == 1)
-                        {
-                        i=0;
-                        SSLerr(SSL_F_SSL3_SEND_CLIENT_CERTIFICATE,SSL_R_BAD_DATA_RETURNED_BY_CALLBACK);
-                        }
-
-                if (x509 != NULL) X509_free(x509);
-                if (pkey != NULL) EVP_PKEY_free(pkey);
-                if (i == 0)
-                        {
-                        if (s->version == SSL3_VERSION)
-                                {
-                                s->s3->tmp.cert_req=0;
-                                ssl3_send_alert(s,SSL3_AL_WARNING,SSL_AD_NO_CERTIFICATE);
-                                return(1);
-                                }
-                        else
-                                {
-                                s->s3->tmp.cert_req=2;
-                                }
+                if (i < 0) {
+                        s->rwstate = SSL_X509_LOOKUP;
+                        return (-1);
+                }
+                s->rwstate = SSL_NOTHING;
+                if ((i == 1) && (pkey != NULL) && (x509 != NULL)) {
+                        s->state = SSL3_ST_CW_CERT_B;
+                        if (!SSL_use_certificate(s, x509) ||
+                            !SSL_use_PrivateKey(s, pkey))
+                                i = 0;
+                } else if (i == 1) {
+                        i = 0;
+                        SSLerr(SSL_F_SSL3_SEND_CLIENT_CERTIFICATE, SSL_R_BAD_DATA_RETURNED_BY_CALLBACK);
+                }
+
+                if (x509 != NULL)
+                        X509_free(x509);
+                if (pkey != NULL)
+                        EVP_PKEY_free(pkey);
+                if (i == 0) {
+                        if (s->version == SSL3_VERSION) {
+                                s->s3->tmp.cert_req = 0;
+                                ssl3_send_alert(s, SSL3_AL_WARNING, SSL_AD_NO_CERTIFICATE);
+                                return (1);
+                        } else {
+                                s->s3->tmp.cert_req = 2;
                         }
+                }
 
                 /* Ok, we have a cert */
-                s->state=SSL3_ST_CW_CERT_C;
-                }
+                s->state = SSL3_ST_CW_CERT_C;
+        }
 
-        if (s->state == SSL3_ST_CW_CERT_C)
-                {
-                s->state=SSL3_ST_CW_CERT_D;
-                l=ssl3_output_cert_chain(s,
-                        (s->s3->tmp.cert_req == 2)?NULL:s->cert->key->x509);
-                s->init_num=(int)l;
-                s->init_off=0;
-                }
-        /* SSL3_ST_CW_CERT_D */
-        return(ssl3_do_write(s,SSL3_RT_HANDSHAKE));
+        if (s->state == SSL3_ST_CW_CERT_C) {
+                s->state = SSL3_ST_CW_CERT_D;
+                l = ssl3_output_cert_chain(s,
+                (s->s3->tmp.cert_req == 2) ? NULL : s->cert->key->x509);
+                s->init_num = (int)l;
+                s->init_off = 0;
         }
+        /* SSL3_ST_CW_CERT_D */
+        return (ssl3_do_write(s, SSL3_RT_HANDSHAKE));
+}
 
 #define has_bits(i,m)   (((i)&(m)) == (m))
 
-int ssl3_check_cert_and_algorithm(SSL *s)
-        {
-        int i,idx;
-        long alg_k,alg_a;
-        EVP_PKEY *pkey=NULL;
+int
+ssl3_check_cert_and_algorithm(SSL *s)
+{
+        int i, idx;
+        long alg_k, alg_a;
+        EVP_PKEY *pkey = NULL;
         SESS_CERT *sc;
 #ifndef OPENSSL_NO_RSA
         RSA *rsa;
@@ -3172,138 +2941,120 @@ int ssl3_check_cert_and_algorithm(SSL *s)
         DH *dh;
 #endif
 
-        alg_k=s->s3->tmp.new_cipher->algorithm_mkey;
-        alg_a=s->s3->tmp.new_cipher->algorithm_auth;
+        alg_k = s->s3->tmp.new_cipher->algorithm_mkey;
+        alg_a = s->s3->tmp.new_cipher->algorithm_auth;
 
         /* we don't have a certificate */
         if ((alg_a & (SSL_aDH|SSL_aNULL|SSL_aKRB5)) || (alg_k & SSL_kPSK))
-                return(1);
+                return (1);
 
-        sc=s->session->sess_cert;
-        if (sc == NULL)
-                {
-                SSLerr(SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM,ERR_R_INTERNAL_ERROR);
+        sc = s->session->sess_cert;
+        if (sc == NULL) {
+                SSLerr(SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM, ERR_R_INTERNAL_ERROR);
                 goto err;
-                }
+        }
 
 #ifndef OPENSSL_NO_RSA
-        rsa=s->session->sess_cert->peer_rsa_tmp;
+        rsa = s->session->sess_cert->peer_rsa_tmp;
 #endif
 #ifndef OPENSSL_NO_DH
-        dh=s->session->sess_cert->peer_dh_tmp;
+        dh = s->session->sess_cert->peer_dh_tmp;
 #endif
 
         /* This is the passed certificate */
 
-        idx=sc->peer_cert_type;
+        idx = sc->peer_cert_type;
 #ifndef OPENSSL_NO_ECDH
-        if (idx == SSL_PKEY_ECC)
-                {
+        if (idx == SSL_PKEY_ECC) {
                 if (ssl_check_srvr_ecc_cert_and_alg(sc->peer_pkeys[idx].x509,
-                                                                s) == 0) 
+                        s) == 0)
                         { /* check failed */
-                        SSLerr(SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM,SSL_R_BAD_ECC_CERT);
+                        SSLerr(SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM, SSL_R_BAD_ECC_CERT);
                         goto f_err;
-                        }
-                else 
-                        {
+                } else {
                         return 1;
-                        }
                 }
+        }
 #endif
-        pkey=X509_get_pubkey(sc->peer_pkeys[idx].x509);
-        i=X509_certificate_type(sc->peer_pkeys[idx].x509,pkey);
+        pkey = X509_get_pubkey(sc->peer_pkeys[idx].x509);
+        i = X509_certificate_type(sc->peer_pkeys[idx].x509, pkey);
         EVP_PKEY_free(pkey);
 
-        
+
         /* Check that we have a certificate if we require one */
-        if ((alg_a & SSL_aRSA) && !has_bits(i,EVP_PK_RSA|EVP_PKT_SIGN))
-                {
-                SSLerr(SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM,SSL_R_MISSING_RSA_SIGNING_CERT);
+        if ((alg_a & SSL_aRSA) && !has_bits(i, EVP_PK_RSA|EVP_PKT_SIGN)) {
+                SSLerr(SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM, SSL_R_MISSING_RSA_SIGNING_CERT);
                 goto f_err;
-                }
+        }
 #ifndef OPENSSL_NO_DSA
-        else if ((alg_a & SSL_aDSS) && !has_bits(i,EVP_PK_DSA|EVP_PKT_SIGN))
-                {
-                SSLerr(SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM,SSL_R_MISSING_DSA_SIGNING_CERT);
+        else if ((alg_a & SSL_aDSS) && !has_bits(i, EVP_PK_DSA|EVP_PKT_SIGN)) {
+                SSLerr(SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM, SSL_R_MISSING_DSA_SIGNING_CERT);
                 goto f_err;
-                }
+        }
 #endif
 #ifndef OPENSSL_NO_RSA
         if ((alg_k & SSL_kRSA) &&
-                !(has_bits(i,EVP_PK_RSA|EVP_PKT_ENC) || (rsa != NULL)))
-                {
-                SSLerr(SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM,SSL_R_MISSING_RSA_ENCRYPTING_CERT);
+            !(has_bits(i, EVP_PK_RSA|EVP_PKT_ENC) || (rsa != NULL))) {
+                SSLerr(SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM, SSL_R_MISSING_RSA_ENCRYPTING_CERT);
                 goto f_err;
-                }
+        }
 #endif
 #ifndef OPENSSL_NO_DH
         if ((alg_k & SSL_kEDH) &&
-                !(has_bits(i,EVP_PK_DH|EVP_PKT_EXCH) || (dh != NULL)))
-                {
-                SSLerr(SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM,SSL_R_MISSING_DH_KEY);
+            !(has_bits(i, EVP_PK_DH|EVP_PKT_EXCH) || (dh != NULL))) {
+                SSLerr(SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM, SSL_R_MISSING_DH_KEY);
                 goto f_err;
-                }
-        else if ((alg_k & SSL_kDHr) && !has_bits(i,EVP_PK_DH|EVP_PKS_RSA))
-                {
-                SSLerr(SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM,SSL_R_MISSING_DH_RSA_CERT);
+        } else if ((alg_k & SSL_kDHr) && !has_bits(i, EVP_PK_DH|EVP_PKS_RSA)) {
+                SSLerr(SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM, SSL_R_MISSING_DH_RSA_CERT);
                 goto f_err;
-                }
+        }
 #ifndef OPENSSL_NO_DSA
-        else if ((alg_k & SSL_kDHd) && !has_bits(i,EVP_PK_DH|EVP_PKS_DSA))
-                {
-                SSLerr(SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM,SSL_R_MISSING_DH_DSA_CERT);
+        else if ((alg_k & SSL_kDHd) && !has_bits(i, EVP_PK_DH|EVP_PKS_DSA)) {
+                SSLerr(SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM, SSL_R_MISSING_DH_DSA_CERT);
                 goto f_err;
-                }
+        }
 #endif
 #endif
 
-        if (SSL_C_IS_EXPORT(s->s3->tmp.new_cipher) && !has_bits(i,EVP_PKT_EXP))
-                {
+        if (SSL_C_IS_EXPORT(s->s3->tmp.new_cipher) && !has_bits(i, EVP_PKT_EXP)) {
 #ifndef OPENSSL_NO_RSA
-                if (alg_k & SSL_kRSA)
-                        {
-                        if (rsa == NULL
-                            || RSA_size(rsa)*8 > SSL_C_EXPORT_PKEYLENGTH(s->s3->tmp.new_cipher))
-                                {
-                                SSLerr(SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM,SSL_R_MISSING_EXPORT_TMP_RSA_KEY);
+                if (alg_k & SSL_kRSA) {
+                        if (rsa == NULL ||
+                            RSA_size(rsa) * 8 > SSL_C_EXPORT_PKEYLENGTH(s->s3->tmp.new_cipher)) {
+                                SSLerr(SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM, SSL_R_MISSING_EXPORT_TMP_RSA_KEY);
                                 goto f_err;
-                                }
                         }
-                else
+                } else
 #endif
 #ifndef OPENSSL_NO_DH
-                        if (alg_k & (SSL_kEDH|SSL_kDHr|SSL_kDHd))
-                            {
-                            if (dh == NULL
-                                || DH_size(dh)*8 > SSL_C_EXPORT_PKEYLENGTH(s->s3->tmp.new_cipher))
-                                {
-                                SSLerr(SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM,SSL_R_MISSING_EXPORT_TMP_DH_KEY);
+                if (alg_k & (SSL_kEDH|SSL_kDHr|SSL_kDHd)) {
+                        if (dh == NULL ||
+                            DH_size(dh) * 8 > SSL_C_EXPORT_PKEYLENGTH(s->s3->tmp.new_cipher)) {
+                                SSLerr(SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM, SSL_R_MISSING_EXPORT_TMP_DH_KEY);
                                 goto f_err;
-                                }
                         }
-                else
+                } else
 #endif
-                        {
-                        SSLerr(SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM,SSL_R_UNKNOWN_KEY_EXCHANGE_TYPE);
+                {
+                        SSLerr(SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM, SSL_R_UNKNOWN_KEY_EXCHANGE_TYPE);
                         goto f_err;
-                        }
                 }
-        return(1);
+        }
+        return (1);
 f_err:
-        ssl3_send_alert(s,SSL3_AL_FATAL,SSL_AD_HANDSHAKE_FAILURE);
+        ssl3_send_alert(s, SSL3_AL_FATAL, SSL_AD_HANDSHAKE_FAILURE);
 err:
-        return(0);
-        }
+        return (0);
+}
 
 #if !defined(OPENSSL_NO_TLSEXT) && !defined(OPENSSL_NO_NEXTPROTONEG)
-int ssl3_send_next_proto(SSL *s)
-        {
+int
+ssl3_send_next_proto(SSL *s)
+{
         unsigned int len, padding_len;
         unsigned char *d;
 
-        if (s->state == SSL3_ST_CW_NEXT_PROTO_A)
-                {
+        if (s->state == SSL3_ST_CW_NEXT_PROTO_A) {
                 len = s->next_proto_negotiated_len;
                 padding_len = 32 - ((len + 2) % 32);
                 d = (unsigned char *)s->init_buf->data;
@@ -3311,12 +3062,12 @@ int ssl3_send_next_proto(SSL *s)
                 memcpy(d + 5, s->next_proto_negotiated, len);
                 d[5 + len] = padding_len;
                 memset(d + 6 + len, 0, padding_len);
-                *(d++)=SSL3_MT_NEXT_PROTO;
+                *(d++) = SSL3_MT_NEXT_PROTO;
                 l2n3(2 + len + padding_len, d);
                 s->state = SSL3_ST_CW_NEXT_PROTO_B;
                 s->init_num = 4 + 2 + len + padding_len;
                 s->init_off = 0;
-                }
+        }
 
         return ssl3_do_write(s, SSL3_RT_HANDSHAKE);
 }
@@ -3328,8 +3079,9 @@ int ssl3_send_next_proto(SSL *s)
  */
 
 #ifndef OPENSSL_NO_TLSEXT
-int ssl3_check_finished(SSL *s)
-        {
+int
+ssl3_check_finished(SSL *s)
+{
         int ok;
         long n;
         /* If we have no ticket it cannot be a resumed session. */
@@ -3337,36 +3089,33 @@ int ssl3_check_finished(SSL *s)
                 return 1;
         /* this function is called when we really expect a Certificate
          * message, so permit appropriate message length */
-        n=s->method->ssl_get_message(s,
-                SSL3_ST_CR_CERT_A,
-                SSL3_ST_CR_CERT_B,
-                -1,
-                s->max_cert_list,
-                &ok);
-        if (!ok) return((int)n);
+        n = s->method->ssl_get_message(s, SSL3_ST_CR_CERT_A,
+            SSL3_ST_CR_CERT_B, -1, s->max_cert_list, &ok);
+        if (!ok)
+                return ((int)n);
         s->s3->tmp.reuse_message = 1;
-        if ((s->s3->tmp.message_type == SSL3_MT_FINISHED)
-                || (s->s3->tmp.message_type == SSL3_MT_NEWSESSION_TICKET))
+        if ((s->s3->tmp.message_type == SSL3_MT_FINISHED) ||
+            (s->s3->tmp.message_type == SSL3_MT_NEWSESSION_TICKET))
                 return 2;
 
         return 1;
-        }
+}
 #endif
 
-int ssl_do_client_cert_cb(SSL *s, X509 **px509, EVP_PKEY **ppkey)
-        {
+int
+ssl_do_client_cert_cb(SSL *s, X509 **px509, EVP_PKEY **ppkey)
+{
         int i = 0;
 #ifndef OPENSSL_NO_ENGINE
-        if (s->ctx->client_cert_engine)
-                {
+        if (s->ctx->client_cert_engine) {
                 i = ENGINE_load_ssl_client_cert(s->ctx->client_cert_engine, s,
-                                                SSL_get_client_CA_list(s),
-                                                px509, ppkey, NULL, NULL, NULL);
+                SSL_get_client_CA_list(s),
+                px509, ppkey, NULL, NULL, NULL);
                 if (i != 0)
                         return i;
-                }
+        }
 #endif
         if (s->ctx->client_cert_cb)
-                i = s->ctx->client_cert_cb(s,px509,ppkey);
+                i = s->ctx->client_cert_cb(s, px509, ppkey);
         return i;
-        }
+}
diff --git a/src/lib/libssl/s3_srvr.c b/src/lib/libssl/s3_srvr.c
index 518dfcd5e2..eeadb160d1 100644
--- a/src/lib/libssl/s3_srvr.c
+++ b/src/lib/libssl/s3_srvr.c
@@ -171,92 +171,86 @@
 
 static const SSL_METHOD *ssl3_get_server_method(int ver);
 
-static const SSL_METHOD *ssl3_get_server_method(int ver)
-        {
+static const SSL_METHOD
+*ssl3_get_server_method(int ver)
+{
         if (ver == SSL3_VERSION)
-                return(SSLv3_server_method());
+                return (SSLv3_server_method());
         else
-                return(NULL);
-        }
+                return (NULL);
+}
 
 #ifndef OPENSSL_NO_SRP
-static int ssl_check_srp_ext_ClientHello(SSL *s, int *al)
-        {
+static int
+ssl_check_srp_ext_ClientHello(SSL *s, int *al)
+{
         int ret = SSL_ERROR_NONE;
 
         *al = SSL_AD_UNRECOGNIZED_NAME;
 
         if ((s->s3->tmp.new_cipher->algorithm_mkey & SSL_kSRP) &&
-            (s->srp_ctx.TLS_ext_srp_username_callback != NULL))
-                {
-                if(s->srp_ctx.login == NULL)
-                        {
+                (s->srp_ctx.TLS_ext_srp_username_callback != NULL)) {
+                if (s->srp_ctx.login == NULL) {
                         /* RFC 5054 says SHOULD reject, 
                            we do so if There is no srp login name */
                         ret = SSL3_AL_FATAL;
                         *al = SSL_AD_UNKNOWN_PSK_IDENTITY;
-                        }
-                else
-                        {
-                        ret = SSL_srp_server_param_with_username(s,al);
-                        }
+                } else {
+                        ret = SSL_srp_server_param_with_username(s, al);
                 }
-        return ret;
         }
+        return ret;
+}
 #endif
 
 IMPLEMENT_ssl3_meth_func(SSLv3_server_method,
-                        ssl3_accept,
-                        ssl_undefined_function,
-                        ssl3_get_server_method)
+    ssl3_accept, ssl_undefined_function, ssl3_get_server_method)
 
-int ssl3_accept(SSL *s)
-        {
+int
+ssl3_accept(SSL *s)
+{
         BUF_MEM *buf;
-        unsigned long alg_k,Time=(unsigned long)time(NULL);
-        void (*cb)(const SSL *ssl,int type,int val)=NULL;
-        int ret= -1;
-        int new_state,state,skip=0;
+        unsigned long alg_k, Time = (unsigned long)time(NULL);
+        void (*cb)(const SSL *ssl, int type, int val) = NULL;
+        int ret = -1;
+        int new_state, state, skip = 0;
 
-        RAND_add(&Time,sizeof(Time),0);
+        RAND_add(&Time, sizeof(Time), 0);
         ERR_clear_error();
         errno = 0;
 
         if (s->info_callback != NULL)
-                cb=s->info_callback;
+                cb = s->info_callback;
         else if (s->ctx->info_callback != NULL)
-                cb=s->ctx->info_callback;
+                cb = s->ctx->info_callback;
 
         /* init things to blank */
         s->in_handshake++;
-        if (!SSL_in_init(s) || SSL_in_before(s)) SSL_clear(s);
+        if (!SSL_in_init(s) || SSL_in_before(s))
+                SSL_clear(s);
 
-        if (s->cert == NULL)
-                {
-                SSLerr(SSL_F_SSL3_ACCEPT,SSL_R_NO_CERTIFICATE_SET);
-                return(-1);
-                }
+        if (s->cert == NULL) {
+                SSLerr(SSL_F_SSL3_ACCEPT, SSL_R_NO_CERTIFICATE_SET);
+                return (-1);
+        }
 
 #ifndef OPENSSL_NO_HEARTBEATS
         /* If we're awaiting a HeartbeatResponse, pretend we
          * already got and don't await it anymore, because
          * Heartbeats don't make sense during handshakes anyway.
          */
-        if (s->tlsext_hb_pending)
-                {
+        if (s->tlsext_hb_pending) {
                 s->tlsext_hb_pending = 0;
                 s->tlsext_hb_seq++;
-                }
+        }
 #endif
 
-        for (;;)
-                {
-                state=s->state;
+        for (;;) {
+                state = s->state;
 
-                switch (s->state)
-                        {
+                switch (s->state) {
                 case SSL_ST_RENEGOTIATE:
-                        s->renegotiate=1;
+                        s->renegotiate = 1;
                         /* s->state=SSL_ST_ACCEPT; */
 
                 case SSL_ST_BEFORE:
@@ -264,146 +258,143 @@ int ssl3_accept(SSL *s)
                 case SSL_ST_BEFORE|SSL_ST_ACCEPT:
                 case SSL_ST_OK|SSL_ST_ACCEPT:
 
-                        s->server=1;
-                        if (cb != NULL) cb(s,SSL_CB_HANDSHAKE_START,1);
+                        s->server = 1;
+                        if (cb != NULL)
+                                cb(s, SSL_CB_HANDSHAKE_START, 1);
 
-                        if ((s->version>>8) != 3)
-                                {
+                        if ((s->version >> 8) != 3) {
                                 SSLerr(SSL_F_SSL3_ACCEPT, ERR_R_INTERNAL_ERROR);
                                 return -1;
-                                }
-                        s->type=SSL_ST_ACCEPT;
+                        }
+                        s->type = SSL_ST_ACCEPT;
 
-                        if (s->init_buf == NULL)
-                                {
-                                if ((buf=BUF_MEM_new()) == NULL)
-                                        {
-                                        ret= -1;
+                        if (s->init_buf == NULL) {
+                                if ((buf = BUF_MEM_new()) == NULL) {
+                                        ret = -1;
                                         goto end;
-                                        }
-                                if (!BUF_MEM_grow(buf,SSL3_RT_MAX_PLAIN_LENGTH))
-                                        {
-                                        ret= -1;
+                                }
+                                if (!BUF_MEM_grow(buf, SSL3_RT_MAX_PLAIN_LENGTH)) {
+                                        ret = -1;
                                         goto end;
-                                        }
-                                s->init_buf=buf;
                                 }
+                                s->init_buf = buf;
+                        }
 
-                        if (!ssl3_setup_buffers(s))
-                                {
-                                ret= -1;
+                        if (!ssl3_setup_buffers(s)) {
+                                ret = -1;
                                 goto end;
-                                }
+                        }
 
-                        s->init_num=0;
+                        s->init_num = 0;
                         s->s3->flags &= ~SSL3_FLAGS_SGC_RESTART_DONE;
 
-                        if (s->state != SSL_ST_RENEGOTIATE)
-                                {
+                        if (s->state != SSL_ST_RENEGOTIATE) {
                                 /* Ok, we now need to push on a buffering BIO so that
                                  * the output is sent in a way that TCP likes :-)
                                  */
-                                if (!ssl_init_wbio_buffer(s,1)) { ret= -1; goto end; }
-                                
+                                if (!ssl_init_wbio_buffer(s, 1)) {
+                                        ret = -1;
+                                        goto end;
+                                }
+
                                 ssl3_init_finished_mac(s);
-                                s->state=SSL3_ST_SR_CLNT_HELLO_A;
+                                s->state = SSL3_ST_SR_CLNT_HELLO_A;
                                 s->ctx->stats.sess_accept++;
-                                }
-                        else if (!s->s3->send_connection_binding &&
-                                !(s->options & SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION))
-                                {
+                        } else if (!s->s3->send_connection_binding &&
+                            !(s->options & SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION)) {
                                 /* Server attempting to renegotiate with
                                  * client that doesn't support secure
                                  * renegotiation.
                                  */
                                 SSLerr(SSL_F_SSL3_ACCEPT, SSL_R_UNSAFE_LEGACY_RENEGOTIATION_DISABLED);
-                                ssl3_send_alert(s,SSL3_AL_FATAL,SSL_AD_HANDSHAKE_FAILURE);
+                                ssl3_send_alert(s, SSL3_AL_FATAL, SSL_AD_HANDSHAKE_FAILURE);
                                 ret = -1;
                                 goto end;
-                                }
-                        else
-                                {
+                        } else {
                                 /* s->state == SSL_ST_RENEGOTIATE,
                                  * we will just send a HelloRequest */
                                 s->ctx->stats.sess_accept_renegotiate++;
-                                s->state=SSL3_ST_SW_HELLO_REQ_A;
-                                }
+                                s->state = SSL3_ST_SW_HELLO_REQ_A;
+                        }
                         break;
 
                 case SSL3_ST_SW_HELLO_REQ_A:
                 case SSL3_ST_SW_HELLO_REQ_B:
 
-                        s->shutdown=0;
-                        ret=ssl3_send_hello_request(s);
-                        if (ret <= 0) goto end;
-                        s->s3->tmp.next_state=SSL3_ST_SW_HELLO_REQ_C;
-                        s->state=SSL3_ST_SW_FLUSH;
-                        s->init_num=0;
+                        s->shutdown = 0;
+                        ret = ssl3_send_hello_request(s);
+                        if (ret <= 0)
+                                goto end;
+                        s->s3->tmp.next_state = SSL3_ST_SW_HELLO_REQ_C;
+                        s->state = SSL3_ST_SW_FLUSH;
+                        s->init_num = 0;
 
                         ssl3_init_finished_mac(s);
                         break;
 
                 case SSL3_ST_SW_HELLO_REQ_C:
-                        s->state=SSL_ST_OK;
+                        s->state = SSL_ST_OK;
                         break;
 
                 case SSL3_ST_SR_CLNT_HELLO_A:
                 case SSL3_ST_SR_CLNT_HELLO_B:
                 case SSL3_ST_SR_CLNT_HELLO_C:
 
-                        s->shutdown=0;
-                        if (s->rwstate != SSL_X509_LOOKUP)
-                        {
-                                ret=ssl3_get_client_hello(s);
-                                if (ret <= 0) goto end;
+                        s->shutdown = 0;
+                        if (s->rwstate != SSL_X509_LOOKUP) {
+                                ret = ssl3_get_client_hello(s);
+                                if (ret <= 0)
+                                        goto end;
                         }
 #ifndef OPENSSL_NO_SRP
                         {
-                        int al;
-                        if ((ret = ssl_check_srp_ext_ClientHello(s,&al))  < 0)
-                                        {
+                                int al;
+                                if ((ret = ssl_check_srp_ext_ClientHello(s, &al))  < 0) {
                                         /* callback indicates firther work to be done */
-                                        s->rwstate=SSL_X509_LOOKUP;
+                                        s->rwstate = SSL_X509_LOOKUP;
                                         goto end;
-                                        }
-                        if (ret != SSL_ERROR_NONE)
-                                {
-                                ssl3_send_alert(s,SSL3_AL_FATAL,al);    
+                                }
+                                if (ret != SSL_ERROR_NONE) {
+                                        ssl3_send_alert(s, SSL3_AL_FATAL, al);
+
                                 /* This is not really an error but the only means to
                                    for a client to detect whether srp is supported. */
-                                   if (al != TLS1_AD_UNKNOWN_PSK_IDENTITY)      
-                                        SSLerr(SSL_F_SSL3_ACCEPT,SSL_R_CLIENTHELLO_TLSEXT);                     
-                                ret = SSL_TLSEXT_ERR_ALERT_FATAL;                       
-                                ret= -1;
-                                goto end;       
+                                        if (al != TLS1_AD_UNKNOWN_PSK_IDENTITY)
+                                                SSLerr(SSL_F_SSL3_ACCEPT, SSL_R_CLIENTHELLO_TLSEXT);
+
+                                        ret = SSL_TLSEXT_ERR_ALERT_FATAL;
+
+                                        ret = -1;
+                                        goto end;
+
                                 }
                         }
 #endif          
-                        
+
                         s->renegotiate = 2;
-                        s->state=SSL3_ST_SW_SRVR_HELLO_A;
-                        s->init_num=0;
+                        s->state = SSL3_ST_SW_SRVR_HELLO_A;
+                        s->init_num = 0;
                         break;
 
                 case SSL3_ST_SW_SRVR_HELLO_A:
                 case SSL3_ST_SW_SRVR_HELLO_B:
-                        ret=ssl3_send_server_hello(s);
-                        if (ret <= 0) goto end;
+                        ret = ssl3_send_server_hello(s);
+                        if (ret <= 0)
+                                goto end;
 #ifndef OPENSSL_NO_TLSEXT
-                        if (s->hit)
-                                {
+                        if (s->hit) {
                                 if (s->tlsext_ticket_expected)
-                                        s->state=SSL3_ST_SW_SESSION_TICKET_A;
+                                        s->state = SSL3_ST_SW_SESSION_TICKET_A;
                                 else
-                                        s->state=SSL3_ST_SW_CHANGE_A;
-                                }
+                                        s->state = SSL3_ST_SW_CHANGE_A;
+                        }
 #else
                         if (s->hit)
-                                        s->state=SSL3_ST_SW_CHANGE_A;
+                                s->state = SSL3_ST_SW_CHANGE_A;
 #endif
                         else
-                                s->state=SSL3_ST_SW_CERT_A;
-                        s->init_num=0;
+                                s->state = SSL3_ST_SW_CERT_A;
+                        s->init_num = 0;
                         break;
 
                 case SSL3_ST_SW_CERT_A:
@@ -412,29 +403,26 @@ int ssl3_accept(SSL *s)
                         /* normal PSK or KRB5 or SRP */
                         if (!(s->s3->tmp.new_cipher->algorithm_auth & SSL_aNULL)
                                 && !(s->s3->tmp.new_cipher->algorithm_mkey & SSL_kPSK)
-                                && !(s->s3->tmp.new_cipher->algorithm_auth & SSL_aKRB5))
-                                {
-                                ret=ssl3_send_server_certificate(s);
-                                if (ret <= 0) goto end;
+                        && !(s->s3->tmp.new_cipher->algorithm_auth & SSL_aKRB5)) {
+                                ret = ssl3_send_server_certificate(s);
+                                if (ret <= 0)
+                                        goto end;
 #ifndef OPENSSL_NO_TLSEXT
                                 if (s->tlsext_status_expected)
-                                        s->state=SSL3_ST_SW_CERT_STATUS_A;
+                                        s->state = SSL3_ST_SW_CERT_STATUS_A;
                                 else
-                                        s->state=SSL3_ST_SW_KEY_EXCH_A;
-                                }
-                        else
-                                {
+                                        s->state = SSL3_ST_SW_KEY_EXCH_A;
+                        } else {
                                 skip = 1;
-                                s->state=SSL3_ST_SW_KEY_EXCH_A;
-                                }
+                                s->state = SSL3_ST_SW_KEY_EXCH_A;
+                        }
 #else
-                                }
-                        else
-                                skip=1;
+                        } else
+                                skip = 1;
 
-                        s->state=SSL3_ST_SW_KEY_EXCH_A;
+                        s->state = SSL3_ST_SW_KEY_EXCH_A;
 #endif
-                        s->init_num=0;
+                        s->init_num = 0;
                         break;
 
                 case SSL3_ST_SW_KEY_EXCH_A:
@@ -445,16 +433,16 @@ int ssl3_accept(SSL *s)
                          * send_server_key_exchange */
                         if ((s->options & SSL_OP_EPHEMERAL_RSA)
 #ifndef OPENSSL_NO_KRB5
-                                && !(alg_k & SSL_kKRB5)
+                            && !(alg_k & SSL_kKRB5)
 #endif /* OPENSSL_NO_KRB5 */
-                                )
+                            )
                                 /* option SSL_OP_EPHEMERAL_RSA sends temporary RSA key
                                  * even when forbidden by protocol specs
                                  * (handshake may fail as clients are not required to
                                  * be able to handle this) */
-                                s->s3->tmp.use_rsa_tmp=1;
+                                s->s3->tmp.use_rsa_tmp = 1;
                         else
-                                s->s3->tmp.use_rsa_tmp=0;
+                                s->s3->tmp.use_rsa_tmp = 0;
 
 
                         /* only send if a DH key exchange, fortezza or
@@ -475,83 +463,81 @@ int ssl3_accept(SSL *s)
                             || ((alg_k & SSL_kPSK) && s->ctx->psk_identity_hint)
 #endif
 #ifndef OPENSSL_NO_SRP
-                            /* SRP: send ServerKeyExchange */
+                        /* SRP: send ServerKeyExchange */
                             || (alg_k & SSL_kSRP)
 #endif
                             || (alg_k & (SSL_kDHr|SSL_kDHd|SSL_kEDH))
                             || (alg_k & SSL_kEECDH)
                             || ((alg_k & SSL_kRSA)
-                                && (s->cert->pkeys[SSL_PKEY_RSA_ENC].privatekey == NULL
-                                    || (SSL_C_IS_EXPORT(s->s3->tmp.new_cipher)
-                                        && EVP_PKEY_size(s->cert->pkeys[SSL_PKEY_RSA_ENC].privatekey)*8 > SSL_C_EXPORT_PKEYLENGTH(s->s3->tmp.new_cipher)
-                                        )
-                                    )
-                                )
+                            && (s->cert->pkeys[SSL_PKEY_RSA_ENC].privatekey == NULL
+                            || (SSL_C_IS_EXPORT(s->s3->tmp.new_cipher)
+                            && EVP_PKEY_size(s->cert->pkeys[SSL_PKEY_RSA_ENC].privatekey)*8 > SSL_C_EXPORT_PKEYLENGTH(s->s3->tmp.new_cipher)
                             )
-                                {
-                                ret=ssl3_send_server_key_exchange(s);
-                                if (ret <= 0) goto end;
-                                }
-                        else
-                                skip=1;
+                            )
+                            )
+                            ) {
+                                ret = ssl3_send_server_key_exchange(s);
+                                if (ret <= 0)
+                                        goto end;
+                        } else
+                                skip = 1;
 
-                        s->state=SSL3_ST_SW_CERT_REQ_A;
-                        s->init_num=0;
+                        s->state = SSL3_ST_SW_CERT_REQ_A;
+                        s->init_num = 0;
                         break;
 
                 case SSL3_ST_SW_CERT_REQ_A:
                 case SSL3_ST_SW_CERT_REQ_B:
                         if (/* don't request cert unless asked for it: */
-                                !(s->verify_mode & SSL_VERIFY_PEER) ||
+                            !(s->verify_mode & SSL_VERIFY_PEER) ||
                                 /* if SSL_VERIFY_CLIENT_ONCE is set,
                                  * don't request cert during re-negotiation: */
-                                ((s->session->peer != NULL) &&
-                                 (s->verify_mode & SSL_VERIFY_CLIENT_ONCE)) ||
+                            ((s->session->peer != NULL) &&
+                            (s->verify_mode & SSL_VERIFY_CLIENT_ONCE)) ||
                                 /* never request cert in anonymous ciphersuites
                                  * (see section "Certificate request" in SSL 3 drafts
                                  * and in RFC 2246): */
-                                ((s->s3->tmp.new_cipher->algorithm_auth & SSL_aNULL) &&
+                            ((s->s3->tmp.new_cipher->algorithm_auth & SSL_aNULL) &&
                                  /* ... except when the application insists on verification
                                   * (against the specs, but s3_clnt.c accepts this for SSL 3) */
-                                 !(s->verify_mode & SSL_VERIFY_FAIL_IF_NO_PEER_CERT)) ||
-                                 /* never request cert in Kerberos ciphersuites */
-                                (s->s3->tmp.new_cipher->algorithm_auth & SSL_aKRB5)
+                            !(s->verify_mode & SSL_VERIFY_FAIL_IF_NO_PEER_CERT)) ||
+                        /* never request cert in Kerberos ciphersuites */
+                            (s->s3->tmp.new_cipher->algorithm_auth & SSL_aKRB5)
                                 /* With normal PSK Certificates and
                                  * Certificate Requests are omitted */
-                                || (s->s3->tmp.new_cipher->algorithm_mkey & SSL_kPSK))
-                                {
+                            || (s->s3->tmp.new_cipher->algorithm_mkey & SSL_kPSK)) {
                                 /* no cert request */
-                                skip=1;
-                                s->s3->tmp.cert_request=0;
-                                s->state=SSL3_ST_SW_SRVR_DONE_A;
+                                skip = 1;
+                                s->s3->tmp.cert_request = 0;
+                                s->state = SSL3_ST_SW_SRVR_DONE_A;
                                 if (s->s3->handshake_buffer)
                                         if (!ssl3_digest_cached_records(s))
                                                 return -1;
-                                }
-                        else
-                                {
-                                s->s3->tmp.cert_request=1;
-                                ret=ssl3_send_certificate_request(s);
-                                if (ret <= 0) goto end;
+                        } else {
+                                s->s3->tmp.cert_request = 1;
+                                ret = ssl3_send_certificate_request(s);
+                                if (ret <= 0)
+                                        goto end;
 #ifndef NETSCAPE_HANG_BUG
-                                s->state=SSL3_ST_SW_SRVR_DONE_A;
+                                s->state = SSL3_ST_SW_SRVR_DONE_A;
 #else
-                                s->state=SSL3_ST_SW_FLUSH;
-                                s->s3->tmp.next_state=SSL3_ST_SR_CERT_A;
+                                s->state = SSL3_ST_SW_FLUSH;
+                                s->s3->tmp.next_state = SSL3_ST_SR_CERT_A;
 #endif
-                                s->init_num=0;
-                                }
+                                s->init_num = 0;
+                        }
                         break;
 
                 case SSL3_ST_SW_SRVR_DONE_A:
                 case SSL3_ST_SW_SRVR_DONE_B:
-                        ret=ssl3_send_server_done(s);
-                        if (ret <= 0) goto end;
-                        s->s3->tmp.next_state=SSL3_ST_SR_CERT_A;
-                        s->state=SSL3_ST_SW_FLUSH;
-                        s->init_num=0;
+                        ret = ssl3_send_server_done(s);
+                        if (ret <= 0)
+                                goto end;
+                        s->s3->tmp.next_state = SSL3_ST_SR_CERT_A;
+                        s->state = SSL3_ST_SW_FLUSH;
+                        s->init_num = 0;
                         break;
-                
+
                 case SSL3_ST_SW_FLUSH:
 
                         /* This code originally checked to see if
@@ -564,15 +550,14 @@ int ssl3_accept(SSL *s)
                          * unconditionally.
                          */
 
-                        s->rwstate=SSL_WRITING;
-                        if (BIO_flush(s->wbio) <= 0)
-                                {
-                                ret= -1;
+                        s->rwstate = SSL_WRITING;
+                        if (BIO_flush(s->wbio) <= 0) {
+                                ret = -1;
                                 goto end;
-                                }
-                        s->rwstate=SSL_NOTHING;
+                        }
+                        s->rwstate = SSL_NOTHING;
 
-                        s->state=s->s3->tmp.next_state;
+                        s->state = s->s3->tmp.next_state;
                         break;
 
                 case SSL3_ST_SR_CERT_A:
@@ -584,23 +569,22 @@ int ssl3_accept(SSL *s)
                         if (ret == 2)
                                 s->state = SSL3_ST_SR_CLNT_HELLO_C;
                         else {
-                                if (s->s3->tmp.cert_request)
-                                        {
-                                        ret=ssl3_get_client_certificate(s);
-                                        if (ret <= 0) goto end;
-                                        }
-                                s->init_num=0;
-                                s->state=SSL3_ST_SR_KEY_EXCH_A;
+                                if (s->s3->tmp.cert_request) {
+                                        ret = ssl3_get_client_certificate(s);
+                                        if (ret <= 0)
+                                                goto end;
+                                }
+                                s->init_num = 0;
+                                s->state = SSL3_ST_SR_KEY_EXCH_A;
                         }
                         break;
 
                 case SSL3_ST_SR_KEY_EXCH_A:
                 case SSL3_ST_SR_KEY_EXCH_B:
-                        ret=ssl3_get_client_key_exchange(s);
+                        ret = ssl3_get_client_key_exchange(s);
                         if (ret <= 0)
                                 goto end;
-                        if (ret == 2)
-                                {
+                        if (ret == 2) {
                                 /* For the ECDH ciphersuites when
                                  * the client sends its ECDH pub key in
                                  * a certificate, the CertificateVerify
@@ -610,40 +594,35 @@ int ssl3_accept(SSL *s)
                                  * for key exchange.
                                  */
 #if defined(OPENSSL_NO_TLSEXT) || defined(OPENSSL_NO_NEXTPROTONEG)
-                                s->state=SSL3_ST_SR_FINISHED_A;
+                                s->state = SSL3_ST_SR_FINISHED_A;
 #else
                                 if (s->s3->next_proto_neg_seen)
-                                        s->state=SSL3_ST_SR_NEXT_PROTO_A;
+                                        s->state = SSL3_ST_SR_NEXT_PROTO_A;
                                 else
-                                        s->state=SSL3_ST_SR_FINISHED_A;
+                                        s->state = SSL3_ST_SR_FINISHED_A;
 #endif
                                 s->init_num = 0;
-                                }
-                        else if (TLS1_get_version(s) >= TLS1_2_VERSION)
-                                {
-                                s->state=SSL3_ST_SR_CERT_VRFY_A;
-                                s->init_num=0;
+                        } else if (TLS1_get_version(s) >= TLS1_2_VERSION) {
+                                s->state = SSL3_ST_SR_CERT_VRFY_A;
+                                s->init_num = 0;
                                 if (!s->session->peer)
                                         break;
                                 /* For TLS v1.2 freeze the handshake buffer
                                  * at this point and digest cached records.
                                  */
-                                if (!s->s3->handshake_buffer)
-                                        {
-                                        SSLerr(SSL_F_SSL3_ACCEPT,ERR_R_INTERNAL_ERROR);
+                                if (!s->s3->handshake_buffer) {
+                                        SSLerr(SSL_F_SSL3_ACCEPT, ERR_R_INTERNAL_ERROR);
                                         return -1;
-                                        }
+                                }
                                 s->s3->flags |= TLS1_FLAGS_KEEP_HANDSHAKE;
                                 if (!ssl3_digest_cached_records(s))
                                         return -1;
-                                }
-                        else
-                                {
-                                int offset=0;
+                        } else {
+                                int offset = 0;
                                 int dgst_num;
 
-                                s->state=SSL3_ST_SR_CERT_VRFY_A;
-                                s->init_num=0;
+                                s->state = SSL3_ST_SR_CERT_VRFY_A;
+                                s->init_num = 0;
 
                                 /* We need to get hashes here so if there is
                                  * a client cert, it can be verified
@@ -653,82 +632,85 @@ int ssl3_accept(SSL *s)
                                 if (s->s3->handshake_buffer)
                                         if (!ssl3_digest_cached_records(s))
                                                 return -1;
-                                for (dgst_num=0; dgst_num<SSL_MAX_DIGEST;dgst_num++)    
-                                        if (s->s3->handshake_dgst[dgst_num]) 
-                                                {
-                                                int dgst_size;
-
-                                                s->method->ssl3_enc->cert_verify_mac(s,EVP_MD_CTX_type(s->s3->handshake_dgst[dgst_num]),&(s->s3->tmp.cert_verify_md[offset]));
-                                                dgst_size=EVP_MD_CTX_size(s->s3->handshake_dgst[dgst_num]);
-                                                if (dgst_size < 0)
-                                                        {
-                                                        ret = -1;
-                                                        goto end;
-                                                        }
-                                                offset+=dgst_size;
-                                                }               
+                                for (dgst_num = 0; dgst_num < SSL_MAX_DIGEST; dgst_num++)
+                                        if (s->s3->handshake_dgst[dgst_num]) {
+                                        int dgst_size;
+
+                                        s->method->ssl3_enc->cert_verify_mac(s, EVP_MD_CTX_type(s->s3->handshake_dgst[dgst_num]), &(s->s3->tmp.cert_verify_md[offset]));
+                                        dgst_size = EVP_MD_CTX_size(s->s3->handshake_dgst[dgst_num]);
+                                        if (dgst_size < 0) {
+                                                ret = -1;
+                                                goto end;
+                                        }
+                                        offset += dgst_size;
                                 }
+                        }
                         break;
 
                 case SSL3_ST_SR_CERT_VRFY_A:
                 case SSL3_ST_SR_CERT_VRFY_B:
 
                         /* we should decide if we expected this one */
-                        ret=ssl3_get_cert_verify(s);
-                        if (ret <= 0) goto end;
+                        ret = ssl3_get_cert_verify(s);
+                        if (ret <= 0)
+                                goto end;
 
 #if defined(OPENSSL_NO_TLSEXT) || defined(OPENSSL_NO_NEXTPROTONEG)
-                        s->state=SSL3_ST_SR_FINISHED_A;
+                        s->state = SSL3_ST_SR_FINISHED_A;
 #else
                         if (s->s3->next_proto_neg_seen)
-                                s->state=SSL3_ST_SR_NEXT_PROTO_A;
+                                s->state = SSL3_ST_SR_NEXT_PROTO_A;
                         else
-                                s->state=SSL3_ST_SR_FINISHED_A;
+                                s->state = SSL3_ST_SR_FINISHED_A;
 #endif
-                        s->init_num=0;
+                        s->init_num = 0;
                         break;
 
 #if !defined(OPENSSL_NO_TLSEXT) && !defined(OPENSSL_NO_NEXTPROTONEG)
                 case SSL3_ST_SR_NEXT_PROTO_A:
                 case SSL3_ST_SR_NEXT_PROTO_B:
-                        ret=ssl3_get_next_proto(s);
-                        if (ret <= 0) goto end;
+                        ret = ssl3_get_next_proto(s);
+                        if (ret <= 0)
+                                goto end;
                         s->init_num = 0;
-                        s->state=SSL3_ST_SR_FINISHED_A;
+                        s->state = SSL3_ST_SR_FINISHED_A;
                         break;
 #endif
 
                 case SSL3_ST_SR_FINISHED_A:
                 case SSL3_ST_SR_FINISHED_B:
-                        ret=ssl3_get_finished(s,SSL3_ST_SR_FINISHED_A,
-                                SSL3_ST_SR_FINISHED_B);
-                        if (ret <= 0) goto end;
+                        ret = ssl3_get_finished(s, SSL3_ST_SR_FINISHED_A,
+                            SSL3_ST_SR_FINISHED_B);
+                        if (ret <= 0)
+                                goto end;
                         if (s->hit)
-                                s->state=SSL_ST_OK;
+                                s->state = SSL_ST_OK;
 #ifndef OPENSSL_NO_TLSEXT
                         else if (s->tlsext_ticket_expected)
-                                s->state=SSL3_ST_SW_SESSION_TICKET_A;
+                                s->state = SSL3_ST_SW_SESSION_TICKET_A;
 #endif
                         else
-                                s->state=SSL3_ST_SW_CHANGE_A;
-                        s->init_num=0;
+                                s->state = SSL3_ST_SW_CHANGE_A;
+                        s->init_num = 0;
                         break;
 
 #ifndef OPENSSL_NO_TLSEXT
                 case SSL3_ST_SW_SESSION_TICKET_A:
                 case SSL3_ST_SW_SESSION_TICKET_B:
-                        ret=ssl3_send_newsession_ticket(s);
-                        if (ret <= 0) goto end;
-                        s->state=SSL3_ST_SW_CHANGE_A;
-                        s->init_num=0;
+                        ret = ssl3_send_newsession_ticket(s);
+                        if (ret <= 0)
+                                goto end;
+                        s->state = SSL3_ST_SW_CHANGE_A;
+                        s->init_num = 0;
                         break;
 
                 case SSL3_ST_SW_CERT_STATUS_A:
                 case SSL3_ST_SW_CERT_STATUS_B:
-                        ret=ssl3_send_cert_status(s);
-                        if (ret <= 0) goto end;
-                        s->state=SSL3_ST_SW_KEY_EXCH_A;
-                        s->init_num=0;
+                        ret = ssl3_send_cert_status(s);
+                        if (ret <= 0)
+                                goto end;
+                        s->state = SSL3_ST_SW_KEY_EXCH_A;
+                        s->init_num = 0;
                         break;
 
 #endif
@@ -736,48 +718,49 @@ int ssl3_accept(SSL *s)
                 case SSL3_ST_SW_CHANGE_A:
                 case SSL3_ST_SW_CHANGE_B:
 
-                        s->session->cipher=s->s3->tmp.new_cipher;
-                        if (!s->method->ssl3_enc->setup_key_block(s))
-                                { ret= -1; goto end; }
+                        s->session->cipher = s->s3->tmp.new_cipher;
+                        if (!s->method->ssl3_enc->setup_key_block(s)) {
+                                ret = -1;
+                                goto end;
+                        }
 
-                        ret=ssl3_send_change_cipher_spec(s,
-                                SSL3_ST_SW_CHANGE_A,SSL3_ST_SW_CHANGE_B);
+                        ret = ssl3_send_change_cipher_spec(s,
+                        SSL3_ST_SW_CHANGE_A, SSL3_ST_SW_CHANGE_B);
 
-                        if (ret <= 0) goto end;
-                        s->state=SSL3_ST_SW_FINISHED_A;
-                        s->init_num=0;
+                        if (ret <= 0)
+                                goto end;
+                        s->state = SSL3_ST_SW_FINISHED_A;
+                        s->init_num = 0;
 
-                        if (!s->method->ssl3_enc->change_cipher_state(s,
-                                SSL3_CHANGE_CIPHER_SERVER_WRITE))
-                                {
-                                ret= -1;
+                        if (!s->method->ssl3_enc->change_cipher_state(
+                            s, SSL3_CHANGE_CIPHER_SERVER_WRITE)) {
+                                ret = -1;
                                 goto end;
-                                }
+                        }
 
                         break;
 
                 case SSL3_ST_SW_FINISHED_A:
                 case SSL3_ST_SW_FINISHED_B:
-                        ret=ssl3_send_finished(s,
-                                SSL3_ST_SW_FINISHED_A,SSL3_ST_SW_FINISHED_B,
-                                s->method->ssl3_enc->server_finished_label,
-                                s->method->ssl3_enc->server_finished_label_len);
-                        if (ret <= 0) goto end;
-                        s->state=SSL3_ST_SW_FLUSH;
-                        if (s->hit)
-                                {
+                        ret = ssl3_send_finished(s,
+                        SSL3_ST_SW_FINISHED_A, SSL3_ST_SW_FINISHED_B,
+                        s->method->ssl3_enc->server_finished_label,
+                        s->method->ssl3_enc->server_finished_label_len);
+                        if (ret <= 0)
+                                goto end;
+                        s->state = SSL3_ST_SW_FLUSH;
+                        if (s->hit) {
 #if defined(OPENSSL_NO_TLSEXT) || defined(OPENSSL_NO_NEXTPROTONEG)
-                                s->s3->tmp.next_state=SSL3_ST_SR_FINISHED_A;
+                                s->s3->tmp.next_state = SSL3_ST_SR_FINISHED_A;
 #else
                                 if (s->s3->next_proto_neg_seen)
-                                        s->s3->tmp.next_state=SSL3_ST_SR_NEXT_PROTO_A;
+                                        s->s3->tmp.next_state = SSL3_ST_SR_NEXT_PROTO_A;
                                 else
-                                        s->s3->tmp.next_state=SSL3_ST_SR_FINISHED_A;
+                                        s->s3->tmp.next_state = SSL3_ST_SR_FINISHED_A;
 #endif
-                                }
-                        else
-                                s->s3->tmp.next_state=SSL_ST_OK;
-                        s->init_num=0;
+                        } else
+                                s->s3->tmp.next_state = SSL_ST_OK;
+                        s->init_num = 0;
                         break;
 
                 case SSL_ST_OK:
@@ -785,146 +768,143 @@ int ssl3_accept(SSL *s)
                         ssl3_cleanup_key_block(s);
 
                         BUF_MEM_free(s->init_buf);
-                        s->init_buf=NULL;
+                        s->init_buf = NULL;
 
                         /* remove buffering on output */
                         ssl_free_wbio_buffer(s);
 
-                        s->init_num=0;
+                        s->init_num = 0;
 
                         if (s->renegotiate == 2) /* skipped if we just sent a HelloRequest */
-                                {
-                                s->renegotiate=0;
-                                s->new_session=0;
-                                
-                                ssl_update_cache(s,SSL_SESS_CACHE_SERVER);
-                                
+                        {
+                                s->renegotiate = 0;
+                                s->new_session = 0;
+
+                                ssl_update_cache(s, SSL_SESS_CACHE_SERVER);
+
                                 s->ctx->stats.sess_accept_good++;
                                 /* s->server=1; */
-                                s->handshake_func=ssl3_accept;
+                                s->handshake_func = ssl3_accept;
+
+                                if (cb != NULL)
+                                        cb(s, SSL_CB_HANDSHAKE_DONE, 1);
+                        }
 
-                                if (cb != NULL) cb(s,SSL_CB_HANDSHAKE_DONE,1);
-                                }
-                        
                         ret = 1;
                         goto end;
                         /* break; */
 
                 default:
-                        SSLerr(SSL_F_SSL3_ACCEPT,SSL_R_UNKNOWN_STATE);
-                        ret= -1;
+                        SSLerr(SSL_F_SSL3_ACCEPT, SSL_R_UNKNOWN_STATE);
+                        ret = -1;
                         goto end;
                         /* break; */
-                        }
-                
-                if (!s->s3->tmp.reuse_message && !skip)
-                        {
-                        if (s->debug)
-                                {
-                                if ((ret=BIO_flush(s->wbio)) <= 0)
+                }
+
+                if (!s->s3->tmp.reuse_message && !skip) {
+                        if (s->debug) {
+                                if ((ret = BIO_flush(s->wbio)) <= 0)
                                         goto end;
-                                }
+                        }
 
 
-                        if ((cb != NULL) && (s->state != state))
-                                {
-                                new_state=s->state;
-                                s->state=state;
-                                cb(s,SSL_CB_ACCEPT_LOOP,1);
-                                s->state=new_state;
-                                }
+                        if ((cb != NULL) && (s->state != state)) {
+                                new_state = s->state;
+                                s->state = state;
+                                cb(s, SSL_CB_ACCEPT_LOOP, 1);
+                                s->state = new_state;
                         }
-                skip=0;
                 }
+                skip = 0;
+        }
 end:
         /* BIO_flush(s->wbio); */
 
         s->in_handshake--;
         if (cb != NULL)
-                cb(s,SSL_CB_ACCEPT_EXIT,ret);
-        return(ret);
-        }
+                cb(s, SSL_CB_ACCEPT_EXIT, ret);
+        return (ret);
+}
 
-int ssl3_send_hello_request(SSL *s)
-        {
+int
+ssl3_send_hello_request(SSL *s)
+{
         unsigned char *p;
 
-        if (s->state == SSL3_ST_SW_HELLO_REQ_A)
-                {
-                p=(unsigned char *)s->init_buf->data;
-                *(p++)=SSL3_MT_HELLO_REQUEST;
-                *(p++)=0;
-                *(p++)=0;
-                *(p++)=0;
+        if (s->state == SSL3_ST_SW_HELLO_REQ_A) {
+                p = (unsigned char *)s->init_buf->data;
+                *(p++) = SSL3_MT_HELLO_REQUEST;
+                *(p++) = 0;
+                *(p++) = 0;
+                *(p++) = 0;
 
-                s->state=SSL3_ST_SW_HELLO_REQ_B;
+                s->state = SSL3_ST_SW_HELLO_REQ_B;
                 /* number of bytes to write */
-                s->init_num=4;
-                s->init_off=0;
-                }
+                s->init_num = 4;
+                s->init_off = 0;
+        }
 
         /* SSL3_ST_SW_HELLO_REQ_B */
-        return(ssl3_do_write(s,SSL3_RT_HANDSHAKE));
-        }
+        return (ssl3_do_write(s, SSL3_RT_HANDSHAKE));
+}
 
-int ssl3_check_client_hello(SSL *s)
-        {
+int
+ssl3_check_client_hello(SSL *s)
+{
         int ok;
         long n;
 
         /* this function is called when we really expect a Certificate message,
          * so permit appropriate message length */
-        n=s->method->ssl_get_message(s,
-                SSL3_ST_SR_CERT_A,
-                SSL3_ST_SR_CERT_B,
-                -1,
-                s->max_cert_list,
-                &ok);
-        if (!ok) return((int)n);
+        n = s->method->ssl_get_message(s,
+        SSL3_ST_SR_CERT_A,
+        SSL3_ST_SR_CERT_B,
+        -1,
+        s->max_cert_list,
+        &ok);
+        if (!ok)
+                return ((int)n);
         s->s3->tmp.reuse_message = 1;
-        if (s->s3->tmp.message_type == SSL3_MT_CLIENT_HELLO)
-                {
+        if (s->s3->tmp.message_type == SSL3_MT_CLIENT_HELLO) {
                 /* We only allow the client to restart the handshake once per
                  * negotiation. */
-                if (s->s3->flags & SSL3_FLAGS_SGC_RESTART_DONE)
-                        {
+                if (s->s3->flags & SSL3_FLAGS_SGC_RESTART_DONE) {
                         SSLerr(SSL_F_SSL3_CHECK_CLIENT_HELLO, SSL_R_MULTIPLE_SGC_RESTARTS);
                         return -1;
-                        }
+                }
                 /* Throw away what we have done so far in the current handshake,
                  * which will now be aborted. (A full SSL_clear would be too much.) */
 #ifndef OPENSSL_NO_DH
-                if (s->s3->tmp.dh != NULL)
-                        {
+                if (s->s3->tmp.dh != NULL) {
                         DH_free(s->s3->tmp.dh);
                         s->s3->tmp.dh = NULL;
-                        }
+                }
 #endif
 #ifndef OPENSSL_NO_ECDH
-                if (s->s3->tmp.ecdh != NULL)
-                        {
+                if (s->s3->tmp.ecdh != NULL) {
                         EC_KEY_free(s->s3->tmp.ecdh);
                         s->s3->tmp.ecdh = NULL;
-                        }
+                }
 #endif
                 s->s3->flags |= SSL3_FLAGS_SGC_RESTART_DONE;
                 return 2;
-                }
+        }
         return 1;
 }
 
-int ssl3_get_client_hello(SSL *s)
-        {
-        int i,j,ok,al,ret= -1;
+int
+ssl3_get_client_hello(SSL *s)
+{
+        int i, j, ok, al, ret = -1;
         unsigned int cookie_len;
         long n;
         unsigned long id;
-        unsigned char *p,*d,*q;
+        unsigned char *p, *d, *q;
         SSL_CIPHER *c;
 #ifndef OPENSSL_NO_COMP
-        SSL_COMP *comp=NULL;
+        SSL_COMP *comp = NULL;
 #endif
-        STACK_OF(SSL_CIPHER) *ciphers=NULL;
+        STACK_OF(SSL_CIPHER) *ciphers = NULL;
 
         /* We do this so that we will respond with our native type.
          * If we are TLSv1 and we get SSLv3, we will respond with TLSv1,
@@ -932,65 +912,61 @@ int ssl3_get_client_hello(SSL *s)
          * If we are SSLv3, we will respond with SSLv3, even if prompted with
          * TLSv1.
          */
-        if (s->state == SSL3_ST_SR_CLNT_HELLO_A
-                )
-                {
-                s->state=SSL3_ST_SR_CLNT_HELLO_B;
-                }
-        s->first_packet=1;
-        n=s->method->ssl_get_message(s,
-                SSL3_ST_SR_CLNT_HELLO_B,
-                SSL3_ST_SR_CLNT_HELLO_C,
-                SSL3_MT_CLIENT_HELLO,
-                SSL3_RT_MAX_PLAIN_LENGTH,
-                &ok);
+        if (s->state == SSL3_ST_SR_CLNT_HELLO_A) {
+                s->state = SSL3_ST_SR_CLNT_HELLO_B;
+        }
+        s->first_packet = 1;
+        n = s->method->ssl_get_message(s,
+        SSL3_ST_SR_CLNT_HELLO_B,
+        SSL3_ST_SR_CLNT_HELLO_C,
+        SSL3_MT_CLIENT_HELLO,
+        SSL3_RT_MAX_PLAIN_LENGTH,
+        &ok);
 
-        if (!ok) return((int)n);
-        s->first_packet=0;
-        d=p=(unsigned char *)s->init_msg;
+        if (!ok)
+                return ((int)n);
+        s->first_packet = 0;
+        d = p=(unsigned char *)s->init_msg;
 
         /* use version from inside client hello, not from record header
          * (may differ: see RFC 2246, Appendix E, second paragraph) */
-        s->client_version=(((int)p[0])<<8)|(int)p[1];
-        p+=2;
+        s->client_version = (((int)p[0]) << 8)|(int)p[1];
+        p += 2;
 
         if ((s->version == DTLS1_VERSION && s->client_version > s->version) ||
-            (s->version != DTLS1_VERSION && s->client_version < s->version))
-                {
+            (s->version != DTLS1_VERSION && s->client_version < s->version)) {
                 SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO, SSL_R_WRONG_VERSION_NUMBER);
-                if ((s->client_version>>8) == SSL3_VERSION_MAJOR && 
-                        !s->enc_write_ctx && !s->write_hash)
-                        {
+                if ((s->client_version >> 8) == SSL3_VERSION_MAJOR &&
+                        !s->enc_write_ctx && !s->write_hash) {
                         /* similar to ssl3_get_record, send alert using remote version number */
                         s->version = s->client_version;
-                        }
+                }
                 al = SSL_AD_PROTOCOL_VERSION;
                 goto f_err;
-                }
+        }
 
         /* If we require cookies and this ClientHello doesn't
          * contain one, just return since we do not want to
          * allocate any memory yet. So check cookie length...
          */
-        if (SSL_get_options(s) & SSL_OP_COOKIE_EXCHANGE)
-                {
+        if (SSL_get_options(s) & SSL_OP_COOKIE_EXCHANGE) {
                 unsigned int session_length, cookie_length;
-                
+
                 session_length = *(p + SSL3_RANDOM_SIZE);
                 cookie_length = *(p + SSL3_RANDOM_SIZE + session_length + 1);
 
                 if (cookie_length == 0)
                         return 1;
-                }
+        }
 
         /* load the client random */
-        memcpy(s->s3->client_random,p,SSL3_RANDOM_SIZE);
-        p+=SSL3_RANDOM_SIZE;
+        memcpy(s->s3->client_random, p, SSL3_RANDOM_SIZE);
+        p += SSL3_RANDOM_SIZE;
 
         /* get the session-id */
         j= *(p++);
 
-        s->hit=0;
+        s->hit = 0;
         /* Versions before 0.9.7 always allow clients to resume sessions in renegotiation.
          * 0.9.7 and later allow this by default, but optionally ignore resumption requests
          * with flag SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION (it's a new flag rather
@@ -1002,31 +978,26 @@ int ssl3_get_client_hello(SSL *s)
          * this essentially just means that the SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION
          * setting will be ignored.
          */
-        if ((s->new_session && (s->options & SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION)))
-                {
-                if (!ssl_get_new_session(s,1))
+        if ((s->new_session && (s->options & SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION))) {
+                if (!ssl_get_new_session(s, 1))
                         goto err;
-                }
-        else
-                {
-                i=ssl_get_prev_session(s, p, j, d + n);
+        } else {
+                i = ssl_get_prev_session(s, p, j, d + n);
                 if (i == 1)
-                        { /* previous session */
-                        s->hit=1;
-                        }
-                else if (i == -1)
+                                { /* previous session */
+                        s->hit = 1;
+                } else if (i == -1)
                         goto err;
                 else /* i == 0 */
-                        {
-                        if (!ssl_get_new_session(s,1))
+                {
+                        if (!ssl_get_new_session(s, 1))
                                 goto err;
-                        }
                 }
+        }
 
-        p+=j;
+        p += j;
 
-        if (s->version == DTLS1_VERSION || s->version == DTLS1_BAD_VER)
-                {
+        if (s->version == DTLS1_VERSION || s->version == DTLS1_BAD_VER) {
                 /* cookie stuff */
                 cookie_len = *(p++);
 
@@ -1035,159 +1006,141 @@ int ssl3_get_client_hello(SSL *s)
                  * HelloVerify message has not been sent--make sure that it
                  * does not cause an overflow.
                  */
-                if ( cookie_len > sizeof(s->d1->rcvd_cookie))
-                        {
+                if (cookie_len > sizeof(s->d1->rcvd_cookie)) {
                         /* too much data */
                         al = SSL_AD_DECODE_ERROR;
                         SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO, SSL_R_COOKIE_MISMATCH);
                         goto f_err;
-                        }
+                }
 
                 /* verify the cookie if appropriate option is set. */
                 if ((SSL_get_options(s) & SSL_OP_COOKIE_EXCHANGE) &&
-                        cookie_len > 0)
-                        {
+                    cookie_len > 0) {
                         memcpy(s->d1->rcvd_cookie, p, cookie_len);
 
-                        if ( s->ctx->app_verify_cookie_cb != NULL)
-                                {
-                                if ( s->ctx->app_verify_cookie_cb(s, s->d1->rcvd_cookie,
-                                        cookie_len) == 0)
-                                        {
-                                        al=SSL_AD_HANDSHAKE_FAILURE;
-                                        SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO, 
-                                                SSL_R_COOKIE_MISMATCH);
-                                        goto f_err;
-                                        }
-                                /* else cookie verification succeeded */
-                                }
-                        else if ( memcmp(s->d1->rcvd_cookie, s->d1->cookie, 
-                                                  s->d1->cookie_len) != 0) /* default verification */
-                                {
-                                        al=SSL_AD_HANDSHAKE_FAILURE;
-                                        SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO, 
-                                                SSL_R_COOKIE_MISMATCH);
+                        if (s->ctx->app_verify_cookie_cb != NULL) {
+                                if (s->ctx->app_verify_cookie_cb(s, s->d1->rcvd_cookie,
+                                        cookie_len) == 0) {
+                                        al = SSL_AD_HANDSHAKE_FAILURE;
+                                        SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO,
+                                        SSL_R_COOKIE_MISMATCH);
                                         goto f_err;
                                 }
+                                /* else cookie verification succeeded */
+                        } else if (memcmp(s->d1->rcvd_cookie, s->d1->cookie,
+                            s->d1->cookie_len) != 0) /* default verification */
+                        {
+                                al = SSL_AD_HANDSHAKE_FAILURE;
+                                SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO,
+                                SSL_R_COOKIE_MISMATCH);
+                                goto f_err;
+                        }
 
                         ret = 2;
-                        }
+                }
 
                 p += cookie_len;
-                }
+        }
 
-        n2s(p,i);
-        if ((i == 0) && (j != 0))
-                {
+        n2s(p, i);
+        if ((i == 0) && (j != 0)) {
                 /* we need a cipher if we are not resuming a session */
-                al=SSL_AD_ILLEGAL_PARAMETER;
-                SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO,SSL_R_NO_CIPHERS_SPECIFIED);
+                al = SSL_AD_ILLEGAL_PARAMETER;
+                SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO, SSL_R_NO_CIPHERS_SPECIFIED);
                 goto f_err;
-                }
-        if ((p+i) >= (d+n))
-                {
+        }
+        if ((p + i) >= (d + n)) {
                 /* not enough data */
-                al=SSL_AD_DECODE_ERROR;
-                SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO,SSL_R_LENGTH_MISMATCH);
+                al = SSL_AD_DECODE_ERROR;
+                SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO, SSL_R_LENGTH_MISMATCH);
                 goto f_err;
-                }
-        if ((i > 0) && (ssl_bytes_to_cipher_list(s,p,i,&(ciphers))
-                == NULL))
-                {
+        }
+        if ((i > 0) &&
+            (ssl_bytes_to_cipher_list(s, p, i, &(ciphers)) == NULL)) {
                 goto err;
-                }
-        p+=i;
+        }
+        p += i;
 
         /* If it is a hit, check that the cipher is in the list */
-        if ((s->hit) && (i > 0))
-                {
-                j=0;
-                id=s->session->cipher->id;
+        if ((s->hit) && (i > 0)) {
+                j = 0;
+                id = s->session->cipher->id;
 
 #ifdef CIPHER_DEBUG
-                printf("client sent %d ciphers\n",sk_num(ciphers));
+                printf("client sent %d ciphers\n", sk_num(ciphers));
 #endif
-                for (i=0; i<sk_SSL_CIPHER_num(ciphers); i++)
-                        {
-                        c=sk_SSL_CIPHER_value(ciphers,i);
+                for (i = 0; i < sk_SSL_CIPHER_num(ciphers); i++) {
+                        c = sk_SSL_CIPHER_value(ciphers, i);
 #ifdef CIPHER_DEBUG
                         printf("client [%2d of %2d]:%s\n",
-                                i,sk_num(ciphers),SSL_CIPHER_get_name(c));
+                        i, sk_num(ciphers), SSL_CIPHER_get_name(c));
 #endif
-                        if (c->id == id)
-                                {
-                                j=1;
+                        if (c->id == id) {
+                                j = 1;
                                 break;
-                                }
                         }
+                }
 /* Disabled because it can be used in a ciphersuite downgrade
  * attack: CVE-2010-4180.
  */
 #if 0
-                if (j == 0 && (s->options & SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG) && (sk_SSL_CIPHER_num(ciphers) == 1))
-                        {
+                if (j == 0 && (s->options & SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG) && (sk_SSL_CIPHER_num(ciphers) == 1)) {
                         /* Special case as client bug workaround: the previously used cipher may
                          * not be in the current list, the client instead might be trying to
                          * continue using a cipher that before wasn't chosen due to server
                          * preferences.  We'll have to reject the connection if the cipher is not
                          * enabled, though. */
                         c = sk_SSL_CIPHER_value(ciphers, 0);
-                        if (sk_SSL_CIPHER_find(SSL_get_ciphers(s), c) >= 0)
-                                {
+                        if (sk_SSL_CIPHER_find(SSL_get_ciphers(s), c) >= 0) {
                                 s->session->cipher = c;
                                 j = 1;
-                                }
                         }
+                }
 #endif
-                if (j == 0)
-                        {
+                if (j == 0) {
                         /* we need to have the cipher in the cipher
                          * list if we are asked to reuse it */
-                        al=SSL_AD_ILLEGAL_PARAMETER;
-                        SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO,SSL_R_REQUIRED_CIPHER_MISSING);
+                        al = SSL_AD_ILLEGAL_PARAMETER;
+                        SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO, SSL_R_REQUIRED_CIPHER_MISSING);
                         goto f_err;
-                        }
                 }
+        }
 
         /* compression */
         i= *(p++);
-        if ((p+i) > (d+n))
-                {
+        if ((p + i) > (d + n)) {
                 /* not enough data */
-                al=SSL_AD_DECODE_ERROR;
-                SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO,SSL_R_LENGTH_MISMATCH);
+                al = SSL_AD_DECODE_ERROR;
+                SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO, SSL_R_LENGTH_MISMATCH);
                 goto f_err;
-                }
-        q=p;
-        for (j=0; j<i; j++)
-                {
-                if (p[j] == 0) break;
-                }
+        }
+        q = p;
+        for (j = 0; j < i; j++) {
+                if (p[j] == 0)
+                        break;
+        }
 
-        p+=i;
-        if (j >= i)
-                {
+        p += i;
+        if (j >= i) {
                 /* no compress */
-                al=SSL_AD_DECODE_ERROR;
-                SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO,SSL_R_NO_COMPRESSION_SPECIFIED);
+                al = SSL_AD_DECODE_ERROR;
+                SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO, SSL_R_NO_COMPRESSION_SPECIFIED);
                 goto f_err;
-                }
+        }
 
 #ifndef OPENSSL_NO_TLSEXT
         /* TLS extensions*/
-        if (s->version >= SSL3_VERSION)
-                {
-                if (!ssl_parse_clienthello_tlsext(s,&p,d,n, &al))
-                        {
+        if (s->version >= SSL3_VERSION) {
+                if (!ssl_parse_clienthello_tlsext(s, &p, d, n, &al)) {
                         /* 'al' set by ssl_parse_clienthello_tlsext */
-                        SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO,SSL_R_PARSE_TLSEXT);
+                        SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO, SSL_R_PARSE_TLSEXT);
                         goto f_err;
-                        }
-                }
-                if (ssl_check_clienthello_tlsext_early(s) <= 0) {
-                        SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO,SSL_R_CLIENTHELLO_TLSEXT);
-                        goto err;
                 }
+        }
+        if (ssl_check_clienthello_tlsext_early(s) <= 0) {
+                SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO, SSL_R_CLIENTHELLO_TLSEXT);
+                goto err;
+        }
 
         /* Check if we want to use external pre-shared secret for this
          * handshake for not reused session only. We need to generate
@@ -1195,38 +1148,34 @@ int ssl3_get_client_hello(SSL *s)
          * SessionTicket processing to use it in key derivation. */
         {
                 unsigned char *pos;
-                pos=s->s3->server_random;
-                if (ssl_fill_hello_random(s, 1, pos, SSL3_RANDOM_SIZE) <= 0)
-                        {
-                        al=SSL_AD_INTERNAL_ERROR;
+                pos = s->s3->server_random;
+                if (ssl_fill_hello_random(s, 1, pos, SSL3_RANDOM_SIZE) <= 0) {
+                        al = SSL_AD_INTERNAL_ERROR;
                         goto f_err;
-                        }
+                }
         }
 
-        if (!s->hit && s->version >= TLS1_VERSION && s->tls_session_secret_cb)
-                {
-                SSL_CIPHER *pref_cipher=NULL;
+        if (!s->hit && s->version >= TLS1_VERSION && s->tls_session_secret_cb) {
+                SSL_CIPHER *pref_cipher = NULL;
 
-                s->session->master_key_length=sizeof(s->session->master_key);
-                if(s->tls_session_secret_cb(s, s->session->master_key, &s->session->master_key_length,
-                        ciphers, &pref_cipher, s->tls_session_secret_cb_arg))
-                        {
-                        s->hit=1;
-                        s->session->ciphers=ciphers;
-                        s->session->verify_result=X509_V_OK;
+                s->session->master_key_length = sizeof(s->session->master_key);
+                if (s->tls_session_secret_cb(s, s->session->master_key, &s->session->master_key_length,
+                        ciphers, &pref_cipher, s->tls_session_secret_cb_arg)) {
+                        s->hit = 1;
+                        s->session->ciphers = ciphers;
+                        s->session->verify_result = X509_V_OK;
 
-                        ciphers=NULL;
+                        ciphers = NULL;
 
                         /* check if some cipher was preferred by call back */
-                        pref_cipher=pref_cipher ? pref_cipher : ssl3_choose_cipher(s, s->session->ciphers, SSL_get_ciphers(s));
-                        if (pref_cipher == NULL)
-                                {
-                                al=SSL_AD_HANDSHAKE_FAILURE;
-                                SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO,SSL_R_NO_SHARED_CIPHER);
+                        pref_cipher = pref_cipher ? pref_cipher : ssl3_choose_cipher(s, s->session->ciphers, SSL_get_ciphers(s));
+                        if (pref_cipher == NULL) {
+                                al = SSL_AD_HANDSHAKE_FAILURE;
+                                SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO, SSL_R_NO_SHARED_CIPHER);
                                 goto f_err;
-                                }
+                        }
 
-                        s->session->cipher=pref_cipher;
+                        s->session->cipher = pref_cipher;
 
                         if (s->cipher_list)
                                 sk_SSL_CIPHER_free(s->cipher_list);
@@ -1236,165 +1185,144 @@ int ssl3_get_client_hello(SSL *s)
 
                         s->cipher_list = sk_SSL_CIPHER_dup(s->session->ciphers);
                         s->cipher_list_by_id = sk_SSL_CIPHER_dup(s->session->ciphers);
-                        }
                 }
+        }
 #endif
 
         /* Worst case, we will use the NULL compression, but if we have other
          * options, we will now look for them.  We have i-1 compression
          * algorithms from the client, starting at q. */
-        s->s3->tmp.new_compression=NULL;
+        s->s3->tmp.new_compression = NULL;
 #ifndef OPENSSL_NO_COMP
         /* This only happens if we have a cache hit */
-        if (s->session->compress_meth != 0)
-                {
+        if (s->session->compress_meth != 0) {
                 int m, comp_id = s->session->compress_meth;
                 /* Perform sanity checks on resumed compression algorithm */
                 /* Can't disable compression */
-                if (s->options & SSL_OP_NO_COMPRESSION)
-                        {
-                        al=SSL_AD_INTERNAL_ERROR;
-                        SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO,SSL_R_INCONSISTENT_COMPRESSION);
+                if (s->options & SSL_OP_NO_COMPRESSION) {
+                        al = SSL_AD_INTERNAL_ERROR;
+                        SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO, SSL_R_INCONSISTENT_COMPRESSION);
                         goto f_err;
-                        }
+                }
                 /* Look for resumed compression method */
-                for (m = 0; m < sk_SSL_COMP_num(s->ctx->comp_methods); m++)
-                        {
-                        comp=sk_SSL_COMP_value(s->ctx->comp_methods,m);
-                        if (comp_id == comp->id)
-                                {
-                                s->s3->tmp.new_compression=comp;
+                for (m = 0; m < sk_SSL_COMP_num(s->ctx->comp_methods); m++) {
+                        comp = sk_SSL_COMP_value(s->ctx->comp_methods, m);
+                        if (comp_id == comp->id) {
+                                s->s3->tmp.new_compression = comp;
                                 break;
-                                }
                         }
-                if (s->s3->tmp.new_compression == NULL)
-                        {
-                        al=SSL_AD_INTERNAL_ERROR;
-                        SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO,SSL_R_INVALID_COMPRESSION_ALGORITHM);
+                }
+                if (s->s3->tmp.new_compression == NULL) {
+                        al = SSL_AD_INTERNAL_ERROR;
+                        SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO, SSL_R_INVALID_COMPRESSION_ALGORITHM);
                         goto f_err;
-                        }
+                }
                 /* Look for resumed method in compression list */
-                for (m = 0; m < i; m++)
-                        {
+                for (m = 0; m < i; m++) {
                         if (q[m] == comp_id)
                                 break;
-                        }
-                if (m >= i)
-                        {
-                        al=SSL_AD_ILLEGAL_PARAMETER;
-                        SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO,SSL_R_REQUIRED_COMPRESSSION_ALGORITHM_MISSING);
+                }
+                if (m >= i) {
+                        al = SSL_AD_ILLEGAL_PARAMETER;
+                        SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO, SSL_R_REQUIRED_COMPRESSSION_ALGORITHM_MISSING);
                         goto f_err;
-                        }
                 }
-        else if (s->hit)
+        } else if (s->hit)
                 comp = NULL;
         else if (!(s->options & SSL_OP_NO_COMPRESSION) && s->ctx->comp_methods)
-                { /* See if we have a match */
-                int m,nn,o,v,done=0;
-
-                nn=sk_SSL_COMP_num(s->ctx->comp_methods);
-                for (m=0; m<nn; m++)
-                        {
-                        comp=sk_SSL_COMP_value(s->ctx->comp_methods,m);
-                        v=comp->id;
-                        for (o=0; o<i; o++)
-                                {
-                                if (v == q[o])
-                                        {
-                                        done=1;
+        { /* See if we have a match */
+                int m, nn, o, v, done = 0;
+
+                nn = sk_SSL_COMP_num(s->ctx->comp_methods);
+                for (m = 0; m < nn; m++) {
+                        comp = sk_SSL_COMP_value(s->ctx->comp_methods, m);
+                        v = comp->id;
+                        for (o = 0; o < i; o++) {
+                                if (v == q[o]) {
+                                        done = 1;
                                         break;
-                                        }
                                 }
-                        if (done) break;
                         }
+                        if (done)
+                                break;
+                }
                 if (done)
-                        s->s3->tmp.new_compression=comp;
+                        s->s3->tmp.new_compression = comp;
                 else
-                        comp=NULL;
-                }
+                        comp = NULL;
+        }
 #else
         /* If compression is disabled we'd better not try to resume a session
          * using compression.
          */
-        if (s->session->compress_meth != 0)
-                {
-                al=SSL_AD_INTERNAL_ERROR;
-                SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO,SSL_R_INCONSISTENT_COMPRESSION);
+        if (s->session->compress_meth != 0) {
+                al = SSL_AD_INTERNAL_ERROR;
+                SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO, SSL_R_INCONSISTENT_COMPRESSION);
                 goto f_err;
-                }
+        }
 #endif
 
         /* Given s->session->ciphers and SSL_get_ciphers, we must
          * pick a cipher */
 
-        if (!s->hit)
-                {
+        if (!s->hit) {
 #ifdef OPENSSL_NO_COMP
-                s->session->compress_meth=0;
+                s->session->compress_meth = 0;
 #else
-                s->session->compress_meth=(comp == NULL)?0:comp->id;
+                s->session->compress_meth = (comp == NULL) ? 0 : comp->id;
 #endif
                 if (s->session->ciphers != NULL)
                         sk_SSL_CIPHER_free(s->session->ciphers);
-                s->session->ciphers=ciphers;
-                if (ciphers == NULL)
-                        {
-                        al=SSL_AD_ILLEGAL_PARAMETER;
-                        SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO,SSL_R_NO_CIPHERS_PASSED);
+                s->session->ciphers = ciphers;
+                if (ciphers == NULL) {
+                        al = SSL_AD_ILLEGAL_PARAMETER;
+                        SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO, SSL_R_NO_CIPHERS_PASSED);
                         goto f_err;
-                        }
-                ciphers=NULL;
-                c=ssl3_choose_cipher(s,s->session->ciphers,
-                                     SSL_get_ciphers(s));
+                }
+                ciphers = NULL;
+                c = ssl3_choose_cipher(s, s->session->ciphers,
+                SSL_get_ciphers(s));
 
-                if (c == NULL)
-                        {
-                        al=SSL_AD_HANDSHAKE_FAILURE;
-                        SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO,SSL_R_NO_SHARED_CIPHER);
+                if (c == NULL) {
+                        al = SSL_AD_HANDSHAKE_FAILURE;
+                        SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO, SSL_R_NO_SHARED_CIPHER);
                         goto f_err;
-                        }
-                s->s3->tmp.new_cipher=c;
                 }
-        else
-                {
+                s->s3->tmp.new_cipher = c;
+        } else {
                 /* Session-id reuse */
 #ifdef REUSE_CIPHER_BUG
                 STACK_OF(SSL_CIPHER) *sk;
-                SSL_CIPHER *nc=NULL;
-                SSL_CIPHER *ec=NULL;
+                SSL_CIPHER *nc = NULL;
+                SSL_CIPHER *ec = NULL;
 
-                if (s->options & SSL_OP_NETSCAPE_DEMO_CIPHER_CHANGE_BUG)
-                        {
-                        sk=s->session->ciphers;
-                        for (i=0; i<sk_SSL_CIPHER_num(sk); i++)
-                                {
-                                c=sk_SSL_CIPHER_value(sk,i);
+                if (s->options & SSL_OP_NETSCAPE_DEMO_CIPHER_CHANGE_BUG) {
+                        sk = s->session->ciphers;
+                        for (i = 0; i < sk_SSL_CIPHER_num(sk); i++) {
+                                c = sk_SSL_CIPHER_value(sk, i);
                                 if (c->algorithm_enc & SSL_eNULL)
-                                        nc=c;
+                                        nc = c;
                                 if (SSL_C_IS_EXPORT(c))
-                                        ec=c;
-                                }
+                                        ec = c;
+                        }
                         if (nc != NULL)
-                                s->s3->tmp.new_cipher=nc;
+                                s->s3->tmp.new_cipher = nc;
                         else if (ec != NULL)
-                                s->s3->tmp.new_cipher=ec;
+                                s->s3->tmp.new_cipher = ec;
                         else
-                                s->s3->tmp.new_cipher=s->session->cipher;
-                        }
-                else
+                                s->s3->tmp.new_cipher = s->session->cipher;
+                } else
 #endif
-                s->s3->tmp.new_cipher=s->session->cipher;
-                }
+                s->s3->tmp.new_cipher = s->session->cipher;
+        }
 
-        if (TLS1_get_version(s) < TLS1_2_VERSION || !(s->verify_mode & SSL_VERIFY_PEER))
-                {
-                if (!ssl3_digest_cached_records(s))
-                        {
+        if (TLS1_get_version(s) < TLS1_2_VERSION || !(s->verify_mode & SSL_VERIFY_PEER)) {
+                if (!ssl3_digest_cached_records(s)) {
                         al = SSL_AD_INTERNAL_ERROR;
                         goto f_err;
-                        }
                 }
-        
+        }
+
         /* we now have the following setup. 
          * client_random
          * cipher_list          - our prefered list of ciphers
@@ -1407,50 +1335,49 @@ int ssl3_get_client_hello(SSL *s)
          */
 
         /* Handles TLS extensions that we couldn't check earlier */
-        if (s->version >= SSL3_VERSION)
-                {
-                if (ssl_check_clienthello_tlsext_late(s) <= 0)
-                        {
+        if (s->version >= SSL3_VERSION) {
+                if (ssl_check_clienthello_tlsext_late(s) <= 0) {
                         SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO, SSL_R_CLIENTHELLO_TLSEXT);
                         goto err;
-                        }
                 }
+        }
 
-        if (ret < 0) ret=1;
-        if (0)
-                {
+        if (ret < 0)
+                ret = 1;
+        if (0) {
 f_err:
-                ssl3_send_alert(s,SSL3_AL_FATAL,al);
-                }
-err:
-        if (ciphers != NULL) sk_SSL_CIPHER_free(ciphers);
-        return(ret);
+                ssl3_send_alert(s, SSL3_AL_FATAL, al);
         }
+err:
+        if (ciphers != NULL)
+                sk_SSL_CIPHER_free(ciphers);
+        return (ret);
+}
 
-int ssl3_send_server_hello(SSL *s)
-        {
+int
+ssl3_send_server_hello(SSL *s)
+{
         unsigned char *buf;
-        unsigned char *p,*d;
-        int i,sl;
+        unsigned char *p, *d;
+        int i, sl;
         unsigned long l;
 
-        if (s->state == SSL3_ST_SW_SRVR_HELLO_A)
-                {
-                buf=(unsigned char *)s->init_buf->data;
+        if (s->state == SSL3_ST_SW_SRVR_HELLO_A) {
+                buf = (unsigned char *)s->init_buf->data;
 #ifdef OPENSSL_NO_TLSEXT
-                p=s->s3->server_random;
+                p = s->s3->server_random;
                 if (ssl_fill_hello_random(s, 1, p, SSL3_RANDOM_SIZE) <= 0)
                         return -1;
 #endif
                 /* Do the message type and length last */
-                d=p= &(buf[4]);
+                d = p= &(buf[4]);
 
-                *(p++)=s->version>>8;
-                *(p++)=s->version&0xff;
+                *(p++) = s->version >> 8;
+                *(p++) = s->version&0xff;
 
                 /* Random stuff */
-                memcpy(p,s->s3->server_random,SSL3_RANDOM_SIZE);
-                p+=SSL3_RANDOM_SIZE;
+                memcpy(p, s->s3->server_random, SSL3_RANDOM_SIZE);
+                p += SSL3_RANDOM_SIZE;
 
                 /* There are several cases for the session ID to send
                  * back in the server hello:
@@ -1469,317 +1396,287 @@ int ssl3_send_server_hello(SSL *s)
                  */
                 if (!(s->ctx->session_cache_mode & SSL_SESS_CACHE_SERVER)
                         && !s->hit)
-                        s->session->session_id_length=0;
+                s->session->session_id_length = 0;
 
-                sl=s->session->session_id_length;
-                if (sl > (int)sizeof(s->session->session_id))
-                        {
+                sl = s->session->session_id_length;
+                if (sl > (int)sizeof(s->session->session_id)) {
                         SSLerr(SSL_F_SSL3_SEND_SERVER_HELLO, ERR_R_INTERNAL_ERROR);
                         return -1;
-                        }
-                *(p++)=sl;
-                memcpy(p,s->session->session_id,sl);
-                p+=sl;
+                }
+                *(p++) = sl;
+                memcpy(p, s->session->session_id, sl);
+                p += sl;
 
                 /* put the cipher */
-                i=ssl3_put_cipher_by_char(s->s3->tmp.new_cipher,p);
-                p+=i;
+                i = ssl3_put_cipher_by_char(s->s3->tmp.new_cipher, p);
+                p += i;
 
                 /* put the compression method */
 #ifdef OPENSSL_NO_COMP
-                        *(p++)=0;
+                *(p++) = 0;
 #else
                 if (s->s3->tmp.new_compression == NULL)
-                        *(p++)=0;
+                        *(p++) = 0;
                 else
-                        *(p++)=s->s3->tmp.new_compression->id;
+                        *(p++) = s->s3->tmp.new_compression->id;
 #endif
 #ifndef OPENSSL_NO_TLSEXT
-                if (ssl_prepare_serverhello_tlsext(s) <= 0)
-                        {
-                        SSLerr(SSL_F_SSL3_SEND_SERVER_HELLO,SSL_R_SERVERHELLO_TLSEXT);
+                if (ssl_prepare_serverhello_tlsext(s) <= 0) {
+                        SSLerr(SSL_F_SSL3_SEND_SERVER_HELLO, SSL_R_SERVERHELLO_TLSEXT);
                         return -1;
-                        }
-                if ((p = ssl_add_serverhello_tlsext(s, p, buf+SSL3_RT_MAX_PLAIN_LENGTH)) == NULL)
-                        {
-                        SSLerr(SSL_F_SSL3_SEND_SERVER_HELLO,ERR_R_INTERNAL_ERROR);
+                }
+                if ((p = ssl_add_serverhello_tlsext(s, p, buf + SSL3_RT_MAX_PLAIN_LENGTH)) == NULL) {
+                        SSLerr(SSL_F_SSL3_SEND_SERVER_HELLO, ERR_R_INTERNAL_ERROR);
                         return -1;
-                        }
+                }
 #endif
                 /* do the header */
-                l=(p-d);
-                d=buf;
-                *(d++)=SSL3_MT_SERVER_HELLO;
-                l2n3(l,d);
+                l = (p - d);
+                d = buf;
+                *(d++) = SSL3_MT_SERVER_HELLO;
+                l2n3(l, d);
 
-                s->state=SSL3_ST_SW_SRVR_HELLO_B;
+                s->state = SSL3_ST_SW_SRVR_HELLO_B;
                 /* number of bytes to write */
-                s->init_num=p-buf;
-                s->init_off=0;
-                }
+                s->init_num = p - buf;
+                s->init_off = 0;
+        }
 
         /* SSL3_ST_SW_SRVR_HELLO_B */
-        return(ssl3_do_write(s,SSL3_RT_HANDSHAKE));
-        }
+        return (ssl3_do_write(s, SSL3_RT_HANDSHAKE));
+}
 
-int ssl3_send_server_done(SSL *s)
-        {
+int
+ssl3_send_server_done(SSL *s)
+{
         unsigned char *p;
 
-        if (s->state == SSL3_ST_SW_SRVR_DONE_A)
-                {
-                p=(unsigned char *)s->init_buf->data;
+        if (s->state == SSL3_ST_SW_SRVR_DONE_A) {
+                p = (unsigned char *)s->init_buf->data;
 
                 /* do the header */
-                *(p++)=SSL3_MT_SERVER_DONE;
-                *(p++)=0;
-                *(p++)=0;
-                *(p++)=0;
+                *(p++) = SSL3_MT_SERVER_DONE;
+                *(p++) = 0;
+                *(p++) = 0;
+                *(p++) = 0;
 
-                s->state=SSL3_ST_SW_SRVR_DONE_B;
+                s->state = SSL3_ST_SW_SRVR_DONE_B;
                 /* number of bytes to write */
-                s->init_num=4;
-                s->init_off=0;
-                }
+                s->init_num = 4;
+                s->init_off = 0;
+        }
 
         /* SSL3_ST_SW_SRVR_DONE_B */
-        return(ssl3_do_write(s,SSL3_RT_HANDSHAKE));
-        }
+        return (ssl3_do_write(s, SSL3_RT_HANDSHAKE));
+}
 
-int ssl3_send_server_key_exchange(SSL *s)
-        {
+int
+ssl3_send_server_key_exchange(SSL *s)
+{
 #ifndef OPENSSL_NO_RSA
         unsigned char *q;
-        int j,num;
+        int j, num;
         RSA *rsa;
-        unsigned char md_buf[MD5_DIGEST_LENGTH+SHA_DIGEST_LENGTH];
+        unsigned char md_buf[MD5_DIGEST_LENGTH + SHA_DIGEST_LENGTH];
         unsigned int u;
 #endif
 #ifndef OPENSSL_NO_DH
-        DH *dh=NULL,*dhp;
+        DH *dh = NULL, *dhp;
 #endif
 #ifndef OPENSSL_NO_ECDH
-        EC_KEY *ecdh=NULL, *ecdhp;
+        EC_KEY *ecdh = NULL, *ecdhp;
         unsigned char *encodedPoint = NULL;
         int encodedlen = 0;
         int curve_id = 0;
-        BN_CTX *bn_ctx = NULL; 
+        BN_CTX *bn_ctx = NULL;
+
 #endif
         EVP_PKEY *pkey;
         const EVP_MD *md = NULL;
-        unsigned char *p,*d;
-        int al,i;
+        unsigned char *p, *d;
+        int al, i;
         unsigned long type;
         int n;
         CERT *cert;
         BIGNUM *r[4];
-        int nr[4],kn;
+        int nr[4], kn;
         BUF_MEM *buf;
         EVP_MD_CTX md_ctx;
 
         EVP_MD_CTX_init(&md_ctx);
-        if (s->state == SSL3_ST_SW_KEY_EXCH_A)
-                {
-                type=s->s3->tmp.new_cipher->algorithm_mkey;
-                cert=s->cert;
+        if (s->state == SSL3_ST_SW_KEY_EXCH_A) {
+                type = s->s3->tmp.new_cipher->algorithm_mkey;
+                cert = s->cert;
 
-                buf=s->init_buf;
+                buf = s->init_buf;
 
-                r[0]=r[1]=r[2]=r[3]=NULL;
-                n=0;
+                r[0] = r[1] = r[2] = r[3] = NULL;
+                n = 0;
 #ifndef OPENSSL_NO_RSA
-                if (type & SSL_kRSA)
-                        {
-                        rsa=cert->rsa_tmp;
-                        if ((rsa == NULL) && (s->cert->rsa_tmp_cb != NULL))
-                                {
-                                rsa=s->cert->rsa_tmp_cb(s,
-                                      SSL_C_IS_EXPORT(s->s3->tmp.new_cipher),
-                                      SSL_C_EXPORT_PKEYLENGTH(s->s3->tmp.new_cipher));
-                                if(rsa == NULL)
-                                {
-                                        al=SSL_AD_HANDSHAKE_FAILURE;
-                                        SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE,SSL_R_ERROR_GENERATING_TMP_RSA_KEY);
+                if (type & SSL_kRSA) {
+                        rsa = cert->rsa_tmp;
+                        if ((rsa == NULL) && (s->cert->rsa_tmp_cb != NULL)) {
+                                rsa = s->cert->rsa_tmp_cb(s,
+                                SSL_C_IS_EXPORT(s->s3->tmp.new_cipher),
+                                SSL_C_EXPORT_PKEYLENGTH(s->s3->tmp.new_cipher));
+                                if (rsa == NULL) {
+                                        al = SSL_AD_HANDSHAKE_FAILURE;
+                                        SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE, SSL_R_ERROR_GENERATING_TMP_RSA_KEY);
                                         goto f_err;
                                 }
                                 RSA_up_ref(rsa);
-                                cert->rsa_tmp=rsa;
-                                }
-                        if (rsa == NULL)
-                                {
-                                al=SSL_AD_HANDSHAKE_FAILURE;
-                                SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE,SSL_R_MISSING_TMP_RSA_KEY);
+                                cert->rsa_tmp = rsa;
+                        }
+                        if (rsa == NULL) {
+                                al = SSL_AD_HANDSHAKE_FAILURE;
+                                SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE, SSL_R_MISSING_TMP_RSA_KEY);
                                 goto f_err;
-                                }
-                        r[0]=rsa->n;
-                        r[1]=rsa->e;
-                        s->s3->tmp.use_rsa_tmp=1;
                         }
-                else
+                        r[0] = rsa->n;
+                        r[1] = rsa->e;
+                        s->s3->tmp.use_rsa_tmp = 1;
+                } else
 #endif
 #ifndef OPENSSL_NO_DH
-                        if (type & SSL_kEDH)
-                        {
-                        dhp=cert->dh_tmp;
+                if (type & SSL_kEDH) {
+                        dhp = cert->dh_tmp;
                         if ((dhp == NULL) && (s->cert->dh_tmp_cb != NULL))
-                                dhp=s->cert->dh_tmp_cb(s,
-                                      SSL_C_IS_EXPORT(s->s3->tmp.new_cipher),
-                                      SSL_C_EXPORT_PKEYLENGTH(s->s3->tmp.new_cipher));
-                        if (dhp == NULL)
-                                {
-                                al=SSL_AD_HANDSHAKE_FAILURE;
-                                SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE,SSL_R_MISSING_TMP_DH_KEY);
+                                dhp = s->cert->dh_tmp_cb(s,
+                        SSL_C_IS_EXPORT(s->s3->tmp.new_cipher),
+                        SSL_C_EXPORT_PKEYLENGTH(s->s3->tmp.new_cipher));
+                        if (dhp == NULL) {
+                                al = SSL_AD_HANDSHAKE_FAILURE;
+                                SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE, SSL_R_MISSING_TMP_DH_KEY);
                                 goto f_err;
-                                }
+                        }
 
-                        if (s->s3->tmp.dh != NULL)
-                                {
+                        if (s->s3->tmp.dh != NULL) {
                                 SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE, ERR_R_INTERNAL_ERROR);
                                 goto err;
-                                }
+                        }
 
-                        if ((dh=DHparams_dup(dhp)) == NULL)
-                                {
-                                SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE,ERR_R_DH_LIB);
+                        if ((dh = DHparams_dup(dhp)) == NULL) {
+                                SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE, ERR_R_DH_LIB);
                                 goto err;
-                                }
+                        }
 
-                        s->s3->tmp.dh=dh;
-                        if ((dhp->pub_key == NULL ||
-                             dhp->priv_key == NULL ||
-                             (s->options & SSL_OP_SINGLE_DH_USE)))
-                                {
-                                if(!DH_generate_key(dh))
-                                    {
-                                    SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE,
-                                           ERR_R_DH_LIB);
-                                    goto err;
-                                    }
+                        s->s3->tmp.dh = dh;
+                        if ((dhp->pub_key == NULL || dhp->priv_key == NULL ||
+                            (s->options & SSL_OP_SINGLE_DH_USE))) {
+                                if (!DH_generate_key(dh)) {
+                                        SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE,
+                                        ERR_R_DH_LIB);
+                                        goto err;
                                 }
-                        else
-                                {
-                                dh->pub_key=BN_dup(dhp->pub_key);
-                                dh->priv_key=BN_dup(dhp->priv_key);
+                        } else {
+                                dh->pub_key = BN_dup(dhp->pub_key);
+                                dh->priv_key = BN_dup(dhp->priv_key);
                                 if ((dh->pub_key == NULL) ||
-                                        (dh->priv_key == NULL))
-                                        {
-                                        SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE,ERR_R_DH_LIB);
+                                        (dh->priv_key == NULL)) {
+                                        SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE, ERR_R_DH_LIB);
                                         goto err;
-                                        }
                                 }
-                        r[0]=dh->p;
-                        r[1]=dh->g;
-                        r[2]=dh->pub_key;
                         }
-                else 
+                        r[0] = dh->p;
+                        r[1] = dh->g;
+                        r[2] = dh->pub_key;
+                } else
 #endif
 #ifndef OPENSSL_NO_ECDH
-                        if (type & SSL_kEECDH)
-                        {
+                if (type & SSL_kEECDH) {
                         const EC_GROUP *group;
 
-                        ecdhp=cert->ecdh_tmp;
-                        if ((ecdhp == NULL) && (s->cert->ecdh_tmp_cb != NULL))
-                                {
-                                ecdhp=s->cert->ecdh_tmp_cb(s,
-                                      SSL_C_IS_EXPORT(s->s3->tmp.new_cipher),
-                                      SSL_C_EXPORT_PKEYLENGTH(s->s3->tmp.new_cipher));
-                                }
-                        if (ecdhp == NULL)
-                                {
-                                al=SSL_AD_HANDSHAKE_FAILURE;
-                                SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE,SSL_R_MISSING_TMP_ECDH_KEY);
+                        ecdhp = cert->ecdh_tmp;
+                        if ((ecdhp == NULL) && (s->cert->ecdh_tmp_cb != NULL)) {
+                                ecdhp = s->cert->ecdh_tmp_cb(
+                                    s, SSL_C_IS_EXPORT(s->s3->tmp.new_cipher),
+                                    SSL_C_EXPORT_PKEYLENGTH(s->s3->tmp.new_cipher));
+                        }
+                        if (ecdhp == NULL) {
+                                al = SSL_AD_HANDSHAKE_FAILURE;
+                                SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE, SSL_R_MISSING_TMP_ECDH_KEY);
                                 goto f_err;
-                                }
+                        }
 
-                        if (s->s3->tmp.ecdh != NULL)
-                                {
+                        if (s->s3->tmp.ecdh != NULL) {
                                 SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE, ERR_R_INTERNAL_ERROR);
                                 goto err;
-                                }
+                        }
 
                         /* Duplicate the ECDH structure. */
-                        if (ecdhp == NULL)
-                                {
-                                SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE,ERR_R_ECDH_LIB);
+                        if (ecdhp == NULL) {
+                                SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE, ERR_R_ECDH_LIB);
                                 goto err;
-                                }
-                        if ((ecdh = EC_KEY_dup(ecdhp)) == NULL)
-                                {
-                                SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE,ERR_R_ECDH_LIB);
+                        }
+                        if ((ecdh = EC_KEY_dup(ecdhp)) == NULL) {
+                                SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE, ERR_R_ECDH_LIB);
                                 goto err;
-                                }
+                        }
 
-                        s->s3->tmp.ecdh=ecdh;
+                        s->s3->tmp.ecdh = ecdh;
                         if ((EC_KEY_get0_public_key(ecdh) == NULL) ||
                             (EC_KEY_get0_private_key(ecdh) == NULL) ||
-                            (s->options & SSL_OP_SINGLE_ECDH_USE))
-                                {
-                                if(!EC_KEY_generate_key(ecdh))
-                                    {
-                                    SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE,ERR_R_ECDH_LIB);
-                                    goto err;
-                                    }
+                            (s->options & SSL_OP_SINGLE_ECDH_USE)) {
+                                if (!EC_KEY_generate_key(ecdh)) {
+                                        SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE, ERR_R_ECDH_LIB);
+                                        goto err;
                                 }
+                        }
 
                         if (((group = EC_KEY_get0_group(ecdh)) == NULL) ||
                             (EC_KEY_get0_public_key(ecdh)  == NULL) ||
-                            (EC_KEY_get0_private_key(ecdh) == NULL))
-                                {
-                                SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE,ERR_R_ECDH_LIB);
+                            (EC_KEY_get0_private_key(ecdh) == NULL)) {
+                                SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE, ERR_R_ECDH_LIB);
                                 goto err;
-                                }
+                        }
 
                         if (SSL_C_IS_EXPORT(s->s3->tmp.new_cipher) &&
-                            (EC_GROUP_get_degree(group) > 163)) 
-                                {
-                                SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE,SSL_R_ECGROUP_TOO_LARGE_FOR_CIPHER);
+                            (EC_GROUP_get_degree(group) > 163)) {
+                                SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE, SSL_R_ECGROUP_TOO_LARGE_FOR_CIPHER);
                                 goto err;
-                                }
+                        }
 
                         /* XXX: For now, we only support ephemeral ECDH
                          * keys over named (not generic) curves. For 
                          * supported named curves, curve_id is non-zero.
                          */
-                        if ((curve_id = 
-                            tls1_ec_nid2curve_id(EC_GROUP_get_curve_name(group)))
-                            == 0)
-                                {
-                                SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE,SSL_R_UNSUPPORTED_ELLIPTIC_CURVE);
+                        if ((curve_id = tls1_ec_nid2curve_id(
+                            EC_GROUP_get_curve_name(group))) == 0) {
+                                SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE, SSL_R_UNSUPPORTED_ELLIPTIC_CURVE);
                                 goto err;
-                                }
+                        }
 
                         /* Encode the public key.
                          * First check the size of encoding and
                          * allocate memory accordingly.
                          */
-                        encodedlen = EC_POINT_point2oct(group, 
-                            EC_KEY_get0_public_key(ecdh),
-                            POINT_CONVERSION_UNCOMPRESSED, 
-                            NULL, 0, NULL);
+                        encodedlen = EC_POINT_point2oct(group,
+                        EC_KEY_get0_public_key(ecdh),
+                        POINT_CONVERSION_UNCOMPRESSED,
+                        NULL, 0, NULL);
+
+                        encodedPoint = (unsigned char *)
+                        OPENSSL_malloc(encodedlen*sizeof(unsigned char));
 
-                        encodedPoint = (unsigned char *) 
-                            OPENSSL_malloc(encodedlen*sizeof(unsigned char)); 
                         bn_ctx = BN_CTX_new();
-                        if ((encodedPoint == NULL) || (bn_ctx == NULL))
-                                {
-                                SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE,ERR_R_MALLOC_FAILURE);
+                        if ((encodedPoint == NULL) || (bn_ctx == NULL)) {
+                                SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE, ERR_R_MALLOC_FAILURE);
                                 goto err;
-                                }
+                        }
 
 
-                        encodedlen = EC_POINT_point2oct(group, 
-                            EC_KEY_get0_public_key(ecdh), 
-                            POINT_CONVERSION_UNCOMPRESSED, 
-                            encodedPoint, encodedlen, bn_ctx);
+                        encodedlen = EC_POINT_point2oct(group,
+                        EC_KEY_get0_public_key(ecdh),
+                        POINT_CONVERSION_UNCOMPRESSED,
+                        encodedPoint, encodedlen, bn_ctx);
 
-                        if (encodedlen == 0) 
-                                {
-                                SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE,ERR_R_ECDH_LIB);
+                        if (encodedlen == 0) {
+                                SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE, ERR_R_ECDH_LIB);
                                 goto err;
-                                }
+                        }
 
-                        BN_CTX_free(bn_ctx);  bn_ctx=NULL;
+                        BN_CTX_free(bn_ctx);
+                        bn_ctx = NULL;
 
                         /* XXX: For now, we only support named (not 
                          * generic) curves in ECDH ephemeral key exchanges.
@@ -1792,98 +1689,80 @@ int ssl3_send_server_key_exchange(SSL *s)
                         /* We'll generate the serverKeyExchange message
                          * explicitly so we can set these to NULLs
                          */
-                        r[0]=NULL;
-                        r[1]=NULL;
-                        r[2]=NULL;
-                        r[3]=NULL;
-                        }
-                else 
+                        r[0] = NULL;
+                        r[1] = NULL;
+                        r[2] = NULL;
+                        r[3] = NULL;
+                } else
 #endif /* !OPENSSL_NO_ECDH */
 #ifndef OPENSSL_NO_PSK
-                        if (type & SSL_kPSK)
-                                {
-                                /* reserve size for record length and PSK identity hint*/
-                                n+=2+strlen(s->ctx->psk_identity_hint);
-                                }
-                        else
+                if (type & SSL_kPSK) {
+                        /* reserve size for record length and PSK identity hint*/
+                        n += 2 + strlen(s->ctx->psk_identity_hint);
+                } else
 #endif /* !OPENSSL_NO_PSK */
 #ifndef OPENSSL_NO_SRP
-                if (type & SSL_kSRP)
-                        {
-                        if ((s->srp_ctx.N == NULL) ||
-                                (s->srp_ctx.g == NULL) ||
-                                (s->srp_ctx.s == NULL) ||
-                                (s->srp_ctx.B == NULL))
-                                {
-                                SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE,SSL_R_MISSING_SRP_PARAM);
+                if (type & SSL_kSRP) {
+                        if ((s->srp_ctx.N == NULL) || (s->srp_ctx.g == NULL) ||
+                            (s->srp_ctx.s == NULL) || (s->srp_ctx.B == NULL)) {
+                                SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE, SSL_R_MISSING_SRP_PARAM);
                                 goto err;
-                                }
-                        r[0]=s->srp_ctx.N;
-                        r[1]=s->srp_ctx.g;
-                        r[2]=s->srp_ctx.s;
-                        r[3]=s->srp_ctx.B;
                         }
-                else 
+                        r[0] = s->srp_ctx.N;
+                        r[1] = s->srp_ctx.g;
+                        r[2] = s->srp_ctx.s;
+                        r[3] = s->srp_ctx.B;
+                } else
 #endif
-                        {
-                        al=SSL_AD_HANDSHAKE_FAILURE;
-                        SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE,SSL_R_UNKNOWN_KEY_EXCHANGE_TYPE);
+                {
+                        al = SSL_AD_HANDSHAKE_FAILURE;
+                        SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE, SSL_R_UNKNOWN_KEY_EXCHANGE_TYPE);
                         goto f_err;
-                        }
-                for (i=0; i < 4 && r[i] != NULL; i++)
-                        {
-                        nr[i]=BN_num_bytes(r[i]);
+                }
+                for (i = 0; i < 4 && r[i] != NULL; i++) {
+                        nr[i] = BN_num_bytes(r[i]);
 #ifndef OPENSSL_NO_SRP
                         if ((i == 2) && (type & SSL_kSRP))
-                                n+=1+nr[i];
+                                n += 1 + nr[i];
                         else
 #endif
-                        n+=2+nr[i];
-                        }
+                        n += 2 + nr[i];
+                }
 
-                if (!(s->s3->tmp.new_cipher->algorithm_auth & SSL_aNULL)
-                        && !(s->s3->tmp.new_cipher->algorithm_mkey & SSL_kPSK))
-                        {
-                        if ((pkey=ssl_get_sign_pkey(s,s->s3->tmp.new_cipher,&md))
-                                == NULL)
-                                {
-                                al=SSL_AD_DECODE_ERROR;
+                if (!(s->s3->tmp.new_cipher->algorithm_auth & SSL_aNULL) &&
+                    !(s->s3->tmp.new_cipher->algorithm_mkey & SSL_kPSK)) {
+                        if ((pkey = ssl_get_sign_pkey(
+                            s, s->s3->tmp.new_cipher, &md)) == NULL) {
+                                al = SSL_AD_DECODE_ERROR;
                                 goto f_err;
-                                }
-                        kn=EVP_PKEY_size(pkey);
-                        }
-                else
-                        {
-                        pkey=NULL;
-                        kn=0;
                         }
+                        kn = EVP_PKEY_size(pkey);
+                } else {
+                        pkey = NULL;
+                        kn = 0;
+                }
 
-                if (!BUF_MEM_grow_clean(buf,n+4+kn))
-                        {
-                        SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE,ERR_LIB_BUF);
+                if (!BUF_MEM_grow_clean(buf, n + 4 + kn)) {
+                        SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE, ERR_LIB_BUF);
                         goto err;
-                        }
-                d=(unsigned char *)s->init_buf->data;
-                p= &(d[4]);
+                }
+                d = (unsigned char *)s->init_buf->data;
+                p = &(d[4]);
 
-                for (i=0; i < 4 && r[i] != NULL; i++)
-                        {
+                for (i = 0; i < 4 && r[i] != NULL; i++) {
 #ifndef OPENSSL_NO_SRP
-                        if ((i == 2) && (type & SSL_kSRP))
-                                {
+                        if ((i == 2) && (type & SSL_kSRP)) {
                                 *p = nr[i];
                                 p++;
-                                }
-                        else
+                        } else
 #endif
-                        s2n(nr[i],p);
-                        BN_bn2bin(r[i],p);
-                        p+=nr[i];
-                        }
+                        s2n(nr[i], p);
+                        BN_bn2bin(r[i], p);
+                        p += nr[i];
+                }
 
 #ifndef OPENSSL_NO_ECDH
-                if (type & SSL_kEECDH) 
-                        {
+                if (type & SSL_kEECDH) {
                         /* XXX: For now, we only support named (not generic) curves.
                          * In this situation, the serverKeyExchange message has:
                          * [1 byte CurveType], [2 byte CurveName]
@@ -1898,236 +1777,220 @@ int ssl3_send_server_key_exchange(SSL *s)
                         p += 1;
                         *p = encodedlen;
                         p += 1;
-                        memcpy((unsigned char*)p, 
-                            (unsigned char *)encodedPoint, 
-                            encodedlen);
+                        memcpy((unsigned char*)p,
+                            (unsigned char *)encodedPoint, encodedlen);
                         OPENSSL_free(encodedPoint);
                         encodedPoint = NULL;
                         p += encodedlen;
-                        }
+                }
 #endif
 
 #ifndef OPENSSL_NO_PSK
-                if (type & SSL_kPSK)
-                        {
+                if (type & SSL_kPSK) {
                         /* copy PSK identity hint */
-                        s2n(strlen(s->ctx->psk_identity_hint), p); 
+                        s2n(strlen(s->ctx->psk_identity_hint), p);
+
                         strncpy((char *)p, s->ctx->psk_identity_hint, strlen(s->ctx->psk_identity_hint));
-                        p+=strlen(s->ctx->psk_identity_hint);
-                        }
+                        p += strlen(s->ctx->psk_identity_hint);
+                }
 #endif
 
                 /* not anonymous */
-                if (pkey != NULL)
-                        {
+                if (pkey != NULL) {
                         /* n is the length of the params, they start at &(d[4])
                          * and p points to the space at the end. */
 #ifndef OPENSSL_NO_RSA
                         if (pkey->type == EVP_PKEY_RSA
-                                        && TLS1_get_version(s) < TLS1_2_VERSION)
-                                {
-                                q=md_buf;
-                                j=0;
-                                for (num=2; num > 0; num--)
-                                        {
+                                && TLS1_get_version(s) < TLS1_2_VERSION) {
+                                q = md_buf;
+                                j = 0;
+                                for (num = 2; num > 0; num--) {
                                         EVP_MD_CTX_set_flags(&md_ctx,
-                                                EVP_MD_CTX_FLAG_NON_FIPS_ALLOW);
-                                        EVP_DigestInit_ex(&md_ctx,(num == 2)
-                                                ?s->ctx->md5:s->ctx->sha1, NULL);
-                                        EVP_DigestUpdate(&md_ctx,&(s->s3->client_random[0]),SSL3_RANDOM_SIZE);
-                                        EVP_DigestUpdate(&md_ctx,&(s->s3->server_random[0]),SSL3_RANDOM_SIZE);
-                                        EVP_DigestUpdate(&md_ctx,&(d[4]),n);
-                                        EVP_DigestFinal_ex(&md_ctx,q,
-                                                (unsigned int *)&i);
-                                        q+=i;
-                                        j+=i;
-                                        }
+                                        EVP_MD_CTX_FLAG_NON_FIPS_ALLOW);
+                                        EVP_DigestInit_ex(&md_ctx,
+                                            (num == 2) ? s->ctx->md5 : s->ctx->sha1, NULL);
+                                        EVP_DigestUpdate(&md_ctx, &(s->s3->client_random[0]), SSL3_RANDOM_SIZE);
+                                        EVP_DigestUpdate(&md_ctx, &(s->s3->server_random[0]), SSL3_RANDOM_SIZE);
+                                        EVP_DigestUpdate(&md_ctx, &(d[4]), n);
+                                        EVP_DigestFinal_ex(&md_ctx, q, (unsigned int *)&i);
+                                        q += i;
+                                        j += i;
+                                }
                                 if (RSA_sign(NID_md5_sha1, md_buf, j,
-                                        &(p[2]), &u, pkey->pkey.rsa) <= 0)
-                                        {
-                                        SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE,ERR_LIB_RSA);
+                                    &(p[2]), &u, pkey->pkey.rsa) <= 0) {
+                                        SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE, ERR_LIB_RSA);
                                         goto err;
-                                        }
-                                s2n(u,p);
-                                n+=u+2;
                                 }
-                        else
+                                s2n(u, p);
+                                n += u + 2;
+                        } else
 #endif
-                        if (md)
-                                {
+                        if (md) {
                                 /* For TLS1.2 and later send signature
                                  * algorithm */
-                                if (TLS1_get_version(s) >= TLS1_2_VERSION)
-                                        {
-                                        if (!tls12_get_sigandhash(p, pkey, md))
-                                                {
+                                if (TLS1_get_version(s) >= TLS1_2_VERSION) {
+                                        if (!tls12_get_sigandhash(p, pkey, md)) {
                                                 /* Should never happen */
-                                                al=SSL_AD_INTERNAL_ERROR;
-                                                SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE,ERR_R_INTERNAL_ERROR);
+                                                al = SSL_AD_INTERNAL_ERROR;
+                                                SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE, ERR_R_INTERNAL_ERROR);
                                                 goto f_err;
-                                                }
-                                        p+=2;
                                         }
+                                        p += 2;
+                                }
 #ifdef SSL_DEBUG
                                 fprintf(stderr, "Using hash %s\n",
-                                                        EVP_MD_name(md));
+                                EVP_MD_name(md));
 #endif
                                 EVP_SignInit_ex(&md_ctx, md, NULL);
-                                EVP_SignUpdate(&md_ctx,&(s->s3->client_random[0]),SSL3_RANDOM_SIZE);
-                                EVP_SignUpdate(&md_ctx,&(s->s3->server_random[0]),SSL3_RANDOM_SIZE);
-                                EVP_SignUpdate(&md_ctx,&(d[4]),n);
-                                if (!EVP_SignFinal(&md_ctx,&(p[2]),
-                                        (unsigned int *)&i,pkey))
-                                        {
-                                        SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE,ERR_LIB_EVP);
+                                EVP_SignUpdate(&md_ctx, &(s->s3->client_random[0]), SSL3_RANDOM_SIZE);
+                                EVP_SignUpdate(&md_ctx, &(s->s3->server_random[0]), SSL3_RANDOM_SIZE);
+                                EVP_SignUpdate(&md_ctx, &(d[4]), n);
+                                if (!EVP_SignFinal(&md_ctx, &(p[2]),
+                                        (unsigned int *)&i, pkey)) {
+                                        SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE, ERR_LIB_EVP);
                                         goto err;
-                                        }
-                                s2n(i,p);
-                                n+=i+2;
-                                if (TLS1_get_version(s) >= TLS1_2_VERSION)
-                                        n+= 2;
                                 }
-                        else
-                                {
+                                s2n(i, p);
+                                n += i + 2;
+                                if (TLS1_get_version(s) >= TLS1_2_VERSION)
+                                        n += 2;
+                        } else {
                                 /* Is this error check actually needed? */
-                                al=SSL_AD_HANDSHAKE_FAILURE;
-                                SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE,SSL_R_UNKNOWN_PKEY_TYPE);
+                                al = SSL_AD_HANDSHAKE_FAILURE;
+                                SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE, SSL_R_UNKNOWN_PKEY_TYPE);
                                 goto f_err;
-                                }
                         }
+                }
 
-                *(d++)=SSL3_MT_SERVER_KEY_EXCHANGE;
-                l2n3(n,d);
+                *(d++) = SSL3_MT_SERVER_KEY_EXCHANGE;
+                l2n3(n, d);
 
                 /* we should now have things packed up, so lets send
                  * it off */
-                s->init_num=n+4;
-                s->init_off=0;
-                }
+                s->init_num = n + 4;
+                s->init_off = 0;
+        }
 
         s->state = SSL3_ST_SW_KEY_EXCH_B;
         EVP_MD_CTX_cleanup(&md_ctx);
-        return(ssl3_do_write(s,SSL3_RT_HANDSHAKE));
+        return (ssl3_do_write(s, SSL3_RT_HANDSHAKE));
 f_err:
-        ssl3_send_alert(s,SSL3_AL_FATAL,al);
+        ssl3_send_alert(s, SSL3_AL_FATAL, al);
 err:
 #ifndef OPENSSL_NO_ECDH
-        if (encodedPoint != NULL) OPENSSL_free(encodedPoint);
+        if (encodedPoint != NULL)
+                OPENSSL_free(encodedPoint);
         BN_CTX_free(bn_ctx);
 #endif
         EVP_MD_CTX_cleanup(&md_ctx);
-        return(-1);
-        }
+        return (-1);
+}
 
-int ssl3_send_certificate_request(SSL *s)
-        {
-        unsigned char *p,*d;
-        int i,j,nl,off,n;
-        STACK_OF(X509_NAME) *sk=NULL;
+int
+ssl3_send_certificate_request(SSL *s)
+{
+        unsigned char *p, *d;
+        int i, j, nl, off, n;
+        STACK_OF(X509_NAME) *sk = NULL;
         X509_NAME *name;
         BUF_MEM *buf;
 
-        if (s->state == SSL3_ST_SW_CERT_REQ_A)
-                {
-                buf=s->init_buf;
+        if (s->state == SSL3_ST_SW_CERT_REQ_A) {
+                buf = s->init_buf;
 
-                d=p=(unsigned char *)&(buf->data[4]);
+                d = p = (unsigned char *)&(buf->data[4]);
 
                 /* get the list of acceptable cert types */
                 p++;
-                n=ssl3_get_req_cert_type(s,p);
-                d[0]=n;
-                p+=n;
+                n = ssl3_get_req_cert_type(s, p);
+                d[0] = n;
+                p += n;
                 n++;
 
-                if (TLS1_get_version(s) >= TLS1_2_VERSION)
-                        {
+                if (TLS1_get_version(s) >= TLS1_2_VERSION) {
                         nl = tls12_get_req_sig_algs(s, p + 2);
                         s2n(nl, p);
                         p += nl + 2;
                         n += nl + 2;
-                        }
-
-                off=n;
-                p+=2;
-                n+=2;
+                }
 
-                sk=SSL_get_client_CA_list(s);
-                nl=0;
-                if (sk != NULL)
-                        {
-                        for (i=0; i<sk_X509_NAME_num(sk); i++)
-                                {
-                                name=sk_X509_NAME_value(sk,i);
-                                j=i2d_X509_NAME(name,NULL);
-                                if (!BUF_MEM_grow_clean(buf,4+n+j+2))
-                                        {
-                                        SSLerr(SSL_F_SSL3_SEND_CERTIFICATE_REQUEST,ERR_R_BUF_LIB);
+                off = n;
+                p += 2;
+                n += 2;
+
+                sk = SSL_get_client_CA_list(s);
+                nl = 0;
+                if (sk != NULL) {
+                        for (i = 0; i < sk_X509_NAME_num(sk); i++) {
+                                name = sk_X509_NAME_value(sk, i);
+                                j = i2d_X509_NAME(name, NULL);
+                                if (!BUF_MEM_grow_clean(buf, 4 + n + j + 2)) {
+                                        SSLerr(SSL_F_SSL3_SEND_CERTIFICATE_REQUEST, ERR_R_BUF_LIB);
                                         goto err;
-                                        }
-                                p=(unsigned char *)&(buf->data[4+n]);
-                                if (!(s->options & SSL_OP_NETSCAPE_CA_DN_BUG))
-                                        {
-                                        s2n(j,p);
-                                        i2d_X509_NAME(name,&p);
-                                        n+=2+j;
-                                        nl+=2+j;
-                                        }
-                                else
-                                        {
-                                        d=p;
-                                        i2d_X509_NAME(name,&p);
-                                        j-=2; s2n(j,d); j+=2;
-                                        n+=j;
-                                        nl+=j;
-                                        }
+                                }
+                                p = (unsigned char *)&(buf->data[4 + n]);
+                                if (!(s->options & SSL_OP_NETSCAPE_CA_DN_BUG)) {
+                                        s2n(j, p);
+                                        i2d_X509_NAME(name, &p);
+                                        n += 2 + j;
+                                        nl += 2 + j;
+                                } else {
+                                        d = p;
+                                        i2d_X509_NAME(name, &p);
+                                        j -= 2;
+                                        s2n(j, d);
+                                        j += 2;
+                                        n += j;
+                                        nl += j;
                                 }
                         }
+                }
                 /* else no CA names */
-                p=(unsigned char *)&(buf->data[4+off]);
-                s2n(nl,p);
+                p = (unsigned char *)&(buf->data[4 + off]);
+                s2n(nl, p);
 
-                d=(unsigned char *)buf->data;
-                *(d++)=SSL3_MT_CERTIFICATE_REQUEST;
-                l2n3(n,d);
+                d = (unsigned char *)buf->data;
+                *(d++) = SSL3_MT_CERTIFICATE_REQUEST;
+                l2n3(n, d);
 
                 /* we should now have things packed up, so lets send
                  * it off */
 
-                s->init_num=n+4;
-                s->init_off=0;
+                s->init_num = n + 4;
+                s->init_off = 0;
 #ifdef NETSCAPE_HANG_BUG
-                p=(unsigned char *)s->init_buf->data + s->init_num;
+                p = (unsigned char *)s->init_buf->data + s->init_num;
 
                 /* do the header */
-                *(p++)=SSL3_MT_SERVER_DONE;
-                *(p++)=0;
-                *(p++)=0;
-                *(p++)=0;
+                *(p++) = SSL3_MT_SERVER_DONE;
+                *(p++) = 0;
+                *(p++) = 0;
+                *(p++) = 0;
                 s->init_num += 4;
 #endif
 
                 s->state = SSL3_ST_SW_CERT_REQ_B;
-                }
+        }
 
         /* SSL3_ST_SW_CERT_REQ_B */
-        return(ssl3_do_write(s,SSL3_RT_HANDSHAKE));
+        return (ssl3_do_write(s, SSL3_RT_HANDSHAKE));
 err:
-        return(-1);
-        }
+        return (-1);
+}
 
-int ssl3_get_client_key_exchange(SSL *s)
-        {
-        int i,al,ok;
+int
+ssl3_get_client_key_exchange(SSL *s)
+{
+        int i, al, ok;
         long n;
         unsigned long alg_k;
         unsigned char *p;
 #ifndef OPENSSL_NO_RSA
-        RSA *rsa=NULL;
-        EVP_PKEY *pkey=NULL;
+        RSA *rsa = NULL;
+        EVP_PKEY *pkey = NULL;
 #endif
 #ifndef OPENSSL_NO_DH
-        BIGNUM *pub=NULL;
+        BIGNUM *pub = NULL;
         DH *dh_srvr;
 #endif
 #ifndef OPENSSL_NO_KRB5
@@ -2138,83 +2001,67 @@ int ssl3_get_client_key_exchange(SSL *s)
         EC_KEY *srvr_ecdh = NULL;
         EVP_PKEY *clnt_pub_pkey = NULL;
         EC_POINT *clnt_ecpoint = NULL;
-        BN_CTX *bn_ctx = NULL; 
-#endif
+        BN_CTX *bn_ctx = NULL;
 
-        n=s->method->ssl_get_message(s,
-                SSL3_ST_SR_KEY_EXCH_A,
-                SSL3_ST_SR_KEY_EXCH_B,
-                SSL3_MT_CLIENT_KEY_EXCHANGE,
-                2048, /* ??? */
-                &ok);
+#endif
 
-        if (!ok) return((int)n);
-        p=(unsigned char *)s->init_msg;
+        n = s->method->ssl_get_message(s, SSL3_ST_SR_KEY_EXCH_A,
+            SSL3_ST_SR_KEY_EXCH_B, SSL3_MT_CLIENT_KEY_EXCHANGE,
+            2048, /* ??? */ &ok);
+        if (!ok)
+                return ((int)n);
+        p = (unsigned char *)s->init_msg;
 
-        alg_k=s->s3->tmp.new_cipher->algorithm_mkey;
+        alg_k = s->s3->tmp.new_cipher->algorithm_mkey;
 
 #ifndef OPENSSL_NO_RSA
-        if (alg_k & SSL_kRSA)
-                {
+        if (alg_k & SSL_kRSA) {
                 /* FIX THIS UP EAY EAY EAY EAY */
-                if (s->s3->tmp.use_rsa_tmp)
-                        {
+                if (s->s3->tmp.use_rsa_tmp) {
                         if ((s->cert != NULL) && (s->cert->rsa_tmp != NULL))
-                                rsa=s->cert->rsa_tmp;
+                                rsa = s->cert->rsa_tmp;
                         /* Don't do a callback because rsa_tmp should
                          * be sent already */
-                        if (rsa == NULL)
-                                {
-                                al=SSL_AD_HANDSHAKE_FAILURE;
-                                SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,SSL_R_MISSING_TMP_RSA_PKEY);
+                        if (rsa == NULL) {
+                                al = SSL_AD_HANDSHAKE_FAILURE;
+                                SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE, SSL_R_MISSING_TMP_RSA_PKEY);
                                 goto f_err;
 
-                                }
                         }
-                else
-                        {
-                        pkey=s->cert->pkeys[SSL_PKEY_RSA_ENC].privatekey;
-                        if (    (pkey == NULL) ||
-                                (pkey->type != EVP_PKEY_RSA) ||
-                                (pkey->pkey.rsa == NULL))
-                                {
-                                al=SSL_AD_HANDSHAKE_FAILURE;
-                                SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,SSL_R_MISSING_RSA_CERTIFICATE);
+                } else {
+                        pkey = s->cert->pkeys[SSL_PKEY_RSA_ENC].privatekey;
+                        if ((pkey == NULL) || (pkey->type != EVP_PKEY_RSA) ||
+                            (pkey->pkey.rsa == NULL)) {
+                                al = SSL_AD_HANDSHAKE_FAILURE;
+                                SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE, SSL_R_MISSING_RSA_CERTIFICATE);
                                 goto f_err;
-                                }
-                        rsa=pkey->pkey.rsa;
                         }
+                        rsa = pkey->pkey.rsa;
+                }
 
                 /* TLS and [incidentally] DTLS{0xFEFF} */
-                if (s->version > SSL3_VERSION && s->version != DTLS1_BAD_VER)
-                        {
-                        n2s(p,i);
-                        if (n != i+2)
-                                {
-                                if (!(s->options & SSL_OP_TLS_D5_BUG))
-                                        {
-                                        SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,SSL_R_TLS_RSA_ENCRYPTED_VALUE_LENGTH_IS_WRONG);
+                if (s->version > SSL3_VERSION && s->version != DTLS1_BAD_VER) {
+                        n2s(p, i);
+                        if (n != i + 2) {
+                                if (!(s->options & SSL_OP_TLS_D5_BUG)) {
+                                        SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE, SSL_R_TLS_RSA_ENCRYPTED_VALUE_LENGTH_IS_WRONG);
                                         goto err;
-                                        }
-                                else
-                                        p-=2;
-                                }
-                        else
-                                n=i;
-                        }
+                                } else
+                                        p -= 2;
+                        } else
+                                n = i;
+                }
 
-                i=RSA_private_decrypt((int)n,p,p,rsa,RSA_PKCS1_PADDING);
+                i = RSA_private_decrypt((int)n, p, p, rsa, RSA_PKCS1_PADDING);
 
                 al = -1;
-                
-                if (i != SSL_MAX_MASTER_KEY_LENGTH)
-                        {
-                        al=SSL_AD_DECODE_ERROR;
+
+                if (i != SSL_MAX_MASTER_KEY_LENGTH) {
+                        al = SSL_AD_DECODE_ERROR;
                         /* SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,SSL_R_BAD_RSA_DECRYPT); */
-                        }
+                }
 
-                if ((al == -1) && !((p[0] == (s->client_version>>8)) && (p[1] == (s->client_version & 0xff))))
-                        {
+                if ((al == -1) && !((p[0] == (s->client_version >> 8)) && (p[1] == (s->client_version & 0xff)))) {
                         /* The premaster secret must contain the same version number as the
                          * ClientHello to detect version rollback attacks (strangely, the
                          * protocol does not offer such protection for DH ciphersuites).
@@ -2223,9 +2070,8 @@ int ssl3_get_client_key_exchange(SSL *s)
                          * protocol version.
                          * If SSL_OP_TLS_ROLLBACK_BUG is set, tolerate such clients. */
                         if (!((s->options & SSL_OP_TLS_ROLLBACK_BUG) &&
-                                (p[0] == (s->version>>8)) && (p[1] == (s->version & 0xff))))
-                                {
-                                al=SSL_AD_DECODE_ERROR;
+                                (p[0] == (s->version >> 8)) && (p[1] == (s->version & 0xff)))) {
+                                al = SSL_AD_DECODE_ERROR;
                                 /* SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,SSL_R_BAD_PROTOCOL_VERSION_NUMBER); */
 
                                 /* The Klima-Pokorny-Rosa extension of Bleichenbacher's attack
@@ -2235,11 +2081,10 @@ int ssl3_get_client_key_exchange(SSL *s)
                                  * made up by the adversary is properly formatted except
                                  * that the version number is wrong.  To avoid such attacks,
                                  * we should treat this just like any other decryption error. */
-                                }
                         }
+                }
 
-                if (al != -1)
-                        {
+                if (al != -1) {
                         /* Some decryption failure -- use random value instead as countermeasure
                          * against Bleichenbacher's attack on PKCS #1 v1.5 RSA padding
                          * (see RFC 2246, section 7.4.7.1). */
@@ -2249,83 +2094,69 @@ int ssl3_get_client_key_exchange(SSL *s)
                         p[1] = s->client_version & 0xff;
                         if (RAND_pseudo_bytes(p+2, i-2) <= 0) /* should be RAND_bytes, but we cannot work around a failure */
                                 goto err;
-                        }
-        
-                s->session->master_key_length=
-                        s->method->ssl3_enc->generate_master_secret(s,
-                                s->session->master_key,
-                                p,i);
-                OPENSSL_cleanse(p,i);
                 }
-        else
+
+                s->session->master_key_length =
+                s->method->ssl3_enc->generate_master_secret(s,
+                s->session->master_key,
+                p, i);
+                OPENSSL_cleanse(p, i);
+        } else
 #endif
 #ifndef OPENSSL_NO_DH
-                if (alg_k & (SSL_kEDH|SSL_kDHr|SSL_kDHd))
-                {
-                n2s(p,i);
-                if (n != i+2)
-                        {
-                        if (!(s->options & SSL_OP_SSLEAY_080_CLIENT_DH_BUG))
-                                {
-                                SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,SSL_R_DH_PUBLIC_VALUE_LENGTH_IS_WRONG);
+        if (alg_k & (SSL_kEDH|SSL_kDHr|SSL_kDHd)) {
+                n2s(p, i);
+                if (n != i + 2) {
+                        if (!(s->options & SSL_OP_SSLEAY_080_CLIENT_DH_BUG)) {
+                                SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE, SSL_R_DH_PUBLIC_VALUE_LENGTH_IS_WRONG);
                                 goto err;
-                                }
-                        else
-                                {
-                                p-=2;
-                                i=(int)n;
-                                }
+                        } else {
+                                p -= 2;
+                                i = (int)n;
                         }
+                }
 
                 if (n == 0L) /* the parameters are in the cert */
-                        {
-                        al=SSL_AD_HANDSHAKE_FAILURE;
-                        SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,SSL_R_UNABLE_TO_DECODE_DH_CERTS);
+                {
+                        al = SSL_AD_HANDSHAKE_FAILURE;
+                        SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE, SSL_R_UNABLE_TO_DECODE_DH_CERTS);
                         goto f_err;
-                        }
-                else
-                        {
-                        if (s->s3->tmp.dh == NULL)
-                                {
-                                al=SSL_AD_HANDSHAKE_FAILURE;
-                                SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,SSL_R_MISSING_TMP_DH_KEY);
+                } else {
+                        if (s->s3->tmp.dh == NULL) {
+                                al = SSL_AD_HANDSHAKE_FAILURE;
+                                SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE, SSL_R_MISSING_TMP_DH_KEY);
                                 goto f_err;
-                                }
-                        else
-                                dh_srvr=s->s3->tmp.dh;
-                        }
+                        } else
+                                dh_srvr = s->s3->tmp.dh;
+                }
 
-                pub=BN_bin2bn(p,i,NULL);
-                if (pub == NULL)
-                        {
-                        SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,SSL_R_BN_LIB);
+                pub = BN_bin2bn(p, i, NULL);
+                if (pub == NULL) {
+                        SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE, SSL_R_BN_LIB);
                         goto err;
-                        }
+                }
 
-                i=DH_compute_key(p,pub,dh_srvr);
+                i = DH_compute_key(p, pub, dh_srvr);
 
-                if (i <= 0)
-                        {
-                        SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,ERR_R_DH_LIB);
+                if (i <= 0) {
+                        SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE, ERR_R_DH_LIB);
                         BN_clear_free(pub);
                         goto err;
-                        }
+                }
 
                 DH_free(s->s3->tmp.dh);
-                s->s3->tmp.dh=NULL;
+                s->s3->tmp.dh = NULL;
 
                 BN_clear_free(pub);
-                pub=NULL;
-                s->session->master_key_length=
-                        s->method->ssl3_enc->generate_master_secret(s,
-                                s->session->master_key,p,i);
-                OPENSSL_cleanse(p,i);
-                }
-        else
+                pub = NULL;
+                s->session->master_key_length =
+                    s->method->ssl3_enc->generate_master_secret(
+                        s, s->session->master_key, p, i);
+                OPENSSL_cleanse(p, i);
+        } else
 #endif
 #ifndef OPENSSL_NO_KRB5
-        if (alg_k & SSL_kKRB5)
-                {
+        if (alg_k & SSL_kKRB5) {
                 krb5_error_code         krb5rc;
                 krb5_data               enc_ticket;
                 krb5_data               authenticator;
@@ -2335,100 +2166,94 @@ int ssl3_get_client_key_exchange(SSL *s)
                 const EVP_CIPHER        *enc = NULL;
                 unsigned char           iv[EVP_MAX_IV_LENGTH];
                 unsigned char           pms[SSL_MAX_MASTER_KEY_LENGTH
-                                               + EVP_MAX_BLOCK_LENGTH];
+                + EVP_MAX_BLOCK_LENGTH];
                 int                  padl, outl;
                 krb5_timestamp          authtime = 0;
                 krb5_ticket_times       ttimes;
 
                 EVP_CIPHER_CTX_init(&ciph_ctx);
 
-                if (!kssl_ctx)  kssl_ctx = kssl_ctx_new();
+                if (!kssl_ctx)
+                        kssl_ctx = kssl_ctx_new();
 
-                n2s(p,i);
+                n2s(p, i);
                 enc_ticket.length = i;
 
-                if (n < (long)(enc_ticket.length + 6))
-                        {
+                if (n < (long)(enc_ticket.length + 6)) {
                         SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,
-                                SSL_R_DATA_LENGTH_TOO_LONG);
+                        SSL_R_DATA_LENGTH_TOO_LONG);
                         goto err;
-                        }
+                }
 
                 enc_ticket.data = (char *)p;
-                p+=enc_ticket.length;
+                p += enc_ticket.length;
 
-                n2s(p,i);
+                n2s(p, i);
                 authenticator.length = i;
 
-                if (n < (long)(enc_ticket.length + authenticator.length + 6))
-                        {
+                if (n < (long)(enc_ticket.length + authenticator.length + 6)) {
                         SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,
-                                SSL_R_DATA_LENGTH_TOO_LONG);
+                        SSL_R_DATA_LENGTH_TOO_LONG);
                         goto err;
-                        }
+                }
 
                 authenticator.data = (char *)p;
-                p+=authenticator.length;
+                p += authenticator.length;
 
-                n2s(p,i);
+                n2s(p, i);
                 enc_pms.length = i;
                 enc_pms.data = (char *)p;
-                p+=enc_pms.length;
+                p += enc_pms.length;
 
                 /* Note that the length is checked again below,
                 ** after decryption
                 */
-                if(enc_pms.length > sizeof pms)
-                        {
+                if (enc_pms.length > sizeof pms) {
                         SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,
-                               SSL_R_DATA_LENGTH_TOO_LONG);
+                        SSL_R_DATA_LENGTH_TOO_LONG);
                         goto err;
-                        }
+                }
 
                 if (n != (long)(enc_ticket.length + authenticator.length +
-                                                enc_pms.length + 6))
-                        {
+                    enc_pms.length + 6)) {
                         SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,
-                                SSL_R_DATA_LENGTH_TOO_LONG);
+                        SSL_R_DATA_LENGTH_TOO_LONG);
                         goto err;
-                        }
+                }
 
                 if ((krb5rc = kssl_sget_tkt(kssl_ctx, &enc_ticket, &ttimes,
-                                        &kssl_err)) != 0)
-                        {
+                    &kssl_err)) != 0) {
 #ifdef KSSL_DEBUG
                         printf("kssl_sget_tkt rtn %d [%d]\n",
-                                krb5rc, kssl_err.reason);
+                        krb5rc, kssl_err.reason);
                         if (kssl_err.text)
                                 printf("kssl_err text= %s\n", kssl_err.text);
 #endif  /* KSSL_DEBUG */
                         SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,
-                                kssl_err.reason);
+                        kssl_err.reason);
                         goto err;
-                        }
+                }
 
                 /*  Note: no authenticator is not considered an error,
                 **  but will return authtime == 0.
                 */
                 if ((krb5rc = kssl_check_authent(kssl_ctx, &authenticator,
-                                        &authtime, &kssl_err)) != 0)
-                        {
+                    &authtime, &kssl_err)) != 0) {
 #ifdef KSSL_DEBUG
                         printf("kssl_check_authent rtn %d [%d]\n",
-                                krb5rc, kssl_err.reason);
+                        krb5rc, kssl_err.reason);
                         if (kssl_err.text)
                                 printf("kssl_err text= %s\n", kssl_err.text);
 #endif  /* KSSL_DEBUG */
                         SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,
-                                kssl_err.reason);
+                        kssl_err.reason);
                         goto err;
-                        }
+                }
 
-                if ((krb5rc = kssl_validate_times(authtime, &ttimes)) != 0)
-                        {
+                if ((krb5rc = kssl_validate_times(authtime, &ttimes)) != 0) {
                         SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE, krb5rc);
                         goto err;
-                        }
+                }
 
 #ifdef KSSL_DEBUG
                 kssl_ctx_show(kssl_ctx);
@@ -2436,44 +2261,38 @@ int ssl3_get_client_key_exchange(SSL *s)
 
                 enc = kssl_map_enc(kssl_ctx->enctype);
                 if (enc == NULL)
-                    goto err;
+                        goto err;
 
                 memset(iv, 0, sizeof iv);       /* per RFC 1510 */
 
-                if (!EVP_DecryptInit_ex(&ciph_ctx,enc,NULL,kssl_ctx->key,iv))
-                        {
+                if (!EVP_DecryptInit_ex(&ciph_ctx, enc, NULL, kssl_ctx->key, iv)) {
                         SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,
-                                SSL_R_DECRYPTION_FAILED);
+                        SSL_R_DECRYPTION_FAILED);
                         goto err;
-                        }
-                if (!EVP_DecryptUpdate(&ciph_ctx, pms,&outl,
-                                        (unsigned char *)enc_pms.data, enc_pms.length))
-                        {
+                }
+                if (!EVP_DecryptUpdate(&ciph_ctx, pms, &outl,
+                    (unsigned char *)enc_pms.data, enc_pms.length)) {
                         SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,
-                                SSL_R_DECRYPTION_FAILED);
+                        SSL_R_DECRYPTION_FAILED);
                         goto err;
-                        }
-                if (outl > SSL_MAX_MASTER_KEY_LENGTH)
-                        {
+                }
+                if (outl > SSL_MAX_MASTER_KEY_LENGTH) {
                         SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,
-                                SSL_R_DATA_LENGTH_TOO_LONG);
+                        SSL_R_DATA_LENGTH_TOO_LONG);
                         goto err;
-                        }
-                if (!EVP_DecryptFinal_ex(&ciph_ctx,&(pms[outl]),&padl))
-                        {
+                }
+                if (!EVP_DecryptFinal_ex(&ciph_ctx, &(pms[outl]), &padl)) {
                         SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,
-                                SSL_R_DECRYPTION_FAILED);
+                        SSL_R_DECRYPTION_FAILED);
                         goto err;
-                        }
+                }
                 outl += padl;
-                if (outl > SSL_MAX_MASTER_KEY_LENGTH)
-                        {
+                if (outl > SSL_MAX_MASTER_KEY_LENGTH) {
                         SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,
-                                SSL_R_DATA_LENGTH_TOO_LONG);
+                        SSL_R_DATA_LENGTH_TOO_LONG);
                         goto err;
-                        }
-                if (!((pms[0] == (s->client_version>>8)) && (pms[1] == (s->client_version & 0xff))))
-                    {
+                }
+                if (!((pms[0] == (s->client_version >> 8)) && (pms[1] == (s->client_version & 0xff)))) {
                     /* The premaster secret must contain the same version number as the
                      * ClientHello to detect version rollback attacks (strangely, the
                      * protocol does not offer such protection for DH ciphersuites).
@@ -2482,29 +2301,26 @@ int ssl3_get_client_key_exchange(SSL *s)
                      * If SSL_OP_TLS_ROLLBACK_BUG is set, tolerate such clients. 
                      * (Perhaps we should have a separate BUG value for the Kerberos cipher)
                      */
-                    if (!(s->options & SSL_OP_TLS_ROLLBACK_BUG))
-                        {
-                        SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,
-                               SSL_AD_DECODE_ERROR);
-                        goto err;
+                        if (!(s->options & SSL_OP_TLS_ROLLBACK_BUG)) {
+                                SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,
+                                SSL_AD_DECODE_ERROR);
+                                goto err;
                         }
-                    }
+                }
 
                 EVP_CIPHER_CTX_cleanup(&ciph_ctx);
 
-                s->session->master_key_length=
-                        s->method->ssl3_enc->generate_master_secret(s,
-                                s->session->master_key, pms, outl);
+                s->session->master_key_length =
+                s->method->ssl3_enc->generate_master_secret(s,
+                s->session->master_key, pms, outl);
 
-                if (kssl_ctx->client_princ)
-                        {
+                if (kssl_ctx->client_princ) {
                         size_t len = strlen(kssl_ctx->client_princ);
-                        if ( len < SSL_MAX_KRB5_PRINCIPAL_LENGTH ) 
-                                {
+                        if (len < SSL_MAX_KRB5_PRINCIPAL_LENGTH ) {
                                 s->session->krb5_client_princ_len = len;
-                                memcpy(s->session->krb5_client_princ,kssl_ctx->client_princ,len);
-                                }
+                                memcpy(s->session->krb5_client_princ, kssl_ctx->client_princ, len);
                         }
+                }
 
 
                 /*  Was doing kssl_ctx_free() here,
@@ -2512,13 +2328,11 @@ int ssl3_get_client_key_exchange(SSL *s)
                 **  kssl_ctx = kssl_ctx_free(kssl_ctx);
                 **  if (s->kssl_ctx)  s->kssl_ctx = NULL;
                 */
-                }
-        else
+        } else
 #endif  /* OPENSSL_NO_KRB5 */
 
 #ifndef OPENSSL_NO_ECDH
-                if (alg_k & (SSL_kEECDH|SSL_kECDHr|SSL_kECDHe))
-                {
+        if (alg_k & (SSL_kEECDH|SSL_kECDHr|SSL_kECDHe)) {
                 int ret = 1;
                 int field_size = 0;
                 const EC_KEY   *tkey;
@@ -2526,60 +2340,51 @@ int ssl3_get_client_key_exchange(SSL *s)
                 const BIGNUM *priv_key;
 
                 /* initialize structures for server's ECDH key pair */
-                if ((srvr_ecdh = EC_KEY_new()) == NULL) 
-                        {
+                if ((srvr_ecdh = EC_KEY_new()) == NULL) {
                         SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,
-                            ERR_R_MALLOC_FAILURE);
+                        ERR_R_MALLOC_FAILURE);
                         goto err;
-                        }
+                }
 
                 /* Let's get server private key and group information */
-                if (alg_k & (SSL_kECDHr|SSL_kECDHe))
-                        { 
+                if (alg_k & (SSL_kECDHr|SSL_kECDHe)) {
                         /* use the certificate */
                         tkey = s->cert->pkeys[SSL_PKEY_ECC].privatekey->pkey.ec;
-                        }
-                else
-                        {
+                } else {
                         /* use the ephermeral values we saved when
                          * generating the ServerKeyExchange msg.
                          */
                         tkey = s->s3->tmp.ecdh;
-                        }
+                }
 
-                group    = EC_KEY_get0_group(tkey);
+                group = EC_KEY_get0_group(tkey);
                 priv_key = EC_KEY_get0_private_key(tkey);
 
                 if (!EC_KEY_set_group(srvr_ecdh, group) ||
-                    !EC_KEY_set_private_key(srvr_ecdh, priv_key))
-                        {
+                        !EC_KEY_set_private_key(srvr_ecdh, priv_key)) {
                         SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,
-                               ERR_R_EC_LIB);
+                        ERR_R_EC_LIB);
                         goto err;
-                        }
+                }
 
                 /* Let's get client's public key */
-                if ((clnt_ecpoint = EC_POINT_new(group)) == NULL)
-                        {
+                if ((clnt_ecpoint = EC_POINT_new(group)) == NULL) {
                         SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,
-                            ERR_R_MALLOC_FAILURE);
+                        ERR_R_MALLOC_FAILURE);
                         goto err;
-                        }
+                }
 
-                if (n == 0L) 
-                        {
+                if (n == 0L) {
                         /* Client Publickey was in Client Certificate */
 
-                         if (alg_k & SSL_kEECDH)
-                                 {
-                                 al=SSL_AD_HANDSHAKE_FAILURE;
-                                 SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,SSL_R_MISSING_TMP_ECDH_KEY);
-                                 goto f_err;
-                                 }
-                        if (((clnt_pub_pkey=X509_get_pubkey(s->session->peer))
-                            == NULL) || 
-                            (clnt_pub_pkey->type != EVP_PKEY_EC))
-                                {
+                        if (alg_k & SSL_kEECDH) {
+                                al = SSL_AD_HANDSHAKE_FAILURE;
+                                SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE, SSL_R_MISSING_TMP_ECDH_KEY);
+                                goto f_err;
+                        }
+                        if (((clnt_pub_pkey = X509_get_pubkey(
+                            s->session->peer)) == NULL) ||
+                            (clnt_pub_pkey->type != EVP_PKEY_EC)) {
                                 /* XXX: For now, we do not support client
                                  * authentication using ECDH certificates
                                  * so this branch (n == 0L) of the code is
@@ -2591,771 +2396,680 @@ int ssl3_get_client_key_exchange(SSL *s)
                                  * the two ECDH shares are for the same
                                  * group.
                                  */
-                                al=SSL_AD_HANDSHAKE_FAILURE;
-                                SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,
-                                    SSL_R_UNABLE_TO_DECODE_ECDH_CERTS);
-                                goto f_err;
-                                }
+                                al = SSL_AD_HANDSHAKE_FAILURE;
+                                SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,
+                                SSL_R_UNABLE_TO_DECODE_ECDH_CERTS);
+                                goto f_err;
+                        }
 
                         if (EC_POINT_copy(clnt_ecpoint,
-                            EC_KEY_get0_public_key(clnt_pub_pkey->pkey.ec)) == 0)
-                                {
+                                EC_KEY_get0_public_key(clnt_pub_pkey->pkey.ec)) == 0) {
                                 SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,
-                                        ERR_R_EC_LIB);
+                                ERR_R_EC_LIB);
                                 goto err;
-                                }
-                        ret = 2; /* Skip certificate verify processing */
                         }
-                else
-                        {
+                        ret = 2; /* Skip certificate verify processing */
+                } else {
                         /* Get client's public key from encoded point
                          * in the ClientKeyExchange message.
                          */
-                        if ((bn_ctx = BN_CTX_new()) == NULL)
-                                {
+                        if ((bn_ctx = BN_CTX_new()) == NULL) {
                                 SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,
-                                    ERR_R_MALLOC_FAILURE);
+                                ERR_R_MALLOC_FAILURE);
                                 goto err;
-                                }
+                        }
 
                         /* Get encoded point length */
-                        i = *p; 
+                        i = *p;
+
                         p += 1;
-                        if (n != 1 + i)
-                                {
+                        if (n != 1 + i) {
                                 SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,
-                                    ERR_R_EC_LIB);
+                                ERR_R_EC_LIB);
                                 goto err;
-                                }
-                        if (EC_POINT_oct2point(group, 
-                            clnt_ecpoint, p, i, bn_ctx) == 0)
-                                {
+                        }
+                        if (EC_POINT_oct2point(group,
+                                clnt_ecpoint, p, i, bn_ctx) == 0) {
                                 SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,
-                                    ERR_R_EC_LIB);
+                                ERR_R_EC_LIB);
                                 goto err;
-                                }
+                        }
                         /* p is pointing to somewhere in the buffer
                          * currently, so set it to the start 
                          */ 
-                        p=(unsigned char *)s->init_buf->data;
-                        }
+                        p = (unsigned char *)s->init_buf->data;
+                }
 
                 /* Compute the shared pre-master secret */
                 field_size = EC_GROUP_get_degree(group);
-                if (field_size <= 0)
-                        {
-                        SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE, 
-                               ERR_R_ECDH_LIB);
+                if (field_size <= 0) {
+                        SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,
+                        ERR_R_ECDH_LIB);
                         goto err;
-                        }
-                i = ECDH_compute_key(p, (field_size+7)/8, clnt_ecpoint, srvr_ecdh, NULL);
-                if (i <= 0)
-                        {
+                }
+                i = ECDH_compute_key(p, (field_size + 7)/8, clnt_ecpoint, srvr_ecdh, NULL);
+                if (i <= 0) {
                         SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,
-                            ERR_R_ECDH_LIB);
+                        ERR_R_ECDH_LIB);
                         goto err;
-                        }
+                }
 
                 EVP_PKEY_free(clnt_pub_pkey);
                 EC_POINT_free(clnt_ecpoint);
                 EC_KEY_free(srvr_ecdh);
                 BN_CTX_free(bn_ctx);
                 EC_KEY_free(s->s3->tmp.ecdh);
-                s->s3->tmp.ecdh = NULL; 
+                s->s3->tmp.ecdh = NULL;
+
 
                 /* Compute the master secret */
                 s->session->master_key_length = s->method->ssl3_enc-> \
                     generate_master_secret(s, s->session->master_key, p, i);
-                
+
                 OPENSSL_cleanse(p, i);
                 return (ret);
-                }
-        else
+        } else
 #endif
 #ifndef OPENSSL_NO_PSK
-                if (alg_k & SSL_kPSK)
-                        {
-                        unsigned char *t = NULL;
-                        unsigned char psk_or_pre_ms[PSK_MAX_PSK_LEN*2+4];
-                        unsigned int pre_ms_len = 0, psk_len = 0;
-                        int psk_err = 1;
-                        char tmp_id[PSK_MAX_IDENTITY_LEN+1];
+        if (alg_k & SSL_kPSK) {
+                unsigned char *t = NULL;
+                unsigned char psk_or_pre_ms[PSK_MAX_PSK_LEN*2 + 4];
+                unsigned int pre_ms_len = 0, psk_len = 0;
+                int psk_err = 1;
+                char tmp_id[PSK_MAX_IDENTITY_LEN + 1];
 
-                        al=SSL_AD_HANDSHAKE_FAILURE;
-
-                        n2s(p,i);
-                        if (n != i+2)
-                                {
-                                SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,
-                                        SSL_R_LENGTH_MISMATCH);
-                                goto psk_err;
-                                }
-                        if (i > PSK_MAX_IDENTITY_LEN)
-                                {
-                                SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,
-                                        SSL_R_DATA_LENGTH_TOO_LONG);
-                                goto psk_err;
-                                }
-                        if (s->psk_server_callback == NULL)
-                                {
-                                SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,
-                                       SSL_R_PSK_NO_SERVER_CB);
-                                goto psk_err;
-                                }
+                al = SSL_AD_HANDSHAKE_FAILURE;
 
-                        /* Create guaranteed NULL-terminated identity
-                         * string for the callback */
-                        memcpy(tmp_id, p, i);
-                        memset(tmp_id+i, 0, PSK_MAX_IDENTITY_LEN+1-i);
-                        psk_len = s->psk_server_callback(s, tmp_id,
-                                psk_or_pre_ms, sizeof(psk_or_pre_ms));
-                        OPENSSL_cleanse(tmp_id, PSK_MAX_IDENTITY_LEN+1);
+                n2s(p, i);
+                if (n != i + 2) {
+                        SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,
+                        SSL_R_LENGTH_MISMATCH);
+                        goto psk_err;
+                }
+                if (i > PSK_MAX_IDENTITY_LEN) {
+                        SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,
+                        SSL_R_DATA_LENGTH_TOO_LONG);
+                        goto psk_err;
+                }
+                if (s->psk_server_callback == NULL) {
+                        SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,
+                        SSL_R_PSK_NO_SERVER_CB);
+                        goto psk_err;
+                }
 
-                        if (psk_len > PSK_MAX_PSK_LEN)
-                                {
-                                SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,
-                                        ERR_R_INTERNAL_ERROR);
-                                goto psk_err;
-                                }
-                        else if (psk_len == 0)
-                                {
-                                /* PSK related to the given identity not found */
-                                SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,
-                                       SSL_R_PSK_IDENTITY_NOT_FOUND);
-                                al=SSL_AD_UNKNOWN_PSK_IDENTITY;
-                                goto psk_err;
-                                }
+                /* Create guaranteed NULL-terminated identity
+                 * string for the callback */
+                memcpy(tmp_id, p, i);
+                memset(tmp_id + i, 0, PSK_MAX_IDENTITY_LEN + 1 - i);
+                psk_len = s->psk_server_callback(s, tmp_id,
+                psk_or_pre_ms, sizeof(psk_or_pre_ms));
+                OPENSSL_cleanse(tmp_id, PSK_MAX_IDENTITY_LEN + 1);
 
-                        /* create PSK pre_master_secret */
-                        pre_ms_len=2+psk_len+2+psk_len;
-                        t = psk_or_pre_ms;
-                        memmove(psk_or_pre_ms+psk_len+4, psk_or_pre_ms, psk_len);
-                        s2n(psk_len, t);
-                        memset(t, 0, psk_len);
-                        t+=psk_len;
-                        s2n(psk_len, t);
-
-                        if (s->session->psk_identity != NULL)
-                                OPENSSL_free(s->session->psk_identity);
-                        s->session->psk_identity = BUF_strdup((char *)p);
-                        if (s->session->psk_identity == NULL)
-                                {
-                                SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,
-                                        ERR_R_MALLOC_FAILURE);
-                                goto psk_err;
-                                }
+                if (psk_len > PSK_MAX_PSK_LEN) {
+                        SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,
+                        ERR_R_INTERNAL_ERROR);
+                        goto psk_err;
+                } else if (psk_len == 0) {
+                        /* PSK related to the given identity not found */
+                        SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,
+                        SSL_R_PSK_IDENTITY_NOT_FOUND);
+                        al = SSL_AD_UNKNOWN_PSK_IDENTITY;
+                        goto psk_err;
+                }
+
+                /* create PSK pre_master_secret */
+                pre_ms_len = 2 + psk_len + 2 + psk_len;
+                t = psk_or_pre_ms;
+                memmove(psk_or_pre_ms + psk_len + 4, psk_or_pre_ms, psk_len);
+                s2n(psk_len, t);
+                memset(t, 0, psk_len);
+                t += psk_len;
+                s2n(psk_len, t);
+
+                if (s->session->psk_identity != NULL)
+                        OPENSSL_free(s->session->psk_identity);
+                s->session->psk_identity = BUF_strdup((char *)p);
+                if (s->session->psk_identity == NULL) {
+                        SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,
+                        ERR_R_MALLOC_FAILURE);
+                        goto psk_err;
+                }
 
-                        if (s->session->psk_identity_hint != NULL)
-                                OPENSSL_free(s->session->psk_identity_hint);
-                        s->session->psk_identity_hint = BUF_strdup(s->ctx->psk_identity_hint);
-                        if (s->ctx->psk_identity_hint != NULL &&
-                                s->session->psk_identity_hint == NULL)
-                                {
-                                SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,
-                                        ERR_R_MALLOC_FAILURE);
-                                goto psk_err;
-                                }
+                if (s->session->psk_identity_hint != NULL)
+                        OPENSSL_free(s->session->psk_identity_hint);
+                s->session->psk_identity_hint = BUF_strdup(s->ctx->psk_identity_hint);
+                if (s->ctx->psk_identity_hint != NULL &&
+                        s->session->psk_identity_hint == NULL) {
+                        SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,
+                        ERR_R_MALLOC_FAILURE);
+                        goto psk_err;
+                }
 
-                        s->session->master_key_length=
-                                s->method->ssl3_enc->generate_master_secret(s,
-                                        s->session->master_key, psk_or_pre_ms, pre_ms_len);
-                        psk_err = 0;
+                s->session->master_key_length =
+                    s->method->ssl3_enc->generate_master_secret(
+                        s, s->session->master_key, psk_or_pre_ms, pre_ms_len);
+                psk_err = 0;
                 psk_err:
-                        OPENSSL_cleanse(psk_or_pre_ms, sizeof(psk_or_pre_ms));
-                        if (psk_err != 0)
-                                goto f_err;
-                        }
-                else
+                OPENSSL_cleanse(psk_or_pre_ms, sizeof(psk_or_pre_ms));
+                if (psk_err != 0)
+                        goto f_err;
+        } else
 #endif
 #ifndef OPENSSL_NO_SRP
-                if (alg_k & SSL_kSRP)
-                        {
-                        int param_len;
-
-                        n2s(p,i);
-                        param_len=i+2;
-                        if (param_len > n)
-                                {
-                                al=SSL_AD_DECODE_ERROR;
-                                SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,SSL_R_BAD_SRP_A_LENGTH);
-                                goto f_err;
-                                }
-                        if (!(s->srp_ctx.A=BN_bin2bn(p,i,NULL)))
-                                {
-                                SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,ERR_R_BN_LIB);
-                                goto err;
-                                }
-                        if (s->session->srp_username != NULL)
-                                OPENSSL_free(s->session->srp_username);
-                        s->session->srp_username = BUF_strdup(s->srp_ctx.login);
-                        if (s->session->srp_username == NULL)
-                                {
-                                SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,
-                                        ERR_R_MALLOC_FAILURE);
-                                goto err;
-                                }
+        if (alg_k & SSL_kSRP) {
+                int param_len;
 
-                        if ((s->session->master_key_length = SRP_generate_server_master_secret(s,s->session->master_key))<0)
-                                {
-                                SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,ERR_R_INTERNAL_ERROR);
-                                goto err;
-                                }
+                n2s(p, i);
+                param_len = i + 2;
+                if (param_len > n) {
+                        al = SSL_AD_DECODE_ERROR;
+                        SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE, SSL_R_BAD_SRP_A_LENGTH);
+                        goto f_err;
+                }
+                if (!(s->srp_ctx.A = BN_bin2bn(p, i, NULL))) {
+                        SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE, ERR_R_BN_LIB);
+                        goto err;
+                }
+                if (s->session->srp_username != NULL)
+                        OPENSSL_free(s->session->srp_username);
+                s->session->srp_username = BUF_strdup(s->srp_ctx.login);
+                if (s->session->srp_username == NULL) {
+                        SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,
+                        ERR_R_MALLOC_FAILURE);
+                        goto err;
+                }
 
-                        p+=i;
-                        }
-                else
+                if ((s->session->master_key_length = SRP_generate_server_master_secret(s, s->session->master_key)) < 0) {
+                        SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE, ERR_R_INTERNAL_ERROR);
+                        goto err;
+                }
+
+                p += i;
+        } else
 #endif  /* OPENSSL_NO_SRP */
-                if (alg_k & SSL_kGOST) 
-                        {
-                        int ret = 0;
-                        EVP_PKEY_CTX *pkey_ctx;
-                        EVP_PKEY *client_pub_pkey = NULL, *pk = NULL;
-                        unsigned char premaster_secret[32], *start;
-                        size_t outlen=32, inlen;
-                        unsigned long alg_a;
-
-                        /* Get our certificate private key*/
-                        alg_a = s->s3->tmp.new_cipher->algorithm_auth;
-                        if (alg_a & SSL_aGOST94)
-                                pk = s->cert->pkeys[SSL_PKEY_GOST94].privatekey;
-                        else if (alg_a & SSL_aGOST01)
-                                pk = s->cert->pkeys[SSL_PKEY_GOST01].privatekey;
-
-                        pkey_ctx = EVP_PKEY_CTX_new(pk,NULL);
-                        EVP_PKEY_decrypt_init(pkey_ctx);
+        if (alg_k & SSL_kGOST) {
+                int ret = 0;
+                EVP_PKEY_CTX *pkey_ctx;
+                EVP_PKEY *client_pub_pkey = NULL, *pk = NULL;
+                unsigned char premaster_secret[32], *start;
+                size_t outlen = 32, inlen;
+                unsigned long alg_a;
+
+                /* Get our certificate private key*/
+                alg_a = s->s3->tmp.new_cipher->algorithm_auth;
+                if (alg_a & SSL_aGOST94)
+                        pk = s->cert->pkeys[SSL_PKEY_GOST94].privatekey;
+                else if (alg_a & SSL_aGOST01)
+                        pk = s->cert->pkeys[SSL_PKEY_GOST01].privatekey;
+
+                pkey_ctx = EVP_PKEY_CTX_new(pk, NULL);
+                EVP_PKEY_decrypt_init(pkey_ctx);
                         /* If client certificate is present and is of the same type, maybe
                          * use it for key exchange.  Don't mind errors from
                          * EVP_PKEY_derive_set_peer, because it is completely valid to use
                          * a client certificate for authorization only. */
-                        client_pub_pkey = X509_get_pubkey(s->session->peer);
-                        if (client_pub_pkey)
-                                {
-                                if (EVP_PKEY_derive_set_peer(pkey_ctx, client_pub_pkey) <= 0)
-                                        ERR_clear_error();
-                                }
-                        /* Decrypt session key */
-                        if ((*p!=( V_ASN1_SEQUENCE| V_ASN1_CONSTRUCTED))) 
-                                {
-                                SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,SSL_R_DECRYPTION_FAILED);
-                                goto gerr;
-                                }
-                        if (p[1] == 0x81)
-                                {
-                                start = p+3;
-                                inlen = p[2];
-                                }
-                        else if (p[1] < 0x80)
-                                {
-                                start = p+2;
-                                inlen = p[1];
-                                }
-                        else
-                                {
-                                SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,SSL_R_DECRYPTION_FAILED);
-                                goto gerr;
-                                }
-                        if (EVP_PKEY_decrypt(pkey_ctx,premaster_secret,&outlen,start,inlen) <=0) 
-
-                                {
-                                SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,SSL_R_DECRYPTION_FAILED);
-                                goto gerr;
-                                }
-                        /* Generate master secret */
-                        s->session->master_key_length=
-                                s->method->ssl3_enc->generate_master_secret(s,
-                                        s->session->master_key,premaster_secret,32);
-                        /* Check if pubkey from client certificate was used */
-                        if (EVP_PKEY_CTX_ctrl(pkey_ctx, -1, -1, EVP_PKEY_CTRL_PEER_KEY, 2, NULL) > 0)
-                                ret = 2;
-                        else
-                                ret = 1;
+                client_pub_pkey = X509_get_pubkey(s->session->peer);
+                if (client_pub_pkey) {
+                        if (EVP_PKEY_derive_set_peer(pkey_ctx, client_pub_pkey) <= 0)
+                                ERR_clear_error();
+                }
+                /* Decrypt session key */
+                if ((*p != ( V_ASN1_SEQUENCE| V_ASN1_CONSTRUCTED))) {
+                        SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE, SSL_R_DECRYPTION_FAILED);
+                        goto gerr;
+                }
+                if (p[1] == 0x81) {
+                        start = p + 3;
+                        inlen = p[2];
+                } else if (p[1] < 0x80) {
+                        start = p + 2;
+                        inlen = p[1];
+                } else {
+                        SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE, SSL_R_DECRYPTION_FAILED);
+                        goto gerr;
+                }
+                if (EVP_PKEY_decrypt(pkey_ctx, premaster_secret, &outlen, start, inlen) <=0)
+
+                {
+                        SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE, SSL_R_DECRYPTION_FAILED);
+                        goto gerr;
+                }
+                /* Generate master secret */
+                s->session->master_key_length =
+                    s->method->ssl3_enc->generate_master_secret(
+                        s, s->session->master_key, premaster_secret, 32);
+                /* Check if pubkey from client certificate was used */
+                if (EVP_PKEY_CTX_ctrl(pkey_ctx, -1, -1, EVP_PKEY_CTRL_PEER_KEY, 2, NULL) > 0)
+                        ret = 2;
+                else
+                        ret = 1;
                 gerr:
-                        EVP_PKEY_free(client_pub_pkey);
-                        EVP_PKEY_CTX_free(pkey_ctx);
-                        if (ret)
-                                return ret;
-                        else
-                                goto err;
-                        }
+                EVP_PKEY_free(client_pub_pkey);
+                EVP_PKEY_CTX_free(pkey_ctx);
+                if (ret)
+                        return ret;
                 else
-                {
-                al=SSL_AD_HANDSHAKE_FAILURE;
+                        goto err;
+        } else {
+                al = SSL_AD_HANDSHAKE_FAILURE;
                 SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,
-                                SSL_R_UNKNOWN_CIPHER_TYPE);
+                SSL_R_UNKNOWN_CIPHER_TYPE);
                 goto f_err;
-                }
+        }
 
-        return(1);
+        return (1);
 f_err:
-        ssl3_send_alert(s,SSL3_AL_FATAL,al);
+        ssl3_send_alert(s, SSL3_AL_FATAL, al);
 #if !defined(OPENSSL_NO_DH) || !defined(OPENSSL_NO_RSA) || !defined(OPENSSL_NO_ECDH) || defined(OPENSSL_NO_SRP)
 err:
 #endif
 #ifndef OPENSSL_NO_ECDH
         EVP_PKEY_free(clnt_pub_pkey);
         EC_POINT_free(clnt_ecpoint);
-        if (srvr_ecdh != NULL) 
+        if (srvr_ecdh != NULL)
                 EC_KEY_free(srvr_ecdh);
         BN_CTX_free(bn_ctx);
 #endif
-        return(-1);
-        }
+        return (-1);
+}
 
-int ssl3_get_cert_verify(SSL *s)
-        {
-        EVP_PKEY *pkey=NULL;
+int
+ssl3_get_cert_verify(SSL *s)
+{
+        EVP_PKEY *pkey = NULL;
         unsigned char *p;
-        int al,ok,ret=0;
+        int al, ok, ret = 0;
         long n;
-        int type=0,i,j;
+        int type = 0, i, j;
         X509 *peer;
         const EVP_MD *md = NULL;
         EVP_MD_CTX mctx;
         EVP_MD_CTX_init(&mctx);
 
-        n=s->method->ssl_get_message(s,
-                SSL3_ST_SR_CERT_VRFY_A,
-                SSL3_ST_SR_CERT_VRFY_B,
-                -1,
-                516, /* Enough for 4096 bit RSA key with TLS v1.2 */
-                &ok);
-
-        if (!ok) return((int)n);
-
-        if (s->session->peer != NULL)
-                {
-                peer=s->session->peer;
-                pkey=X509_get_pubkey(peer);
-                type=X509_certificate_type(peer,pkey);
-                }
-        else
-                {
-                peer=NULL;
-                pkey=NULL;
-                }
+        n = s->method->ssl_get_message(s, SSL3_ST_SR_CERT_VRFY_A,
+            SSL3_ST_SR_CERT_VRFY_B, -1,
+            516, /* Enough for 4096 bit RSA key with TLS v1.2 */ &ok);
+        if (!ok)
+                return ((int)n);
+
+        if (s->session->peer != NULL) {
+                peer = s->session->peer;
+                pkey = X509_get_pubkey(peer);
+                type = X509_certificate_type(peer, pkey);
+        } else {
+                peer = NULL;
+                pkey = NULL;
+        }
 
-        if (s->s3->tmp.message_type != SSL3_MT_CERTIFICATE_VERIFY)
-                {
-                s->s3->tmp.reuse_message=1;
-                if ((peer != NULL) && (type & EVP_PKT_SIGN))
-                        {
-                        al=SSL_AD_UNEXPECTED_MESSAGE;
-                        SSLerr(SSL_F_SSL3_GET_CERT_VERIFY,SSL_R_MISSING_VERIFY_MESSAGE);
+        if (s->s3->tmp.message_type != SSL3_MT_CERTIFICATE_VERIFY) {
+                s->s3->tmp.reuse_message = 1;
+                if ((peer != NULL) && (type & EVP_PKT_SIGN)) {
+                        al = SSL_AD_UNEXPECTED_MESSAGE;
+                        SSLerr(SSL_F_SSL3_GET_CERT_VERIFY, SSL_R_MISSING_VERIFY_MESSAGE);
                         goto f_err;
-                        }
-                ret=1;
-                goto end;
                 }
+                ret = 1;
+                goto end;
+        }
 
-        if (peer == NULL)
-                {
-                SSLerr(SSL_F_SSL3_GET_CERT_VERIFY,SSL_R_NO_CLIENT_CERT_RECEIVED);
-                al=SSL_AD_UNEXPECTED_MESSAGE;
+        if (peer == NULL) {
+                SSLerr(SSL_F_SSL3_GET_CERT_VERIFY, SSL_R_NO_CLIENT_CERT_RECEIVED);
+                al = SSL_AD_UNEXPECTED_MESSAGE;
                 goto f_err;
-                }
+        }
 
-        if (!(type & EVP_PKT_SIGN))
-                {
-                SSLerr(SSL_F_SSL3_GET_CERT_VERIFY,SSL_R_SIGNATURE_FOR_NON_SIGNING_CERTIFICATE);
-                al=SSL_AD_ILLEGAL_PARAMETER;
+        if (!(type & EVP_PKT_SIGN)) {
+                SSLerr(SSL_F_SSL3_GET_CERT_VERIFY, SSL_R_SIGNATURE_FOR_NON_SIGNING_CERTIFICATE);
+                al = SSL_AD_ILLEGAL_PARAMETER;
                 goto f_err;
-                }
+        }
 
-        if (s->s3->change_cipher_spec)
-                {
-                SSLerr(SSL_F_SSL3_GET_CERT_VERIFY,SSL_R_CCS_RECEIVED_EARLY);
-                al=SSL_AD_UNEXPECTED_MESSAGE;
+        if (s->s3->change_cipher_spec) {
+                SSLerr(SSL_F_SSL3_GET_CERT_VERIFY, SSL_R_CCS_RECEIVED_EARLY);
+                al = SSL_AD_UNEXPECTED_MESSAGE;
                 goto f_err;
-                }
+        }
 
         /* we now have a signature that we need to verify */
-        p=(unsigned char *)s->init_msg;
+        p = (unsigned char *)s->init_msg;
         /* Check for broken implementations of GOST ciphersuites */
         /* If key is GOST and n is exactly 64, it is bare
          * signature without length field */
-        if (n==64 && (pkey->type==NID_id_GostR3410_94 ||
-                pkey->type == NID_id_GostR3410_2001) )
-                {
-                i=64;
-                } 
-        else 
-                {       
-                if (TLS1_get_version(s) >= TLS1_2_VERSION)
-                        {
+        if (n == 64 && (pkey->type == NID_id_GostR3410_94 ||
+            pkey->type == NID_id_GostR3410_2001) ) {
+                i = 64;
+        } else {
+                if (TLS1_get_version(s) >= TLS1_2_VERSION) {
                         int sigalg = tls12_get_sigid(pkey);
                         /* Should never happen */
-                        if (sigalg == -1)
-                                {
-                                SSLerr(SSL_F_SSL3_GET_CERT_VERIFY,ERR_R_INTERNAL_ERROR);
-                                al=SSL_AD_INTERNAL_ERROR;
+                        if (sigalg == -1) {
+                                SSLerr(SSL_F_SSL3_GET_CERT_VERIFY, ERR_R_INTERNAL_ERROR);
+                                al = SSL_AD_INTERNAL_ERROR;
                                 goto f_err;
-                                }
+                        }
                         /* Check key type is consistent with signature */
-                        if (sigalg != (int)p[1])
-                                {
-                                SSLerr(SSL_F_SSL3_GET_CERT_VERIFY,SSL_R_WRONG_SIGNATURE_TYPE);
-                                al=SSL_AD_DECODE_ERROR;
+                        if (sigalg != (int)p[1]) {
+                                SSLerr(SSL_F_SSL3_GET_CERT_VERIFY, SSL_R_WRONG_SIGNATURE_TYPE);
+                                al = SSL_AD_DECODE_ERROR;
                                 goto f_err;
-                                }
+                        }
                         md = tls12_get_hash(p[0]);
-                        if (md == NULL)
-                                {
-                                SSLerr(SSL_F_SSL3_GET_CERT_VERIFY,SSL_R_UNKNOWN_DIGEST);
-                                al=SSL_AD_DECODE_ERROR;
+                        if (md == NULL) {
+                                SSLerr(SSL_F_SSL3_GET_CERT_VERIFY, SSL_R_UNKNOWN_DIGEST);
+                                al = SSL_AD_DECODE_ERROR;
                                 goto f_err;
-                                }
+                        }
 #ifdef SSL_DEBUG
-fprintf(stderr, "USING TLSv1.2 HASH %s\n", EVP_MD_name(md));
+                        fprintf(stderr, "USING TLSv1.2 HASH %s\n", EVP_MD_name(md));
 #endif
                         p += 2;
                         n -= 2;
-                        }
-                n2s(p,i);
-                n-=2;
-                if (i > n)
-                        {
-                        SSLerr(SSL_F_SSL3_GET_CERT_VERIFY,SSL_R_LENGTH_MISMATCH);
-                        al=SSL_AD_DECODE_ERROR;
+                }
+                n2s(p, i);
+                n -= 2;
+                if (i > n) {
+                        SSLerr(SSL_F_SSL3_GET_CERT_VERIFY, SSL_R_LENGTH_MISMATCH);
+                        al = SSL_AD_DECODE_ERROR;
                         goto f_err;
-                        }
-        }
-        j=EVP_PKEY_size(pkey);
-        if ((i > j) || (n > j) || (n <= 0))
-                {
-                SSLerr(SSL_F_SSL3_GET_CERT_VERIFY,SSL_R_WRONG_SIGNATURE_SIZE);
-                al=SSL_AD_DECODE_ERROR;
-                goto f_err;
                 }
+        }
+        j = EVP_PKEY_size(pkey);
+        if ((i > j) || (n > j) || (n <= 0)) {
+                SSLerr(SSL_F_SSL3_GET_CERT_VERIFY, SSL_R_WRONG_SIGNATURE_SIZE);
+                al = SSL_AD_DECODE_ERROR;
+                goto f_err;
+        }
 
-        if (TLS1_get_version(s) >= TLS1_2_VERSION)
-                {
+        if (TLS1_get_version(s) >= TLS1_2_VERSION) {
                 long hdatalen = 0;
                 void *hdata;
                 hdatalen = BIO_get_mem_data(s->s3->handshake_buffer, &hdata);
-                if (hdatalen <= 0)
-                        {
+                if (hdatalen <= 0) {
                         SSLerr(SSL_F_SSL3_GET_CERT_VERIFY, ERR_R_INTERNAL_ERROR);
-                        al=SSL_AD_INTERNAL_ERROR;
+                        al = SSL_AD_INTERNAL_ERROR;
                         goto f_err;
-                        }
+                }
 #ifdef SSL_DEBUG
                 fprintf(stderr, "Using TLS 1.2 with client verify alg %s\n",
-                                                        EVP_MD_name(md));
+                EVP_MD_name(md));
 #endif
-                if (!EVP_VerifyInit_ex(&mctx, md, NULL)
-                        || !EVP_VerifyUpdate(&mctx, hdata, hdatalen))
-                        {
+                if (!EVP_VerifyInit_ex(&mctx, md, NULL) ||
+                    !EVP_VerifyUpdate(&mctx, hdata, hdatalen)) {
                         SSLerr(SSL_F_SSL3_GET_CERT_VERIFY, ERR_R_EVP_LIB);
-                        al=SSL_AD_INTERNAL_ERROR;
+                        al = SSL_AD_INTERNAL_ERROR;
                         goto f_err;
-                        }
+                }
 
-                if (EVP_VerifyFinal(&mctx, p , i, pkey) <= 0)
-                        {
-                        al=SSL_AD_DECRYPT_ERROR;
-                        SSLerr(SSL_F_SSL3_GET_CERT_VERIFY,SSL_R_BAD_SIGNATURE);
+                if (EVP_VerifyFinal(&mctx, p , i, pkey) <= 0) {
+                        al = SSL_AD_DECRYPT_ERROR;
+                        SSLerr(SSL_F_SSL3_GET_CERT_VERIFY, SSL_R_BAD_SIGNATURE);
                         goto f_err;
-                        }
                 }
-        else
+        } else
 #ifndef OPENSSL_NO_RSA 
-        if (pkey->type == EVP_PKEY_RSA)
-                {
-                i=RSA_verify(NID_md5_sha1, s->s3->tmp.cert_verify_md,
-                        MD5_DIGEST_LENGTH+SHA_DIGEST_LENGTH, p, i, 
-                                                        pkey->pkey.rsa);
-                if (i < 0)
-                        {
-                        al=SSL_AD_DECRYPT_ERROR;
-                        SSLerr(SSL_F_SSL3_GET_CERT_VERIFY,SSL_R_BAD_RSA_DECRYPT);
+        if (pkey->type == EVP_PKEY_RSA) {
+                i = RSA_verify(NID_md5_sha1, s->s3->tmp.cert_verify_md,
+                MD5_DIGEST_LENGTH + SHA_DIGEST_LENGTH, p, i,
+                pkey->pkey.rsa);
+                if (i < 0) {
+                        al = SSL_AD_DECRYPT_ERROR;
+                        SSLerr(SSL_F_SSL3_GET_CERT_VERIFY, SSL_R_BAD_RSA_DECRYPT);
                         goto f_err;
-                        }
-                if (i == 0)
-                        {
-                        al=SSL_AD_DECRYPT_ERROR;
-                        SSLerr(SSL_F_SSL3_GET_CERT_VERIFY,SSL_R_BAD_RSA_SIGNATURE);
+                }
+                if (i == 0) {
+                        al = SSL_AD_DECRYPT_ERROR;
+                        SSLerr(SSL_F_SSL3_GET_CERT_VERIFY, SSL_R_BAD_RSA_SIGNATURE);
                         goto f_err;
-                        }
                 }
-        else
+        } else
 #endif
 #ifndef OPENSSL_NO_DSA
-                if (pkey->type == EVP_PKEY_DSA)
-                {
-                j=DSA_verify(pkey->save_type,
-                        &(s->s3->tmp.cert_verify_md[MD5_DIGEST_LENGTH]),
-                        SHA_DIGEST_LENGTH,p,i,pkey->pkey.dsa);
-                if (j <= 0)
-                        {
+        if (pkey->type == EVP_PKEY_DSA) {
+                j = DSA_verify(pkey->save_type,
+                &(s->s3->tmp.cert_verify_md[MD5_DIGEST_LENGTH]),
+                SHA_DIGEST_LENGTH, p, i, pkey->pkey.dsa);
+                if (j <= 0) {
                         /* bad signature */
-                        al=SSL_AD_DECRYPT_ERROR;
-                        SSLerr(SSL_F_SSL3_GET_CERT_VERIFY,SSL_R_BAD_DSA_SIGNATURE);
+                        al = SSL_AD_DECRYPT_ERROR;
+                        SSLerr(SSL_F_SSL3_GET_CERT_VERIFY, SSL_R_BAD_DSA_SIGNATURE);
                         goto f_err;
-                        }
                 }
-        else
+        } else
 #endif
 #ifndef OPENSSL_NO_ECDSA
-                if (pkey->type == EVP_PKEY_EC)
-                {
-                j=ECDSA_verify(pkey->save_type,
-                        &(s->s3->tmp.cert_verify_md[MD5_DIGEST_LENGTH]),
-                        SHA_DIGEST_LENGTH,p,i,pkey->pkey.ec);
-                if (j <= 0)
-                        {
+        if (pkey->type == EVP_PKEY_EC) {
+                j = ECDSA_verify(pkey->save_type,
+                    &(s->s3->tmp.cert_verify_md[MD5_DIGEST_LENGTH]),
+                    SHA_DIGEST_LENGTH, p, i, pkey->pkey.ec);
+                if (j <= 0) {
                         /* bad signature */
-                        al=SSL_AD_DECRYPT_ERROR;
+                        al = SSL_AD_DECRYPT_ERROR;
                         SSLerr(SSL_F_SSL3_GET_CERT_VERIFY,
-                            SSL_R_BAD_ECDSA_SIGNATURE);
+                        SSL_R_BAD_ECDSA_SIGNATURE);
                         goto f_err;
-                        }
                 }
-        else
+        } else
 #endif
-        if (pkey->type == NID_id_GostR3410_94 || pkey->type == NID_id_GostR3410_2001)
-                {   unsigned char signature[64];
-                        int idx;
-                        EVP_PKEY_CTX *pctx = EVP_PKEY_CTX_new(pkey,NULL);
-                        EVP_PKEY_verify_init(pctx);
-                        if (i!=64) {
-                                fprintf(stderr,"GOST signature length is %d",i);
-                        }       
-                        for (idx=0;idx<64;idx++) {
-                                signature[63-idx]=p[idx];
-                        }       
-                        j=EVP_PKEY_verify(pctx,signature,64,s->s3->tmp.cert_verify_md,32);
-                        EVP_PKEY_CTX_free(pctx);
-                        if (j<=0) 
-                                {
-                                al=SSL_AD_DECRYPT_ERROR;
-                                SSLerr(SSL_F_SSL3_GET_CERT_VERIFY,
-                                        SSL_R_BAD_ECDSA_SIGNATURE);
-                                goto f_err;
-                                }       
+        if (pkey->type == NID_id_GostR3410_94 || pkey->type == NID_id_GostR3410_2001) {
+                unsigned char signature[64];
+                int idx;
+                EVP_PKEY_CTX *pctx = EVP_PKEY_CTX_new(pkey, NULL);
+                EVP_PKEY_verify_init(pctx);
+                if (i != 64) {
+                        fprintf(stderr, "GOST signature length is %d", i);
+                }
+                for (idx = 0; idx < 64; idx++) {
+                        signature[63 - idx] = p[idx];
+                }
+                j = EVP_PKEY_verify(pctx, signature, 64, s->s3->tmp.cert_verify_md, 32);
+                EVP_PKEY_CTX_free(pctx);
+                if (j <= 0) {
+                        al = SSL_AD_DECRYPT_ERROR;
+                        SSLerr(SSL_F_SSL3_GET_CERT_VERIFY,
+                        SSL_R_BAD_ECDSA_SIGNATURE);
+                        goto f_err;
                 }
-        else    
-                {
-                SSLerr(SSL_F_SSL3_GET_CERT_VERIFY,ERR_R_INTERNAL_ERROR);
-                al=SSL_AD_UNSUPPORTED_CERTIFICATE;
+        } else {
+                SSLerr(SSL_F_SSL3_GET_CERT_VERIFY, ERR_R_INTERNAL_ERROR);
+                al = SSL_AD_UNSUPPORTED_CERTIFICATE;
                 goto f_err;
-                }
+        }
 
 
-        ret=1;
-        if (0)
-                {
+        ret = 1;
+        if (0) {
 f_err:
-                ssl3_send_alert(s,SSL3_AL_FATAL,al);
-                }
+                ssl3_send_alert(s, SSL3_AL_FATAL, al);
+        }
 end:
-        if (s->s3->handshake_buffer)
-                {
+        if (s->s3->handshake_buffer) {
                 BIO_free(s->s3->handshake_buffer);
                 s->s3->handshake_buffer = NULL;
                 s->s3->flags &= ~TLS1_FLAGS_KEEP_HANDSHAKE;
-                }
+        }
         EVP_MD_CTX_cleanup(&mctx);
         EVP_PKEY_free(pkey);
-        return(ret);
-        }
+        return (ret);
+}
 
-int ssl3_get_client_certificate(SSL *s)
-        {
-        int i,ok,al,ret= -1;
-        X509 *x=NULL;
-        unsigned long l,nc,llen,n;
-        const unsigned char *p,*q;
+int
+ssl3_get_client_certificate(SSL *s)
+{
+        int i, ok, al, ret = -1;
+        X509 *x = NULL;
+        unsigned long l, nc, llen, n;
+        const unsigned char *p, *q;
         unsigned char *d;
-        STACK_OF(X509) *sk=NULL;
+        STACK_OF(X509) *sk = NULL;
 
-        n=s->method->ssl_get_message(s,
-                SSL3_ST_SR_CERT_A,
-                SSL3_ST_SR_CERT_B,
-                -1,
-                s->max_cert_list,
-                &ok);
+        n = s->method->ssl_get_message(s,
+        SSL3_ST_SR_CERT_A,
+        SSL3_ST_SR_CERT_B,
+        -1,
+        s->max_cert_list,
+        &ok);
 
-        if (!ok) return((int)n);
+        if (!ok)
+                return ((int)n);
 
-        if      (s->s3->tmp.message_type == SSL3_MT_CLIENT_KEY_EXCHANGE)
-                {
-                if (    (s->verify_mode & SSL_VERIFY_PEER) &&
-                        (s->verify_mode & SSL_VERIFY_FAIL_IF_NO_PEER_CERT))
-                        {
-                        SSLerr(SSL_F_SSL3_GET_CLIENT_CERTIFICATE,SSL_R_PEER_DID_NOT_RETURN_A_CERTIFICATE);
-                        al=SSL_AD_HANDSHAKE_FAILURE;
+        if (s->s3->tmp.message_type == SSL3_MT_CLIENT_KEY_EXCHANGE) {
+                if ((s->verify_mode & SSL_VERIFY_PEER) &&
+                        (s->verify_mode & SSL_VERIFY_FAIL_IF_NO_PEER_CERT)) {
+                        SSLerr(SSL_F_SSL3_GET_CLIENT_CERTIFICATE, SSL_R_PEER_DID_NOT_RETURN_A_CERTIFICATE);
+                        al = SSL_AD_HANDSHAKE_FAILURE;
                         goto f_err;
-                        }
+                }
                 /* If tls asked for a client cert, the client must return a 0 list */
-                if ((s->version > SSL3_VERSION) && s->s3->tmp.cert_request)
-                        {
-                        SSLerr(SSL_F_SSL3_GET_CLIENT_CERTIFICATE,SSL_R_TLS_PEER_DID_NOT_RESPOND_WITH_CERTIFICATE_LIST);
-                        al=SSL_AD_UNEXPECTED_MESSAGE;
+                if ((s->version > SSL3_VERSION) && s->s3->tmp.cert_request) {
+                        SSLerr(SSL_F_SSL3_GET_CLIENT_CERTIFICATE, SSL_R_TLS_PEER_DID_NOT_RESPOND_WITH_CERTIFICATE_LIST);
+                        al = SSL_AD_UNEXPECTED_MESSAGE;
                         goto f_err;
-                        }
-                s->s3->tmp.reuse_message=1;
-                return(1);
                 }
+                s->s3->tmp.reuse_message = 1;
+                return (1);
+        }
 
-        if (s->s3->tmp.message_type != SSL3_MT_CERTIFICATE)
-                {
-                al=SSL_AD_UNEXPECTED_MESSAGE;
-                SSLerr(SSL_F_SSL3_GET_CLIENT_CERTIFICATE,SSL_R_WRONG_MESSAGE_TYPE);
+        if (s->s3->tmp.message_type != SSL3_MT_CERTIFICATE) {
+                al = SSL_AD_UNEXPECTED_MESSAGE;
+                SSLerr(SSL_F_SSL3_GET_CLIENT_CERTIFICATE, SSL_R_WRONG_MESSAGE_TYPE);
                 goto f_err;
-                }
-        p=d=(unsigned char *)s->init_msg;
+        }
+        p = d = (unsigned char *)s->init_msg;
 
-        if ((sk=sk_X509_new_null()) == NULL)
-                {
-                SSLerr(SSL_F_SSL3_GET_CLIENT_CERTIFICATE,ERR_R_MALLOC_FAILURE);
+        if ((sk = sk_X509_new_null()) == NULL) {
+                SSLerr(SSL_F_SSL3_GET_CLIENT_CERTIFICATE, ERR_R_MALLOC_FAILURE);
                 goto err;
-                }
+        }
 
-        n2l3(p,llen);
-        if (llen+3 != n)
-                {
-                al=SSL_AD_DECODE_ERROR;
-                SSLerr(SSL_F_SSL3_GET_CLIENT_CERTIFICATE,SSL_R_LENGTH_MISMATCH);
+        n2l3(p, llen);
+        if (llen + 3 != n) {
+                al = SSL_AD_DECODE_ERROR;
+                SSLerr(SSL_F_SSL3_GET_CLIENT_CERTIFICATE, SSL_R_LENGTH_MISMATCH);
                 goto f_err;
-                }
-        for (nc=0; nc<llen; )
-                {
-                n2l3(p,l);
-                if ((l+nc+3) > llen)
-                        {
-                        al=SSL_AD_DECODE_ERROR;
-                        SSLerr(SSL_F_SSL3_GET_CLIENT_CERTIFICATE,SSL_R_CERT_LENGTH_MISMATCH);
+        }
+        for (nc = 0; nc < llen;) {
+                n2l3(p, l);
+                if ((l + nc + 3) > llen) {
+                        al = SSL_AD_DECODE_ERROR;
+                        SSLerr(SSL_F_SSL3_GET_CLIENT_CERTIFICATE, SSL_R_CERT_LENGTH_MISMATCH);
                         goto f_err;
-                        }
+                }
 
-                q=p;
-                x=d2i_X509(NULL,&p,l);
-                if (x == NULL)
-                        {
-                        SSLerr(SSL_F_SSL3_GET_CLIENT_CERTIFICATE,ERR_R_ASN1_LIB);
+                q = p;
+                x = d2i_X509(NULL, &p, l);
+                if (x == NULL) {
+                        SSLerr(SSL_F_SSL3_GET_CLIENT_CERTIFICATE, ERR_R_ASN1_LIB);
                         goto err;
-                        }
-                if (p != (q+l))
-                        {
-                        al=SSL_AD_DECODE_ERROR;
-                        SSLerr(SSL_F_SSL3_GET_CLIENT_CERTIFICATE,SSL_R_CERT_LENGTH_MISMATCH);
+                }
+                if (p != (q + l)) {
+                        al = SSL_AD_DECODE_ERROR;
+                        SSLerr(SSL_F_SSL3_GET_CLIENT_CERTIFICATE, SSL_R_CERT_LENGTH_MISMATCH);
                         goto f_err;
-                        }
-                if (!sk_X509_push(sk,x))
-                        {
-                        SSLerr(SSL_F_SSL3_GET_CLIENT_CERTIFICATE,ERR_R_MALLOC_FAILURE);
+                }
+                if (!sk_X509_push(sk, x)) {
+                        SSLerr(SSL_F_SSL3_GET_CLIENT_CERTIFICATE, ERR_R_MALLOC_FAILURE);
                         goto err;
-                        }
-                x=NULL;
-                nc+=l+3;
                 }
+                x = NULL;
+                nc += l + 3;
+        }
 
-        if (sk_X509_num(sk) <= 0)
-                {
+        if (sk_X509_num(sk) <= 0) {
                 /* TLS does not mind 0 certs returned */
-                if (s->version == SSL3_VERSION)
-                        {
-                        al=SSL_AD_HANDSHAKE_FAILURE;
-                        SSLerr(SSL_F_SSL3_GET_CLIENT_CERTIFICATE,SSL_R_NO_CERTIFICATES_RETURNED);
+                if (s->version == SSL3_VERSION) {
+                        al = SSL_AD_HANDSHAKE_FAILURE;
+                        SSLerr(SSL_F_SSL3_GET_CLIENT_CERTIFICATE, SSL_R_NO_CERTIFICATES_RETURNED);
                         goto f_err;
-                        }
+                }
                 /* Fail for TLS only if we required a certificate */
                 else if ((s->verify_mode & SSL_VERIFY_PEER) &&
-                         (s->verify_mode & SSL_VERIFY_FAIL_IF_NO_PEER_CERT))
-                        {
-                        SSLerr(SSL_F_SSL3_GET_CLIENT_CERTIFICATE,SSL_R_PEER_DID_NOT_RETURN_A_CERTIFICATE);
-                        al=SSL_AD_HANDSHAKE_FAILURE;
+                    (s->verify_mode & SSL_VERIFY_FAIL_IF_NO_PEER_CERT)) {
+                        SSLerr(SSL_F_SSL3_GET_CLIENT_CERTIFICATE, SSL_R_PEER_DID_NOT_RETURN_A_CERTIFICATE);
+                        al = SSL_AD_HANDSHAKE_FAILURE;
                         goto f_err;
-                        }
+                }
                 /* No client certificate so digest cached records */
-                if (s->s3->handshake_buffer && !ssl3_digest_cached_records(s))
-                        {
-                        al=SSL_AD_INTERNAL_ERROR;
+                if (s->s3->handshake_buffer && !ssl3_digest_cached_records(s)) {
+                        al = SSL_AD_INTERNAL_ERROR;
                         goto f_err;
-                        }
                 }
-        else
-                {
-                i=ssl_verify_cert_chain(s,sk);
-                if (i <= 0)
-                        {
-                        al=ssl_verify_alarm_type(s->verify_result);
-                        SSLerr(SSL_F_SSL3_GET_CLIENT_CERTIFICATE,SSL_R_NO_CERTIFICATE_RETURNED);
+        } else {
+                i = ssl_verify_cert_chain(s, sk);
+                if (i <= 0) {
+                        al = ssl_verify_alarm_type(s->verify_result);
+                        SSLerr(SSL_F_SSL3_GET_CLIENT_CERTIFICATE, SSL_R_NO_CERTIFICATE_RETURNED);
                         goto f_err;
-                        }
                 }
+        }
 
         if (s->session->peer != NULL) /* This should not be needed */
                 X509_free(s->session->peer);
-        s->session->peer=sk_X509_shift(sk);
+        s->session->peer = sk_X509_shift(sk);
         s->session->verify_result = s->verify_result;
 
         /* With the current implementation, sess_cert will always be NULL
          * when we arrive here. */
-        if (s->session->sess_cert == NULL)
-                {
+        if (s->session->sess_cert == NULL) {
                 s->session->sess_cert = ssl_sess_cert_new();
-                if (s->session->sess_cert == NULL)
-                        {
+                if (s->session->sess_cert == NULL) {
                         SSLerr(SSL_F_SSL3_GET_CLIENT_CERTIFICATE, ERR_R_MALLOC_FAILURE);
                         goto err;
-                        }
                 }
+        }
         if (s->session->sess_cert->cert_chain != NULL)
                 sk_X509_pop_free(s->session->sess_cert->cert_chain, X509_free);
-        s->session->sess_cert->cert_chain=sk;
+        s->session->sess_cert->cert_chain = sk;
         /* Inconsistency alert: cert_chain does *not* include the
          * peer's own certificate, while we do include it in s3_clnt.c */
 
-        sk=NULL;
+        sk = NULL;
 
-        ret=1;
-        if (0)
-                {
+        ret = 1;
+        if (0) {
 f_err:
-                ssl3_send_alert(s,SSL3_AL_FATAL,al);
-                }
-err:
-        if (x != NULL) X509_free(x);
-        if (sk != NULL) sk_X509_pop_free(sk,X509_free);
-        return(ret);
+                ssl3_send_alert(s, SSL3_AL_FATAL, al);
         }
+err:
+        if (x != NULL)
+                X509_free(x);
+        if (sk != NULL)
+                sk_X509_pop_free(sk, X509_free);
+        return (ret);
+}
 
-int ssl3_send_server_certificate(SSL *s)
-        {
+int
+ssl3_send_server_certificate(SSL *s)
+{
         unsigned long l;
         X509 *x;
 
-        if (s->state == SSL3_ST_SW_CERT_A)
-                {
-                x=ssl_get_server_send_cert(s);
-                if (x == NULL)
-                        {
+        if (s->state == SSL3_ST_SW_CERT_A) {
+                x = ssl_get_server_send_cert(s);
+                if (x == NULL) {
                         /* VRS: allow null cert if auth == KRB5 */
                         if ((s->s3->tmp.new_cipher->algorithm_auth != SSL_aKRB5) ||
-                            (s->s3->tmp.new_cipher->algorithm_mkey & SSL_kKRB5))
-                                {
-                                SSLerr(SSL_F_SSL3_SEND_SERVER_CERTIFICATE,ERR_R_INTERNAL_ERROR);
-                                return(0);
-                                }
+                                (s->s3->tmp.new_cipher->algorithm_mkey & SSL_kKRB5)) {
+                                SSLerr(SSL_F_SSL3_SEND_SERVER_CERTIFICATE, ERR_R_INTERNAL_ERROR);
+                                return (0);
                         }
-
-                l=ssl3_output_cert_chain(s,x);
-                s->state=SSL3_ST_SW_CERT_B;
-                s->init_num=(int)l;
-                s->init_off=0;
                 }
 
-        /* SSL3_ST_SW_CERT_B */
-        return(ssl3_do_write(s,SSL3_RT_HANDSHAKE));
+                l = ssl3_output_cert_chain(s, x);
+                s->state = SSL3_ST_SW_CERT_B;
+                s->init_num = (int)l;
+                s->init_off = 0;
         }
 
+        /* SSL3_ST_SW_CERT_B */
+        return (ssl3_do_write(s, SSL3_RT_HANDSHAKE));
+}
+
 #ifndef OPENSSL_NO_TLSEXT
 /* send a new session ticket (not necessarily for a new session) */
-int ssl3_send_newsession_ticket(SSL *s)
-        {
-        if (s->state == SSL3_ST_SW_SESSION_TICKET_A)
-                {
+int
+ssl3_send_newsession_ticket(SSL *s)
+{
+        if (s->state == SSL3_ST_SW_SESSION_TICKET_A) {
                 unsigned char *p, *senc, *macstart;
                 const unsigned char *const_p;
                 int len, slen_full, slen;
@@ -3383,19 +3097,18 @@ int ssl3_send_newsession_ticket(SSL *s)
                 /* create a fresh copy (not shared with other threads) to clean up */
                 const_p = senc;
                 sess = d2i_SSL_SESSION(NULL, &const_p, slen_full);
-                if (sess == NULL)
-                        {
+                if (sess == NULL) {
                         OPENSSL_free(senc);
                         return -1;
-                        }
+                }
                 sess->session_id_length = 0; /* ID is irrelevant for the ticket */
 
                 slen = i2d_SSL_SESSION(sess, NULL);
                 if (slen > slen_full) /* shouldn't ever happen */
-                        {
+                {
                         OPENSSL_free(senc);
                         return -1;
-                        }
+                }
                 p = senc;
                 i2d_SSL_SESSION(sess, &p);
                 SSL_SESSION_free(sess);
@@ -3409,12 +3122,12 @@ int ssl3_send_newsession_ticket(SSL *s)
                  */
                 if (!BUF_MEM_grow(s->init_buf,
                         26 + EVP_MAX_IV_LENGTH + EVP_MAX_BLOCK_LENGTH +
-                        EVP_MAX_MD_SIZE + slen))
-                        return -1;
+                EVP_MAX_MD_SIZE + slen))
+                return -1;
 
-                p=(unsigned char *)s->init_buf->data;
+                p = (unsigned char *)s->init_buf->data;
                 /* do the header */
-                *(p++)=SSL3_MT_NEWSESSION_TICKET;
+                *(p++) = SSL3_MT_NEWSESSION_TICKET;
                 /* Skip message length for now */
                 p += 3;
                 EVP_CIPHER_CTX_init(&ctx);
@@ -3423,24 +3136,20 @@ int ssl3_send_newsession_ticket(SSL *s)
                  * it does all the work otherwise use generated values
                  * from parent ctx.
                  */
-                if (tctx->tlsext_ticket_key_cb)
-                        {
+                if (tctx->tlsext_ticket_key_cb) {
                         if (tctx->tlsext_ticket_key_cb(s, key_name, iv, &ctx,
-                                                         &hctx, 1) < 0)
-                                {
+                            &hctx, 1) < 0) {
                                 OPENSSL_free(senc);
                                 return -1;
-                                }
                         }
-                else
-                        {
+                } else {
                         RAND_pseudo_bytes(iv, 16);
                         EVP_EncryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL,
-                                        tctx->tlsext_tick_aes_key, iv);
+                            tctx->tlsext_tick_aes_key, iv);
                         HMAC_Init_ex(&hctx, tctx->tlsext_tick_hmac_key, 16,
-                                        tlsext_tick_md(), NULL);
+                            tlsext_tick_md(), NULL);
                         memcpy(key_name, tctx->tlsext_tick_key_name, 16);
-                        }
+                }
 
                 /* Ticket lifetime hint (advisory only):
                  * We leave this unspecified for resumed session (for simplicity),
@@ -3472,26 +3181,27 @@ int ssl3_send_newsession_ticket(SSL *s)
                 /* Now write out lengths: p points to end of data written */
                 /* Total length */
                 len = p - (unsigned char *)s->init_buf->data;
-                p=(unsigned char *)s->init_buf->data + 1;
+                p = (unsigned char *)s->init_buf->data + 1;
                 l2n3(len - 4, p); /* Message length */
                 p += 4;
-                s2n(len - 10, p);  /* Ticket length */
+                s2n(len - 10, p);
+                /* Ticket length */
 
                 /* number of bytes to write */
-                s->init_num= len;
-                s->state=SSL3_ST_SW_SESSION_TICKET_B;
-                s->init_off=0;
+                s->init_num = len;
+                s->state = SSL3_ST_SW_SESSION_TICKET_B;
+                s->init_off = 0;
                 OPENSSL_free(senc);
-                }
+        }
 
         /* SSL3_ST_SW_SESSION_TICKET_B */
-        return(ssl3_do_write(s,SSL3_RT_HANDSHAKE));
-        }
+        return (ssl3_do_write(s, SSL3_RT_HANDSHAKE));
+}
 
-int ssl3_send_cert_status(SSL *s)
-        {
-        if (s->state == SSL3_ST_SW_CERT_STATUS_A)
-                {
+int
+ssl3_send_cert_status(SSL *s)
+{
+        if (s->state == SSL3_ST_SW_CERT_STATUS_A) {
                 unsigned char *p;
                 /* Grow buffer if need be: the length calculation is as
                  * follows 1 (message type) + 3 (message length) +
@@ -3501,33 +3211,34 @@ int ssl3_send_cert_status(SSL *s)
                 if (!BUF_MEM_grow(s->init_buf, 8 + s->tlsext_ocsp_resplen))
                         return -1;
 
-                p=(unsigned char *)s->init_buf->data;
+                p = (unsigned char *)s->init_buf->data;
 
                 /* do the header */
-                *(p++)=SSL3_MT_CERTIFICATE_STATUS;
+                *(p++) = SSL3_MT_CERTIFICATE_STATUS;
                 /* message length */
                 l2n3(s->tlsext_ocsp_resplen + 4, p);
                 /* status type */
-                *(p++)= s->tlsext_status_type;
+                *(p++) = s->tlsext_status_type;
                 /* length of OCSP response */
                 l2n3(s->tlsext_ocsp_resplen, p);
                 /* actual response */
                 memcpy(p, s->tlsext_ocsp_resp, s->tlsext_ocsp_resplen);
                 /* number of bytes to write */
                 s->init_num = 8 + s->tlsext_ocsp_resplen;
-                s->state=SSL3_ST_SW_CERT_STATUS_B;
+                s->state = SSL3_ST_SW_CERT_STATUS_B;
                 s->init_off = 0;
-                }
+        }
 
         /* SSL3_ST_SW_CERT_STATUS_B */
-        return(ssl3_do_write(s,SSL3_RT_HANDSHAKE));
-        }
+        return (ssl3_do_write(s, SSL3_RT_HANDSHAKE));
+}
 
 # ifndef OPENSSL_NO_NEXTPROTONEG
 /* ssl3_get_next_proto reads a Next Protocol Negotiation handshake message. It
  * sets the next_proto member in s if found */
-int ssl3_get_next_proto(SSL *s)
-        {
+int
+ssl3_get_next_proto(SSL *s)
+{
         int ok;
         int proto_len, padding_len;
         long n;
@@ -3535,35 +3246,30 @@ int ssl3_get_next_proto(SSL *s)
 
         /* Clients cannot send a NextProtocol message if we didn't see the
          * extension in their ClientHello */
-        if (!s->s3->next_proto_neg_seen)
-                {
-                SSLerr(SSL_F_SSL3_GET_NEXT_PROTO,SSL_R_GOT_NEXT_PROTO_WITHOUT_EXTENSION);
+        if (!s->s3->next_proto_neg_seen) {
+                SSLerr(SSL_F_SSL3_GET_NEXT_PROTO, SSL_R_GOT_NEXT_PROTO_WITHOUT_EXTENSION);
                 return -1;
-                }
-
-        n=s->method->ssl_get_message(s,
-                SSL3_ST_SR_NEXT_PROTO_A,
-                SSL3_ST_SR_NEXT_PROTO_B,
-                SSL3_MT_NEXT_PROTO,
-                514,  /* See the payload format below */
-                &ok);
+        }
 
+        n = s->method->ssl_get_message(s, SSL3_ST_SR_NEXT_PROTO_A,
+            SSL3_ST_SR_NEXT_PROTO_B, SSL3_MT_NEXT_PROTO,
+            514,  /* See the payload format below */ &ok);
         if (!ok)
-                return((int)n);
+                return ((int)n);
 
         /* s->state doesn't reflect whether ChangeCipherSpec has been received
          * in this handshake, but s->s3->change_cipher_spec does (will be reset
          * by ssl3_get_finished). */
-        if (!s->s3->change_cipher_spec)
-                {
-                SSLerr(SSL_F_SSL3_GET_NEXT_PROTO,SSL_R_GOT_NEXT_PROTO_BEFORE_A_CCS);
+        if (!s->s3->change_cipher_spec) {
+                SSLerr(SSL_F_SSL3_GET_NEXT_PROTO, SSL_R_GOT_NEXT_PROTO_BEFORE_A_CCS);
                 return -1;
-                }
+        }
 
         if (n < 2)
-                return 0;  /* The body must be > 1 bytes long */
+                return 0;
+        /* The body must be > 1 bytes long */
 
-        p=(unsigned char *)s->init_msg;
+        p = (unsigned char *)s->init_msg;
 
         /* The payload looks like:
          *   uint8 proto_len;
@@ -3579,15 +3285,14 @@ int ssl3_get_next_proto(SSL *s)
                 return 0;
 
         s->next_proto_negotiated = OPENSSL_malloc(proto_len);
-        if (!s->next_proto_negotiated)
-                {
-                SSLerr(SSL_F_SSL3_GET_NEXT_PROTO,ERR_R_MALLOC_FAILURE);
+        if (!s->next_proto_negotiated) {
+                SSLerr(SSL_F_SSL3_GET_NEXT_PROTO, ERR_R_MALLOC_FAILURE);
                 return 0;
-                }
+        }
         memcpy(s->next_proto_negotiated, p + 1, proto_len);
         s->next_proto_negotiated_len = proto_len;
 
         return 1;
-        }
+}
 # endif
 #endif
diff --git a/src/lib/libssl/src/ssl/s3_clnt.c b/src/lib/libssl/src/ssl/s3_clnt.c
index 64e7be8d67..b9ca6b6f9b 100644
--- a/src/lib/libssl/src/ssl/s3_clnt.c
+++ b/src/lib/libssl/src/ssl/s3_clnt.c
@@ -168,62 +168,60 @@
 #endif
 
 static const SSL_METHOD *ssl3_get_client_method(int ver);
-static int ca_dn_cmp(const X509_NAME * const *a,const X509_NAME * const *b);
+static int ca_dn_cmp(const X509_NAME * const *a, const X509_NAME * const *b);
 
-static const SSL_METHOD *ssl3_get_client_method(int ver)
-        {
+static const SSL_METHOD
+*ssl3_get_client_method(int ver)
+{
         if (ver == SSL3_VERSION)
-                return(SSLv3_client_method());
+                return (SSLv3_client_method());
         else
-                return(NULL);
-        }
+                return (NULL);
+}
 
 IMPLEMENT_ssl3_meth_func(SSLv3_client_method,
-                        ssl_undefined_function,
-                        ssl3_connect,
-                        ssl3_get_client_method)
+    ssl_undefined_function, ssl3_connect, ssl3_get_client_method)
 
-int ssl3_connect(SSL *s)
-        {
-        BUF_MEM *buf=NULL;
-        unsigned long Time=(unsigned long)time(NULL);
-        void (*cb)(const SSL *ssl,int type,int val)=NULL;
-        int ret= -1;
-        int new_state,state,skip=0;
+int
+ssl3_connect(SSL *s)
+{
+        BUF_MEM *buf = NULL;
+        unsigned long Time = (unsigned long)time(NULL);
+        void (*cb)(const SSL *ssl, int type, int val) = NULL;
+        int ret = -1;
+        int new_state, state, skip = 0;
 
-        RAND_add(&Time,sizeof(Time),0);
+        RAND_add(&Time, sizeof(Time), 0);
         ERR_clear_error();
         errno = 0;
 
         if (s->info_callback != NULL)
-                cb=s->info_callback;
+                cb = s->info_callback;
         else if (s->ctx->info_callback != NULL)
-                cb=s->ctx->info_callback;
-        
+                cb = s->ctx->info_callback;
+
         s->in_handshake++;
-        if (!SSL_in_init(s) || SSL_in_before(s)) SSL_clear(s); 
+        if (!SSL_in_init(s) || SSL_in_before(s))
+                SSL_clear(s);
 
 #ifndef OPENSSL_NO_HEARTBEATS
         /* If we're awaiting a HeartbeatResponse, pretend we
          * already got and don't await it anymore, because
          * Heartbeats don't make sense during handshakes anyway.
          */
-        if (s->tlsext_hb_pending)
-                {
+        if (s->tlsext_hb_pending) {
                 s->tlsext_hb_pending = 0;
                 s->tlsext_hb_seq++;
-                }
+        }
 #endif
 
-        for (;;)
-                {
-                state=s->state;
+        for (;;) {
+                state = s->state;
 
-                switch(s->state)
-                        {
+                switch (s->state) {
                 case SSL_ST_RENEGOTIATE:
-                        s->renegotiate=1;
-                        s->state=SSL_ST_CONNECT;
+                        s->renegotiate = 1;
+                        s->state = SSL_ST_CONNECT;
                         s->ctx->stats.sess_connect_renegotiate++;
                         /* break */
                 case SSL_ST_BEFORE:
@@ -231,173 +229,172 @@ int ssl3_connect(SSL *s)
                 case SSL_ST_BEFORE|SSL_ST_CONNECT:
                 case SSL_ST_OK|SSL_ST_CONNECT:
 
-                        s->server=0;
-                        if (cb != NULL) cb(s,SSL_CB_HANDSHAKE_START,1);
+                        s->server = 0;
+                        if (cb != NULL)
+                                cb(s, SSL_CB_HANDSHAKE_START, 1);
 
-                        if ((s->version & 0xff00 ) != 0x0300)
-                                {
+                        if ((s->version & 0xff00 ) != 0x0300) {
                                 SSLerr(SSL_F_SSL3_CONNECT, ERR_R_INTERNAL_ERROR);
                                 ret = -1;
                                 goto end;
-                                }
-                                
+                        }
+
                         /* s->version=SSL3_VERSION; */
-                        s->type=SSL_ST_CONNECT;
+                        s->type = SSL_ST_CONNECT;
 
-                        if (s->init_buf == NULL)
-                                {
-                                if ((buf=BUF_MEM_new()) == NULL)
-                                        {
-                                        ret= -1;
+                        if (s->init_buf == NULL) {
+                                if ((buf = BUF_MEM_new()) == NULL) {
+                                        ret = -1;
                                         goto end;
-                                        }
-                                if (!BUF_MEM_grow(buf,SSL3_RT_MAX_PLAIN_LENGTH))
-                                        {
-                                        ret= -1;
+                                }
+                                if (!BUF_MEM_grow(buf, SSL3_RT_MAX_PLAIN_LENGTH)) {
+                                        ret = -1;
                                         goto end;
-                                        }
-                                s->init_buf=buf;
-                                buf=NULL;
                                 }
+                                s->init_buf = buf;
+                                buf = NULL;
+                        }
 
-                        if (!ssl3_setup_buffers(s)) { ret= -1; goto end; }
+                        if (!ssl3_setup_buffers(s)) {
+                                ret = -1;
+                                goto end;
+                        }
 
                         /* setup buffing BIO */
-                        if (!ssl_init_wbio_buffer(s,0)) { ret= -1; goto end; }
+                        if (!ssl_init_wbio_buffer(s, 0)) {
+                                ret = -1;
+                                goto end;
+                        }
 
                         /* don't push the buffering BIO quite yet */
 
                         ssl3_init_finished_mac(s);
 
-                        s->state=SSL3_ST_CW_CLNT_HELLO_A;
+                        s->state = SSL3_ST_CW_CLNT_HELLO_A;
                         s->ctx->stats.sess_connect++;
-                        s->init_num=0;
+                        s->init_num = 0;
                         break;
 
                 case SSL3_ST_CW_CLNT_HELLO_A:
                 case SSL3_ST_CW_CLNT_HELLO_B:
 
-                        s->shutdown=0;
-                        ret=ssl3_client_hello(s);
-                        if (ret <= 0) goto end;
-                        s->state=SSL3_ST_CR_SRVR_HELLO_A;
-                        s->init_num=0;
+                        s->shutdown = 0;
+                        ret = ssl3_client_hello(s);
+                        if (ret <= 0)
+                                goto end;
+                        s->state = SSL3_ST_CR_SRVR_HELLO_A;
+                        s->init_num = 0;
 
                         /* turn on buffering for the next lot of output */
                         if (s->bbio != s->wbio)
-                                s->wbio=BIO_push(s->bbio,s->wbio);
+                                s->wbio = BIO_push(s->bbio, s->wbio);
 
                         break;
 
                 case SSL3_ST_CR_SRVR_HELLO_A:
                 case SSL3_ST_CR_SRVR_HELLO_B:
-                        ret=ssl3_get_server_hello(s);
-                        if (ret <= 0) goto end;
+                        ret = ssl3_get_server_hello(s);
+                        if (ret <= 0)
+                                goto end;
 
-                        if (s->hit)
-                                {
-                                s->state=SSL3_ST_CR_FINISHED_A;
+                        if (s->hit) {
+                                s->state = SSL3_ST_CR_FINISHED_A;
 #ifndef OPENSSL_NO_TLSEXT
-                                if (s->tlsext_ticket_expected)
-                                        {
+                                if (s->tlsext_ticket_expected) {
                                         /* receive renewed session ticket */
-                                        s->state=SSL3_ST_CR_SESSION_TICKET_A;
-                                        }
-#endif
+                                        s->state = SSL3_ST_CR_SESSION_TICKET_A;
                                 }
-                        else
-                                s->state=SSL3_ST_CR_CERT_A;
-                        s->init_num=0;
+#endif
+                        } else
+                                s->state = SSL3_ST_CR_CERT_A;
+                        s->init_num = 0;
                         break;
 
                 case SSL3_ST_CR_CERT_A:
                 case SSL3_ST_CR_CERT_B:
 #ifndef OPENSSL_NO_TLSEXT
-                        ret=ssl3_check_finished(s);
-                        if (ret <= 0) goto end;
-                        if (ret == 2)
-                                {
+                        ret = ssl3_check_finished(s);
+                        if (ret <= 0)
+                                goto end;
+                        if (ret == 2) {
                                 s->hit = 1;
                                 if (s->tlsext_ticket_expected)
-                                        s->state=SSL3_ST_CR_SESSION_TICKET_A;
+                                        s->state = SSL3_ST_CR_SESSION_TICKET_A;
                                 else
-                                        s->state=SSL3_ST_CR_FINISHED_A;
-                                s->init_num=0;
+                                        s->state = SSL3_ST_CR_FINISHED_A;
+                                s->init_num = 0;
                                 break;
-                                }
+                        }
 #endif
                         /* Check if it is anon DH/ECDH */
                         /* or PSK */
                         if (!(s->s3->tmp.new_cipher->algorithm_auth & SSL_aNULL) &&
-                            !(s->s3->tmp.new_cipher->algorithm_mkey & SSL_kPSK))
-                                {
-                                ret=ssl3_get_server_certificate(s);
-                                if (ret <= 0) goto end;
+                                !(s->s3->tmp.new_cipher->algorithm_mkey & SSL_kPSK)) {
+                                ret = ssl3_get_server_certificate(s);
+                                if (ret <= 0)
+                                        goto end;
 #ifndef OPENSSL_NO_TLSEXT
                                 if (s->tlsext_status_expected)
-                                        s->state=SSL3_ST_CR_CERT_STATUS_A;
+                                        s->state = SSL3_ST_CR_CERT_STATUS_A;
                                 else
-                                        s->state=SSL3_ST_CR_KEY_EXCH_A;
-                                }
-                        else
-                                {
+                                        s->state = SSL3_ST_CR_KEY_EXCH_A;
+                        } else {
                                 skip = 1;
-                                s->state=SSL3_ST_CR_KEY_EXCH_A;
-                                }
+                                s->state = SSL3_ST_CR_KEY_EXCH_A;
+                        }
 #else
-                                }
-                        else
-                                skip=1;
+                        } else
+                                skip = 1;
 
-                        s->state=SSL3_ST_CR_KEY_EXCH_A;
+                        s->state = SSL3_ST_CR_KEY_EXCH_A;
 #endif
-                        s->init_num=0;
+                        s->init_num = 0;
                         break;
 
                 case SSL3_ST_CR_KEY_EXCH_A:
                 case SSL3_ST_CR_KEY_EXCH_B:
-                        ret=ssl3_get_key_exchange(s);
-                        if (ret <= 0) goto end;
-                        s->state=SSL3_ST_CR_CERT_REQ_A;
-                        s->init_num=0;
+                        ret = ssl3_get_key_exchange(s);
+                        if (ret <= 0)
+                                goto end;
+                        s->state = SSL3_ST_CR_CERT_REQ_A;
+                        s->init_num = 0;
 
                         /* at this point we check that we have the
                          * required stuff from the server */
-                        if (!ssl3_check_cert_and_algorithm(s))
-                                {
-                                ret= -1;
+                        if (!ssl3_check_cert_and_algorithm(s)) {
+                                ret = -1;
                                 goto end;
-                                }
+                        }
                         break;
 
                 case SSL3_ST_CR_CERT_REQ_A:
                 case SSL3_ST_CR_CERT_REQ_B:
-                        ret=ssl3_get_certificate_request(s);
-                        if (ret <= 0) goto end;
-                        s->state=SSL3_ST_CR_SRVR_DONE_A;
-                        s->init_num=0;
+                        ret = ssl3_get_certificate_request(s);
+                        if (ret <= 0)
+                                goto end;
+                        s->state = SSL3_ST_CR_SRVR_DONE_A;
+                        s->init_num = 0;
                         break;
 
                 case SSL3_ST_CR_SRVR_DONE_A:
                 case SSL3_ST_CR_SRVR_DONE_B:
-                        ret=ssl3_get_server_done(s);
-                        if (ret <= 0) goto end;
+                        ret = ssl3_get_server_done(s);
+                        if (ret <= 0)
+                                goto end;
 #ifndef OPENSSL_NO_SRP
-                        if (s->s3->tmp.new_cipher->algorithm_mkey & SSL_kSRP)
-                                {
-                                if ((ret = SRP_Calc_A_param(s))<=0)
-                                        {
-                                        SSLerr(SSL_F_SSL3_CONNECT,SSL_R_SRP_A_CALC);
-                                        ssl3_send_alert(s,SSL3_AL_FATAL,SSL_AD_INTERNAL_ERROR);
+                        if (s->s3->tmp.new_cipher->algorithm_mkey & SSL_kSRP) {
+                                if ((ret = SRP_Calc_A_param(s)) <= 0) {
+                                        SSLerr(SSL_F_SSL3_CONNECT, SSL_R_SRP_A_CALC);
+                                        ssl3_send_alert(s, SSL3_AL_FATAL, SSL_AD_INTERNAL_ERROR);
                                         goto end;
-                                        }
                                 }
+                        }
 #endif
                         if (s->s3->tmp.cert_req)
-                                s->state=SSL3_ST_CW_CERT_A;
+                                s->state = SSL3_ST_CW_CERT_A;
                         else
-                                s->state=SSL3_ST_CW_KEY_EXCH_A;
-                        s->init_num=0;
+                                s->state = SSL3_ST_CW_KEY_EXCH_A;
+                        s->init_num = 0;
 
                         break;
 
@@ -405,16 +402,18 @@ int ssl3_connect(SSL *s)
                 case SSL3_ST_CW_CERT_B:
                 case SSL3_ST_CW_CERT_C:
                 case SSL3_ST_CW_CERT_D:
-                        ret=ssl3_send_client_certificate(s);
-                        if (ret <= 0) goto end;
-                        s->state=SSL3_ST_CW_KEY_EXCH_A;
-                        s->init_num=0;
+                        ret = ssl3_send_client_certificate(s);
+                        if (ret <= 0)
+                                goto end;
+                        s->state = SSL3_ST_CW_KEY_EXCH_A;
+                        s->init_num = 0;
                         break;
 
                 case SSL3_ST_CW_KEY_EXCH_A:
                 case SSL3_ST_CW_KEY_EXCH_B:
-                        ret=ssl3_send_client_key_exchange(s);
-                        if (ret <= 0) goto end;
+                        ret = ssl3_send_client_key_exchange(s);
+                        if (ret <= 0)
+                                goto end;
                         /* EAY EAY EAY need to check for DH fix cert
                          * sent back */
                         /* For TLS, cert_req is set to 2, so a cert chain
@@ -426,170 +425,165 @@ int ssl3_connect(SSL *s)
                          * message when client's ECDH public key is sent 
                          * inside the client certificate.
                          */
-                        if (s->s3->tmp.cert_req == 1)
-                                {
-                                s->state=SSL3_ST_CW_CERT_VRFY_A;
-                                }
-                        else
-                                {
-                                s->state=SSL3_ST_CW_CHANGE_A;
-                                s->s3->change_cipher_spec=0;
-                                }
-                        if (s->s3->flags & TLS1_FLAGS_SKIP_CERT_VERIFY)
-                                {
-                                s->state=SSL3_ST_CW_CHANGE_A;
-                                s->s3->change_cipher_spec=0;
-                                }
+                        if (s->s3->tmp.cert_req == 1) {
+                                s->state = SSL3_ST_CW_CERT_VRFY_A;
+                        } else {
+                                s->state = SSL3_ST_CW_CHANGE_A;
+                                s->s3->change_cipher_spec = 0;
+                        }
+                        if (s->s3->flags & TLS1_FLAGS_SKIP_CERT_VERIFY) {
+                                s->state = SSL3_ST_CW_CHANGE_A;
+                                s->s3->change_cipher_spec = 0;
+                        }
 
-                        s->init_num=0;
+                        s->init_num = 0;
                         break;
 
                 case SSL3_ST_CW_CERT_VRFY_A:
                 case SSL3_ST_CW_CERT_VRFY_B:
-                        ret=ssl3_send_client_verify(s);
-                        if (ret <= 0) goto end;
-                        s->state=SSL3_ST_CW_CHANGE_A;
-                        s->init_num=0;
-                        s->s3->change_cipher_spec=0;
+                        ret = ssl3_send_client_verify(s);
+                        if (ret <= 0)
+                                goto end;
+                        s->state = SSL3_ST_CW_CHANGE_A;
+                        s->init_num = 0;
+                        s->s3->change_cipher_spec = 0;
                         break;
 
                 case SSL3_ST_CW_CHANGE_A:
                 case SSL3_ST_CW_CHANGE_B:
-                        ret=ssl3_send_change_cipher_spec(s,
-                                SSL3_ST_CW_CHANGE_A,SSL3_ST_CW_CHANGE_B);
-                        if (ret <= 0) goto end;
+                        ret = ssl3_send_change_cipher_spec(s,
+                        SSL3_ST_CW_CHANGE_A, SSL3_ST_CW_CHANGE_B);
+                        if (ret <= 0)
+                                goto end;
 
 #if defined(OPENSSL_NO_TLSEXT) || defined(OPENSSL_NO_NEXTPROTONEG)
-                        s->state=SSL3_ST_CW_FINISHED_A;
+                        s->state = SSL3_ST_CW_FINISHED_A;
 #else
                         if (s->s3->next_proto_neg_seen)
-                                s->state=SSL3_ST_CW_NEXT_PROTO_A;
+                                s->state = SSL3_ST_CW_NEXT_PROTO_A;
                         else
-                                s->state=SSL3_ST_CW_FINISHED_A;
+                                s->state = SSL3_ST_CW_FINISHED_A;
 #endif
-                        s->init_num=0;
+                        s->init_num = 0;
 
-                        s->session->cipher=s->s3->tmp.new_cipher;
+                        s->session->cipher = s->s3->tmp.new_cipher;
 #ifdef OPENSSL_NO_COMP
-                        s->session->compress_meth=0;
+                        s->session->compress_meth = 0;
 #else
                         if (s->s3->tmp.new_compression == NULL)
-                                s->session->compress_meth=0;
+                                s->session->compress_meth = 0;
                         else
-                                s->session->compress_meth=
-                                        s->s3->tmp.new_compression->id;
+                                s->session->compress_meth =
+                        s->s3->tmp.new_compression->id;
 #endif
-                        if (!s->method->ssl3_enc->setup_key_block(s))
-                                {
-                                ret= -1;
+                        if (!s->method->ssl3_enc->setup_key_block(s)) {
+                                ret = -1;
                                 goto end;
-                                }
+                        }
 
                         if (!s->method->ssl3_enc->change_cipher_state(s,
-                                SSL3_CHANGE_CIPHER_CLIENT_WRITE))
-                                {
-                                ret= -1;
+                                SSL3_CHANGE_CIPHER_CLIENT_WRITE)) {
+                                ret = -1;
                                 goto end;
-                                }
+                        }
 
                         break;
 
 #if !defined(OPENSSL_NO_TLSEXT) && !defined(OPENSSL_NO_NEXTPROTONEG)
                 case SSL3_ST_CW_NEXT_PROTO_A:
                 case SSL3_ST_CW_NEXT_PROTO_B:
-                        ret=ssl3_send_next_proto(s);
-                        if (ret <= 0) goto end;
-                        s->state=SSL3_ST_CW_FINISHED_A;
+                        ret = ssl3_send_next_proto(s);
+                        if (ret <= 0)
+                                goto end;
+                        s->state = SSL3_ST_CW_FINISHED_A;
                         break;
 #endif
 
                 case SSL3_ST_CW_FINISHED_A:
                 case SSL3_ST_CW_FINISHED_B:
-                        ret=ssl3_send_finished(s,
-                                SSL3_ST_CW_FINISHED_A,SSL3_ST_CW_FINISHED_B,
-                                s->method->ssl3_enc->client_finished_label,
-                                s->method->ssl3_enc->client_finished_label_len);
-                        if (ret <= 0) goto end;
-                        s->state=SSL3_ST_CW_FLUSH;
+                        ret = ssl3_send_finished(s,
+                        SSL3_ST_CW_FINISHED_A, SSL3_ST_CW_FINISHED_B,
+                        s->method->ssl3_enc->client_finished_label,
+                        s->method->ssl3_enc->client_finished_label_len);
+                        if (ret <= 0)
+                                goto end;
+                        s->state = SSL3_ST_CW_FLUSH;
 
                         /* clear flags */
-                        s->s3->flags&= ~SSL3_FLAGS_POP_BUFFER;
-                        if (s->hit)
-                                {
-                                s->s3->tmp.next_state=SSL_ST_OK;
-                                if (s->s3->flags & SSL3_FLAGS_DELAY_CLIENT_FINISHED)
-                                        {
-                                        s->state=SSL_ST_OK;
+                        s->s3->flags &= ~SSL3_FLAGS_POP_BUFFER;
+                        if (s->hit) {
+                                s->s3->tmp.next_state = SSL_ST_OK;
+                                if (s->s3->flags & SSL3_FLAGS_DELAY_CLIENT_FINISHED) {
+                                        s->state = SSL_ST_OK;
                                         s->s3->flags|=SSL3_FLAGS_POP_BUFFER;
-                                        s->s3->delay_buf_pop_ret=0;
-                                        }
+                                        s->s3->delay_buf_pop_ret = 0;
                                 }
-                        else
-                                {
+                        } else {
 #ifndef OPENSSL_NO_TLSEXT
                                 /* Allow NewSessionTicket if ticket expected */
                                 if (s->tlsext_ticket_expected)
-                                        s->s3->tmp.next_state=SSL3_ST_CR_SESSION_TICKET_A;
+                                        s->s3->tmp.next_state = SSL3_ST_CR_SESSION_TICKET_A;
                                 else
 #endif
-                                
-                                s->s3->tmp.next_state=SSL3_ST_CR_FINISHED_A;
-                                }
-                        s->init_num=0;
+
+                                s->s3->tmp.next_state = SSL3_ST_CR_FINISHED_A;
+                        }
+                        s->init_num = 0;
                         break;
 
 #ifndef OPENSSL_NO_TLSEXT
                 case SSL3_ST_CR_SESSION_TICKET_A:
                 case SSL3_ST_CR_SESSION_TICKET_B:
-                        ret=ssl3_get_new_session_ticket(s);
-                        if (ret <= 0) goto end;
-                        s->state=SSL3_ST_CR_FINISHED_A;
-                        s->init_num=0;
-                break;
+                        ret = ssl3_get_new_session_ticket(s);
+                        if (ret <= 0)
+                                goto end;
+                        s->state = SSL3_ST_CR_FINISHED_A;
+                        s->init_num = 0;
+                        break;
 
                 case SSL3_ST_CR_CERT_STATUS_A:
                 case SSL3_ST_CR_CERT_STATUS_B:
-                        ret=ssl3_get_cert_status(s);
-                        if (ret <= 0) goto end;
-                        s->state=SSL3_ST_CR_KEY_EXCH_A;
-                        s->init_num=0;
-                break;
+                        ret = ssl3_get_cert_status(s);
+                        if (ret <= 0)
+                                goto end;
+                        s->state = SSL3_ST_CR_KEY_EXCH_A;
+                        s->init_num = 0;
+                        break;
 #endif
 
                 case SSL3_ST_CR_FINISHED_A:
                 case SSL3_ST_CR_FINISHED_B:
 
-                        ret=ssl3_get_finished(s,SSL3_ST_CR_FINISHED_A,
-                                SSL3_ST_CR_FINISHED_B);
-                        if (ret <= 0) goto end;
+                        ret = ssl3_get_finished(s, SSL3_ST_CR_FINISHED_A,
+                            SSL3_ST_CR_FINISHED_B);
+                        if (ret <= 0)
+                                goto end;
 
                         if (s->hit)
-                                s->state=SSL3_ST_CW_CHANGE_A;
+                                s->state = SSL3_ST_CW_CHANGE_A;
                         else
-                                s->state=SSL_ST_OK;
-                        s->init_num=0;
+                                s->state = SSL_ST_OK;
+                        s->init_num = 0;
                         break;
 
                 case SSL3_ST_CW_FLUSH:
-                        s->rwstate=SSL_WRITING;
-                        if (BIO_flush(s->wbio) <= 0)
-                                {
-                                ret= -1;
+                        s->rwstate = SSL_WRITING;
+                        if (BIO_flush(s->wbio) <= 0) {
+                                ret = -1;
                                 goto end;
-                                }
-                        s->rwstate=SSL_NOTHING;
-                        s->state=s->s3->tmp.next_state;
+                        }
+                        s->rwstate = SSL_NOTHING;
+                        s->state = s->s3->tmp.next_state;
                         break;
 
                 case SSL_ST_OK:
                         /* clean a few things up */
                         ssl3_cleanup_key_block(s);
 
-                        if (s->init_buf != NULL)
-                                {
+                        if (s->init_buf != NULL) {
                                 BUF_MEM_free(s->init_buf);
-                                s->init_buf=NULL;
-                                }
+                                s->init_buf = NULL;
+                        }
 
                         /* If we are not 'joining' the last two packets,
                          * remove the buffering now */
@@ -597,63 +591,63 @@ int ssl3_connect(SSL *s)
                                 ssl_free_wbio_buffer(s);
                         /* else do it later in ssl3_write */
 
-                        s->init_num=0;
-                        s->renegotiate=0;
-                        s->new_session=0;
+                        s->init_num = 0;
+                        s->renegotiate = 0;
+                        s->new_session = 0;
 
-                        ssl_update_cache(s,SSL_SESS_CACHE_CLIENT);
-                        if (s->hit) s->ctx->stats.sess_hit++;
+                        ssl_update_cache(s, SSL_SESS_CACHE_CLIENT);
+                        if (s->hit)
+                                s->ctx->stats.sess_hit++;
 
-                        ret=1;
+                        ret = 1;
                         /* s->server=0; */
-                        s->handshake_func=ssl3_connect;
+                        s->handshake_func = ssl3_connect;
                         s->ctx->stats.sess_connect_good++;
 
-                        if (cb != NULL) cb(s,SSL_CB_HANDSHAKE_DONE,1);
+                        if (cb != NULL)
+                                cb(s, SSL_CB_HANDSHAKE_DONE, 1);
 
                         goto end;
                         /* break; */
-                        
+
                 default:
-                        SSLerr(SSL_F_SSL3_CONNECT,SSL_R_UNKNOWN_STATE);
-                        ret= -1;
+                        SSLerr(SSL_F_SSL3_CONNECT, SSL_R_UNKNOWN_STATE);
+                        ret = -1;
                         goto end;
                         /* break; */
-                        }
+                }
 
                 /* did we do anything */
-                if (!s->s3->tmp.reuse_message && !skip)
-                        {
-                        if (s->debug)
-                                {
-                                if ((ret=BIO_flush(s->wbio)) <= 0)
+                if (!s->s3->tmp.reuse_message && !skip) {
+                        if (s->debug) {
+                                if ((ret = BIO_flush(s->wbio)) <= 0)
                                         goto end;
-                                }
+                        }
 
-                        if ((cb != NULL) && (s->state != state))
-                                {
-                                new_state=s->state;
-                                s->state=state;
-                                cb(s,SSL_CB_CONNECT_LOOP,1);
-                                s->state=new_state;
-                                }
+                        if ((cb != NULL) && (s->state != state)) {
+                                new_state = s->state;
+                                s->state = state;
+                                cb(s, SSL_CB_CONNECT_LOOP, 1);
+                                s->state = new_state;
                         }
-                skip=0;
                 }
+                skip = 0;
+        }
 end:
         s->in_handshake--;
         if (buf != NULL)
                 BUF_MEM_free(buf);
         if (cb != NULL)
-                cb(s,SSL_CB_CONNECT_EXIT,ret);
-        return(ret);
-        }
+                cb(s, SSL_CB_CONNECT_EXIT, ret);
+        return (ret);
+}
 
 
-int ssl3_client_hello(SSL *s)
-        {
+int
+ssl3_client_hello(SSL *s)
+{
         unsigned char *buf;
-        unsigned char *p,*d;
+        unsigned char *p, *d;
         int i;
         unsigned long l;
 #ifndef OPENSSL_NO_COMP
@@ -661,31 +655,29 @@ int ssl3_client_hello(SSL *s)
         SSL_COMP *comp;
 #endif
 
-        buf=(unsigned char *)s->init_buf->data;
-        if (s->state == SSL3_ST_CW_CLNT_HELLO_A)
-                {
+        buf = (unsigned char *)s->init_buf->data;
+        if (s->state == SSL3_ST_CW_CLNT_HELLO_A) {
                 SSL_SESSION *sess = s->session;
                 if ((sess == NULL) ||
-                        (sess->ssl_version != s->version) ||
+                    (sess->ssl_version != s->version) ||
 #ifdef OPENSSL_NO_TLSEXT
-                        !sess->session_id_length ||
+                    !sess->session_id_length ||
 #else
-                        (!sess->session_id_length && !sess->tlsext_tick) ||
+                    (!sess->session_id_length && !sess->tlsext_tick) ||
 #endif
-                        (sess->not_resumable))
-                        {
-                        if (!ssl_get_new_session(s,0))
+                    (sess->not_resumable)) {
+                        if (!ssl_get_new_session(s, 0))
                                 goto err;
-                        }
+                }
                 /* else use the pre-loaded session */
 
-                p=s->s3->client_random;
+                p = s->s3->client_random;
 
                 if (ssl_fill_hello_random(s, 0, p, SSL3_RANDOM_SIZE) <= 0)
                         goto err;
 
                 /* Do the message type and length last */
-                d=p= &(buf[4]);
+                d = p= &(buf[4]);
 
                 /* version indicates the negotiated version: for example from
                  * an SSLv2/v3 compatible client hello). The client_version
@@ -717,562 +709,510 @@ int ssl3_client_hello(SSL *s)
                  * the negotiated version.
                  */
 #if 0
-                *(p++)=s->version>>8;
-                *(p++)=s->version&0xff;
-                s->client_version=s->version;
+                *(p++) = s->version >> 8;
+                *(p++) = s->version&0xff;
+                s->client_version = s->version;
 #else
-                *(p++)=s->client_version>>8;
-                *(p++)=s->client_version&0xff;
+                *(p++) = s->client_version >> 8;
+                *(p++) = s->client_version&0xff;
 #endif
 
                 /* Random stuff */
-                memcpy(p,s->s3->client_random,SSL3_RANDOM_SIZE);
-                p+=SSL3_RANDOM_SIZE;
+                memcpy(p, s->s3->client_random, SSL3_RANDOM_SIZE);
+                p += SSL3_RANDOM_SIZE;
 
                 /* Session ID */
                 if (s->new_session)
-                        i=0;
+                        i = 0;
                 else
-                        i=s->session->session_id_length;
-                *(p++)=i;
-                if (i != 0)
-                        {
-                        if (i > (int)sizeof(s->session->session_id))
-                                {
+                        i = s->session->session_id_length;
+                *(p++) = i;
+                if (i != 0) {
+                        if (i > (int)sizeof(s->session->session_id)) {
                                 SSLerr(SSL_F_SSL3_CLIENT_HELLO, ERR_R_INTERNAL_ERROR);
                                 goto err;
-                                }
-                        memcpy(p,s->session->session_id,i);
-                        p+=i;
                         }
-                
+                        memcpy(p, s->session->session_id, i);
+                        p += i;
+                }
+
                 /* Ciphers supported */
-                i=ssl_cipher_list_to_bytes(s,SSL_get_ciphers(s),&(p[2]),0);
-                if (i == 0)
-                        {
-                        SSLerr(SSL_F_SSL3_CLIENT_HELLO,SSL_R_NO_CIPHERS_AVAILABLE);
+                i = ssl_cipher_list_to_bytes(s, SSL_get_ciphers(s), &(p[2]), 0);
+                if (i == 0) {
+                        SSLerr(SSL_F_SSL3_CLIENT_HELLO, SSL_R_NO_CIPHERS_AVAILABLE);
                         goto err;
-                        }
+                }
 #ifdef OPENSSL_MAX_TLS1_2_CIPHER_LENGTH
                         /* Some servers hang if client hello > 256 bytes
                          * as hack workaround chop number of supported ciphers
                          * to keep it well below this if we use TLS v1.2
                          */
-                        if (TLS1_get_version(s) >= TLS1_2_VERSION
-                                && i > OPENSSL_MAX_TLS1_2_CIPHER_LENGTH)
-                                i = OPENSSL_MAX_TLS1_2_CIPHER_LENGTH & ~1;
+                if (TLS1_get_version(s) >= TLS1_2_VERSION &&
+                    i > OPENSSL_MAX_TLS1_2_CIPHER_LENGTH)
+                        i = OPENSSL_MAX_TLS1_2_CIPHER_LENGTH & ~1;
 #endif
-                s2n(i,p);
-                p+=i;
+                s2n(i, p);
+                p += i;
 
                 /* COMPRESSION */
 #ifdef OPENSSL_NO_COMP
-                *(p++)=1;
+                *(p++) = 1;
 #else
 
-                if ((s->options & SSL_OP_NO_COMPRESSION)
-                                        || !s->ctx->comp_methods)
-                        j=0;
+                if ((s->options & SSL_OP_NO_COMPRESSION) ||
+                    !s->ctx->comp_methods)
+                        j = 0;
                 else
-                        j=sk_SSL_COMP_num(s->ctx->comp_methods);
-                *(p++)=1+j;
-                for (i=0; i<j; i++)
-                        {
-                        comp=sk_SSL_COMP_value(s->ctx->comp_methods,i);
-                        *(p++)=comp->id;
-                        }
+                        j = sk_SSL_COMP_num(s->ctx->comp_methods);
+                *(p++) = 1 + j;
+                for (i = 0; i < j; i++) {
+                        comp = sk_SSL_COMP_value(s->ctx->comp_methods, i);
+                        *(p++) = comp->id;
+                }
 #endif
-                *(p++)=0; /* Add the NULL method */
+                *(p++) = 0; /* Add the NULL method */
 
 #ifndef OPENSSL_NO_TLSEXT
                 /* TLS extensions*/
-                if (ssl_prepare_clienthello_tlsext(s) <= 0)
-                        {
-                        SSLerr(SSL_F_SSL3_CLIENT_HELLO,SSL_R_CLIENTHELLO_TLSEXT);
+                if (ssl_prepare_clienthello_tlsext(s) <= 0) {
+                        SSLerr(SSL_F_SSL3_CLIENT_HELLO, SSL_R_CLIENTHELLO_TLSEXT);
                         goto err;
-                        }
-                if ((p = ssl_add_clienthello_tlsext(s, p, buf+SSL3_RT_MAX_PLAIN_LENGTH)) == NULL)
-                        {
-                        SSLerr(SSL_F_SSL3_CLIENT_HELLO,ERR_R_INTERNAL_ERROR);
+                }
+                if ((p = ssl_add_clienthello_tlsext(s, p, buf + SSL3_RT_MAX_PLAIN_LENGTH)) == NULL) {
+                        SSLerr(SSL_F_SSL3_CLIENT_HELLO, ERR_R_INTERNAL_ERROR);
                         goto err;
-                        }
+                }
 #endif
-                
-                l=(p-d);
-                d=buf;
-                *(d++)=SSL3_MT_CLIENT_HELLO;
-                l2n3(l,d);
 
-                s->state=SSL3_ST_CW_CLNT_HELLO_B;
+                l = (p - d);
+                d = buf;
+                *(d++) = SSL3_MT_CLIENT_HELLO;
+                l2n3(l, d);
+
+                s->state = SSL3_ST_CW_CLNT_HELLO_B;
                 /* number of bytes to write */
-                s->init_num=p-buf;
-                s->init_off=0;
-                }
+                s->init_num = p - buf;
+                s->init_off = 0;
+        }
 
         /* SSL3_ST_CW_CLNT_HELLO_B */
-        return(ssl3_do_write(s,SSL3_RT_HANDSHAKE));
+        return (ssl3_do_write(s, SSL3_RT_HANDSHAKE));
 err:
-        return(-1);
-        }
+        return (-1);
+}
 
-int ssl3_get_server_hello(SSL *s)
-        {
+int
+ssl3_get_server_hello(SSL *s)
+{
         STACK_OF(SSL_CIPHER) *sk;
         const SSL_CIPHER *c;
-        unsigned char *p,*d;
-        int i,al,ok;
+        unsigned char *p, *d;
+        int i, al, ok;
         unsigned int j;
         long n;
 #ifndef OPENSSL_NO_COMP
         SSL_COMP *comp;
 #endif
 
-        n=s->method->ssl_get_message(s,
-                SSL3_ST_CR_SRVR_HELLO_A,
-                SSL3_ST_CR_SRVR_HELLO_B,
-                -1,
-                20000, /* ?? */
-                &ok);
+        n = s->method->ssl_get_message(s, SSL3_ST_CR_SRVR_HELLO_A,
+            SSL3_ST_CR_SRVR_HELLO_B, -1, 20000, /* ?? */ &ok);
 
-        if (!ok) return((int)n);
+        if (!ok)
+                return ((int)n);
 
-        if ( SSL_version(s) == DTLS1_VERSION || SSL_version(s) == DTLS1_BAD_VER)
-                {
-                if ( s->s3->tmp.message_type == DTLS1_MT_HELLO_VERIFY_REQUEST)
-                        {
-                        if ( s->d1->send_cookie == 0)
-                                {
+        if (SSL_version(s) == DTLS1_VERSION || SSL_version(s) == DTLS1_BAD_VER) {
+                if (s->s3->tmp.message_type == DTLS1_MT_HELLO_VERIFY_REQUEST) {
+                        if (s->d1->send_cookie == 0) {
                                 s->s3->tmp.reuse_message = 1;
                                 return 1;
-                                }
+                        }
                         else /* already sent a cookie */
-                                {
-                                al=SSL_AD_UNEXPECTED_MESSAGE;
-                                SSLerr(SSL_F_SSL3_GET_SERVER_HELLO,SSL_R_BAD_MESSAGE_TYPE);
+                        {
+                                al = SSL_AD_UNEXPECTED_MESSAGE;
+                                SSLerr(SSL_F_SSL3_GET_SERVER_HELLO, SSL_R_BAD_MESSAGE_TYPE);
                                 goto f_err;
-                                }
                         }
                 }
-        
-        if ( s->s3->tmp.message_type != SSL3_MT_SERVER_HELLO)
-                {
-                al=SSL_AD_UNEXPECTED_MESSAGE;
-                SSLerr(SSL_F_SSL3_GET_SERVER_HELLO,SSL_R_BAD_MESSAGE_TYPE);
+        }
+
+        if (s->s3->tmp.message_type != SSL3_MT_SERVER_HELLO) {
+                al = SSL_AD_UNEXPECTED_MESSAGE;
+                SSLerr(SSL_F_SSL3_GET_SERVER_HELLO, SSL_R_BAD_MESSAGE_TYPE);
                 goto f_err;
-                }
+        }
 
-        d=p=(unsigned char *)s->init_msg;
+        d = p=(unsigned char *)s->init_msg;
 
-        if ((p[0] != (s->version>>8)) || (p[1] != (s->version&0xff)))
-                {
-                SSLerr(SSL_F_SSL3_GET_SERVER_HELLO,SSL_R_WRONG_SSL_VERSION);
-                s->version=(s->version&0xff00)|p[1];
-                al=SSL_AD_PROTOCOL_VERSION;
+        if ((p[0] != (s->version >> 8)) || (p[1] != (s->version & 0xff))) {
+                SSLerr(SSL_F_SSL3_GET_SERVER_HELLO, SSL_R_WRONG_SSL_VERSION);
+                s->version = (s->version&0xff00)|p[1];
+                al = SSL_AD_PROTOCOL_VERSION;
                 goto f_err;
-                }
-        p+=2;
+        }
+        p += 2;
 
         /* load the server hello data */
         /* load the server random */
-        memcpy(s->s3->server_random,p,SSL3_RANDOM_SIZE);
-        p+=SSL3_RANDOM_SIZE;
+        memcpy(s->s3->server_random, p, SSL3_RANDOM_SIZE);
+        p += SSL3_RANDOM_SIZE;
 
         /* get the session-id */
         j= *(p++);
 
-        if ((j > sizeof s->session->session_id) || (j > SSL3_SESSION_ID_SIZE))
-                {
-                al=SSL_AD_ILLEGAL_PARAMETER;
-                SSLerr(SSL_F_SSL3_GET_SERVER_HELLO,SSL_R_SSL3_SESSION_ID_TOO_LONG);
+        if ((j > sizeof s->session->session_id) || (j > SSL3_SESSION_ID_SIZE)) {
+                al = SSL_AD_ILLEGAL_PARAMETER;
+                SSLerr(SSL_F_SSL3_GET_SERVER_HELLO, SSL_R_SSL3_SESSION_ID_TOO_LONG);
                 goto f_err;
-                }
+        }
 
 #ifndef OPENSSL_NO_TLSEXT
         /* check if we want to resume the session based on external pre-shared secret */
-        if (s->version >= TLS1_VERSION && s->tls_session_secret_cb)
-                {
-                SSL_CIPHER *pref_cipher=NULL;
-                s->session->master_key_length=sizeof(s->session->master_key);
+        if (s->version >= TLS1_VERSION && s->tls_session_secret_cb) {
+                SSL_CIPHER *pref_cipher = NULL;
+                s->session->master_key_length = sizeof(s->session->master_key);
                 if (s->tls_session_secret_cb(s, s->session->master_key,
-                                             &s->session->master_key_length,
-                                             NULL, &pref_cipher,
-                                             s->tls_session_secret_cb_arg))
-                        {
+                    &s->session->master_key_length, NULL, &pref_cipher,
+                    s->tls_session_secret_cb_arg)) {
                         s->session->cipher = pref_cipher ?
-                                pref_cipher : ssl_get_cipher_by_char(s, p+j);
-                        }
+                        pref_cipher : ssl_get_cipher_by_char(s, p + j);
                 }
+        }
 #endif /* OPENSSL_NO_TLSEXT */
 
-        if (j != 0 && j == s->session->session_id_length
-            && memcmp(p,s->session->session_id,j) == 0)
-            {
-            if(s->sid_ctx_length != s->session->sid_ctx_length
-               || memcmp(s->session->sid_ctx,s->sid_ctx,s->sid_ctx_length))
-                {
-                /* actually a client application bug */
-                al=SSL_AD_ILLEGAL_PARAMETER;
-                SSLerr(SSL_F_SSL3_GET_SERVER_HELLO,SSL_R_ATTEMPT_TO_REUSE_SESSION_IN_DIFFERENT_CONTEXT);
-                goto f_err;
+        if (j != 0 && j == s->session->session_id_length &&
+            memcmp(p, s->session->session_id, j) == 0) {
+                if (s->sid_ctx_length != s->session->sid_ctx_length ||
+                    memcmp(s->session->sid_ctx, s->sid_ctx, s->sid_ctx_length)) {
+                        /* actually a client application bug */
+                        al = SSL_AD_ILLEGAL_PARAMETER;
+                        SSLerr(SSL_F_SSL3_GET_SERVER_HELLO, SSL_R_ATTEMPT_TO_REUSE_SESSION_IN_DIFFERENT_CONTEXT);
+                        goto f_err;
                 }
-            s->hit=1;
-            }
+                s->hit = 1;
+        }
         else    /* a miss or crap from the other end */
-                {
+        {
                 /* If we were trying for session-id reuse, make a new
                  * SSL_SESSION so we don't stuff up other people */
-                s->hit=0;
-                if (s->session->session_id_length > 0)
-                        {
-                        if (!ssl_get_new_session(s,0))
-                                {
-                                al=SSL_AD_INTERNAL_ERROR;
+                s->hit = 0;
+                if (s->session->session_id_length > 0) {
+                        if (!ssl_get_new_session(s, 0)) {
+                                al = SSL_AD_INTERNAL_ERROR;
                                 goto f_err;
-                                }
                         }
-                s->session->session_id_length=j;
-                memcpy(s->session->session_id,p,j); /* j could be 0 */
                 }
-        p+=j;
-        c=ssl_get_cipher_by_char(s,p);
-        if (c == NULL)
-                {
+                s->session->session_id_length = j;
+                memcpy(s->session->session_id,p,j); /* j could be 0 */
+        }
+        p += j;
+        c = ssl_get_cipher_by_char(s, p);
+        if (c == NULL) {
                 /* unknown cipher */
-                al=SSL_AD_ILLEGAL_PARAMETER;
-                SSLerr(SSL_F_SSL3_GET_SERVER_HELLO,SSL_R_UNKNOWN_CIPHER_RETURNED);
+                al = SSL_AD_ILLEGAL_PARAMETER;
+                SSLerr(SSL_F_SSL3_GET_SERVER_HELLO, SSL_R_UNKNOWN_CIPHER_RETURNED);
                 goto f_err;
-                }
+        }
         /* TLS v1.2 only ciphersuites require v1.2 or later */
-        if ((c->algorithm_ssl & SSL_TLSV1_2) && 
-                (TLS1_get_version(s) < TLS1_2_VERSION))
-                {
-                al=SSL_AD_ILLEGAL_PARAMETER;
-                SSLerr(SSL_F_SSL3_GET_SERVER_HELLO,SSL_R_WRONG_CIPHER_RETURNED);
+        if ((c->algorithm_ssl & SSL_TLSV1_2) &&
+            (TLS1_get_version(s) < TLS1_2_VERSION)) {
+                al = SSL_AD_ILLEGAL_PARAMETER;
+                SSLerr(SSL_F_SSL3_GET_SERVER_HELLO, SSL_R_WRONG_CIPHER_RETURNED);
                 goto f_err;
-                }
-        p+=ssl_put_cipher_by_char(s,NULL,NULL);
+        }
+        p += ssl_put_cipher_by_char(s, NULL, NULL);
 
-        sk=ssl_get_ciphers_by_id(s);
-        i=sk_SSL_CIPHER_find(sk,c);
-        if (i < 0)
-                {
+        sk = ssl_get_ciphers_by_id(s);
+        i = sk_SSL_CIPHER_find(sk, c);
+        if (i < 0) {
                 /* we did not say we would use this cipher */
-                al=SSL_AD_ILLEGAL_PARAMETER;
-                SSLerr(SSL_F_SSL3_GET_SERVER_HELLO,SSL_R_WRONG_CIPHER_RETURNED);
+                al = SSL_AD_ILLEGAL_PARAMETER;
+                SSLerr(SSL_F_SSL3_GET_SERVER_HELLO, SSL_R_WRONG_CIPHER_RETURNED);
                 goto f_err;
-                }
+        }
 
         /* Depending on the session caching (internal/external), the cipher
            and/or cipher_id values may not be set. Make sure that
            cipher_id is set and use it for comparison. */
         if (s->session->cipher)
                 s->session->cipher_id = s->session->cipher->id;
-        if (s->hit && (s->session->cipher_id != c->id))
-                {
+        if (s->hit && (s->session->cipher_id != c->id)) {
 /* Workaround is now obsolete */
 #if 0
-                if (!(s->options &
-                        SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG))
+                if (!(s->options & SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG))
 #endif
-                        {
-                        al=SSL_AD_ILLEGAL_PARAMETER;
-                        SSLerr(SSL_F_SSL3_GET_SERVER_HELLO,SSL_R_OLD_SESSION_CIPHER_NOT_RETURNED);
+                {
+                        al = SSL_AD_ILLEGAL_PARAMETER;
+                        SSLerr(SSL_F_SSL3_GET_SERVER_HELLO, SSL_R_OLD_SESSION_CIPHER_NOT_RETURNED);
                         goto f_err;
-                        }
                 }
-        s->s3->tmp.new_cipher=c;
+        }
+        s->s3->tmp.new_cipher = c;
         /* Don't digest cached records if TLS v1.2: we may need them for
          * client authentication.
          */
-        if (TLS1_get_version(s) < TLS1_2_VERSION && !ssl3_digest_cached_records(s))
-                {
+        if (TLS1_get_version(s) < TLS1_2_VERSION && !ssl3_digest_cached_records(s)) {
                 al = SSL_AD_INTERNAL_ERROR;
                 goto f_err;
-                }
+        }
         /* lets get the compression algorithm */
         /* COMPRESSION */
 #ifdef OPENSSL_NO_COMP
-        if (*(p++) != 0)
-                {
-                al=SSL_AD_ILLEGAL_PARAMETER;
-                SSLerr(SSL_F_SSL3_GET_SERVER_HELLO,SSL_R_UNSUPPORTED_COMPRESSION_ALGORITHM);
+        if (*(p++) != 0) {
+                al = SSL_AD_ILLEGAL_PARAMETER;
+                SSLerr(SSL_F_SSL3_GET_SERVER_HELLO, SSL_R_UNSUPPORTED_COMPRESSION_ALGORITHM);
                 goto f_err;
-                }
+        }
         /* If compression is disabled we'd better not try to resume a session
          * using compression.
          */
-        if (s->session->compress_meth != 0)
-                {
-                al=SSL_AD_INTERNAL_ERROR;
-                SSLerr(SSL_F_SSL3_GET_SERVER_HELLO,SSL_R_INCONSISTENT_COMPRESSION);
+        if (s->session->compress_meth != 0) {
+                al = SSL_AD_INTERNAL_ERROR;
+                SSLerr(SSL_F_SSL3_GET_SERVER_HELLO, SSL_R_INCONSISTENT_COMPRESSION);
                 goto f_err;
-                }
+        }
 #else
         j= *(p++);
-        if (s->hit && j != s->session->compress_meth)
-                {
-                al=SSL_AD_ILLEGAL_PARAMETER;
-                SSLerr(SSL_F_SSL3_GET_SERVER_HELLO,SSL_R_OLD_SESSION_COMPRESSION_ALGORITHM_NOT_RETURNED);
+        if (s->hit && j != s->session->compress_meth) {
+                al = SSL_AD_ILLEGAL_PARAMETER;
+                SSLerr(SSL_F_SSL3_GET_SERVER_HELLO, SSL_R_OLD_SESSION_COMPRESSION_ALGORITHM_NOT_RETURNED);
                 goto f_err;
-                }
+        }
         if (j == 0)
-                comp=NULL;
-        else if (s->options & SSL_OP_NO_COMPRESSION)
-                {
-                al=SSL_AD_ILLEGAL_PARAMETER;
-                SSLerr(SSL_F_SSL3_GET_SERVER_HELLO,SSL_R_COMPRESSION_DISABLED);
+                comp = NULL;
+        else if (s->options & SSL_OP_NO_COMPRESSION) {
+                al = SSL_AD_ILLEGAL_PARAMETER;
+                SSLerr(SSL_F_SSL3_GET_SERVER_HELLO, SSL_R_COMPRESSION_DISABLED);
                 goto f_err;
-                }
-        else
-                comp=ssl3_comp_find(s->ctx->comp_methods,j);
-        
-        if ((j != 0) && (comp == NULL))
-                {
-                al=SSL_AD_ILLEGAL_PARAMETER;
-                SSLerr(SSL_F_SSL3_GET_SERVER_HELLO,SSL_R_UNSUPPORTED_COMPRESSION_ALGORITHM);
+        } else
+                comp = ssl3_comp_find(s->ctx->comp_methods, j);
+
+        if ((j != 0) && (comp == NULL)) {
+                al = SSL_AD_ILLEGAL_PARAMETER;
+                SSLerr(SSL_F_SSL3_GET_SERVER_HELLO, SSL_R_UNSUPPORTED_COMPRESSION_ALGORITHM);
                 goto f_err;
-                }
-        else
-                {
-                s->s3->tmp.new_compression=comp;
-                }
+        } else {
+                s->s3->tmp.new_compression = comp;
+        }
 #endif
 
 #ifndef OPENSSL_NO_TLSEXT
         /* TLS extensions*/
-        if (s->version >= SSL3_VERSION)
-                {
-                if (!ssl_parse_serverhello_tlsext(s,&p,d,n, &al))
-                        {
+        if (s->version >= SSL3_VERSION) {
+                if (!ssl_parse_serverhello_tlsext(s, &p, d, n, &al)) {
                         /* 'al' set by ssl_parse_serverhello_tlsext */
-                        SSLerr(SSL_F_SSL3_GET_SERVER_HELLO,SSL_R_PARSE_TLSEXT);
-                        goto f_err; 
-                        }
-                if (ssl_check_serverhello_tlsext(s) <= 0)
-                        {
-                        SSLerr(SSL_F_SSL3_GET_SERVER_HELLO,SSL_R_SERVERHELLO_TLSEXT);
-                                goto err;
-                        }
+                        SSLerr(SSL_F_SSL3_GET_SERVER_HELLO, SSL_R_PARSE_TLSEXT);
+                        goto f_err;
+
                 }
+                if (ssl_check_serverhello_tlsext(s) <= 0) {
+                        SSLerr(SSL_F_SSL3_GET_SERVER_HELLO, SSL_R_SERVERHELLO_TLSEXT);
+                        goto err;
+                }
+        }
 #endif
 
-        if (p != (d+n))
-                {
+        if (p != (d + n)) {
                 /* wrong packet length */
-                al=SSL_AD_DECODE_ERROR;
-                SSLerr(SSL_F_SSL3_GET_SERVER_HELLO,SSL_R_BAD_PACKET_LENGTH);
+                al = SSL_AD_DECODE_ERROR;
+                SSLerr(SSL_F_SSL3_GET_SERVER_HELLO, SSL_R_BAD_PACKET_LENGTH);
                 goto f_err;
-                }
+        }
 
-        return(1);
+        return (1);
 f_err:
-        ssl3_send_alert(s,SSL3_AL_FATAL,al);
+        ssl3_send_alert(s, SSL3_AL_FATAL, al);
 err:
-        return(-1);
-        }
+        return (-1);
+}
 
-int ssl3_get_server_certificate(SSL *s)
-        {
-        int al,i,ok,ret= -1;
-        unsigned long n,nc,llen,l;
-        X509 *x=NULL;
-        const unsigned char *q,*p;
+int
+ssl3_get_server_certificate(SSL *s)
+{
+        int al, i, ok, ret = -1;
+        unsigned long n, nc, llen, l;
+        X509 *x = NULL;
+        const unsigned char *q, *p;
         unsigned char *d;
-        STACK_OF(X509) *sk=NULL;
+        STACK_OF(X509) *sk = NULL;
         SESS_CERT *sc;
-        EVP_PKEY *pkey=NULL;
+        EVP_PKEY *pkey = NULL;
         int need_cert = 1; /* VRS: 0=> will allow null cert if auth == KRB5 */
 
-        n=s->method->ssl_get_message(s,
-                SSL3_ST_CR_CERT_A,
-                SSL3_ST_CR_CERT_B,
-                -1,
-                s->max_cert_list,
-                &ok);
+        n = s->method->ssl_get_message(s, SSL3_ST_CR_CERT_A,
+            SSL3_ST_CR_CERT_B, -1, s->max_cert_list, &ok);
 
-        if (!ok) return((int)n);
+        if (!ok)
+                return ((int)n);
 
         if ((s->s3->tmp.message_type == SSL3_MT_SERVER_KEY_EXCHANGE) ||
-                ((s->s3->tmp.new_cipher->algorithm_auth & SSL_aKRB5) && 
-                (s->s3->tmp.message_type == SSL3_MT_SERVER_DONE)))
-                {
-                s->s3->tmp.reuse_message=1;
-                return(1);
-                }
+            ((s->s3->tmp.new_cipher->algorithm_auth & SSL_aKRB5) &&
+            (s->s3->tmp.message_type == SSL3_MT_SERVER_DONE))) {
+                s->s3->tmp.reuse_message = 1;
+                return (1);
+        }
 
-        if (s->s3->tmp.message_type != SSL3_MT_CERTIFICATE)
-                {
-                al=SSL_AD_UNEXPECTED_MESSAGE;
-                SSLerr(SSL_F_SSL3_GET_SERVER_CERTIFICATE,SSL_R_BAD_MESSAGE_TYPE);
+        if (s->s3->tmp.message_type != SSL3_MT_CERTIFICATE) {
+                al = SSL_AD_UNEXPECTED_MESSAGE;
+                SSLerr(SSL_F_SSL3_GET_SERVER_CERTIFICATE, SSL_R_BAD_MESSAGE_TYPE);
                 goto f_err;
-                }
-        p=d=(unsigned char *)s->init_msg;
+        }
+        p = d = (unsigned char *)s->init_msg;
 
-        if ((sk=sk_X509_new_null()) == NULL)
-                {
-                SSLerr(SSL_F_SSL3_GET_SERVER_CERTIFICATE,ERR_R_MALLOC_FAILURE);
+        if ((sk = sk_X509_new_null()) == NULL) {
+                SSLerr(SSL_F_SSL3_GET_SERVER_CERTIFICATE, ERR_R_MALLOC_FAILURE);
                 goto err;
-                }
+        }
 
-        n2l3(p,llen);
-        if (llen+3 != n)
-                {
-                al=SSL_AD_DECODE_ERROR;
-                SSLerr(SSL_F_SSL3_GET_SERVER_CERTIFICATE,SSL_R_LENGTH_MISMATCH);
+        n2l3(p, llen);
+        if (llen + 3 != n) {
+                al = SSL_AD_DECODE_ERROR;
+                SSLerr(SSL_F_SSL3_GET_SERVER_CERTIFICATE, SSL_R_LENGTH_MISMATCH);
                 goto f_err;
-                }
-        for (nc=0; nc<llen; )
-                {
-                n2l3(p,l);
-                if ((l+nc+3) > llen)
-                        {
-                        al=SSL_AD_DECODE_ERROR;
-                        SSLerr(SSL_F_SSL3_GET_SERVER_CERTIFICATE,SSL_R_CERT_LENGTH_MISMATCH);
+        }
+        for (nc = 0; nc < llen; ) {
+                n2l3(p, l);
+                if ((l + nc + 3) > llen) {
+                        al = SSL_AD_DECODE_ERROR;
+                        SSLerr(SSL_F_SSL3_GET_SERVER_CERTIFICATE, SSL_R_CERT_LENGTH_MISMATCH);
                         goto f_err;
-                        }
+                }
 
-                q=p;
-                x=d2i_X509(NULL,&q,l);
-                if (x == NULL)
-                        {
-                        al=SSL_AD_BAD_CERTIFICATE;
-                        SSLerr(SSL_F_SSL3_GET_SERVER_CERTIFICATE,ERR_R_ASN1_LIB);
+                q = p;
+                x = d2i_X509(NULL, &q, l);
+                if (x == NULL) {
+                        al = SSL_AD_BAD_CERTIFICATE;
+                        SSLerr(SSL_F_SSL3_GET_SERVER_CERTIFICATE, ERR_R_ASN1_LIB);
                         goto f_err;
-                        }
-                if (q != (p+l))
-                        {
-                        al=SSL_AD_DECODE_ERROR;
-                        SSLerr(SSL_F_SSL3_GET_SERVER_CERTIFICATE,SSL_R_CERT_LENGTH_MISMATCH);
+                }
+                if (q != (p + l)) {
+                        al = SSL_AD_DECODE_ERROR;
+                        SSLerr(SSL_F_SSL3_GET_SERVER_CERTIFICATE, SSL_R_CERT_LENGTH_MISMATCH);
                         goto f_err;
-                        }
-                if (!sk_X509_push(sk,x))
-                        {
-                        SSLerr(SSL_F_SSL3_GET_SERVER_CERTIFICATE,ERR_R_MALLOC_FAILURE);
+                }
+                if (!sk_X509_push(sk, x)) {
+                        SSLerr(SSL_F_SSL3_GET_SERVER_CERTIFICATE, ERR_R_MALLOC_FAILURE);
                         goto err;
-                        }
-                x=NULL;
-                nc+=l+3;
-                p=q;
                 }
+                x = NULL;
+                nc += l + 3;
+                p = q;
+        }
 
-        i=ssl_verify_cert_chain(s,sk);
+        i = ssl_verify_cert_chain(s, sk);
         if ((s->verify_mode != SSL_VERIFY_NONE) && (i <= 0)
 #ifndef OPENSSL_NO_KRB5
             && !((s->s3->tmp.new_cipher->algorithm_mkey & SSL_kKRB5) &&
-                 (s->s3->tmp.new_cipher->algorithm_auth & SSL_aKRB5))
+            (s->s3->tmp.new_cipher->algorithm_auth & SSL_aKRB5))
 #endif /* OPENSSL_NO_KRB5 */
-                )
-                {
-                al=ssl_verify_alarm_type(s->verify_result);
-                SSLerr(SSL_F_SSL3_GET_SERVER_CERTIFICATE,SSL_R_CERTIFICATE_VERIFY_FAILED);
-                goto f_err; 
-                }
+            ) {
+                al = ssl_verify_alarm_type(s->verify_result);
+                SSLerr(SSL_F_SSL3_GET_SERVER_CERTIFICATE, SSL_R_CERTIFICATE_VERIFY_FAILED);
+                goto f_err;
+
+        }
         ERR_clear_error(); /* but we keep s->verify_result */
 
-        sc=ssl_sess_cert_new();
-        if (sc == NULL) goto err;
+        sc = ssl_sess_cert_new();
+        if (sc == NULL)
+                goto err;
 
-        if (s->session->sess_cert) ssl_sess_cert_free(s->session->sess_cert);
-        s->session->sess_cert=sc;
+        if (s->session->sess_cert)
+                ssl_sess_cert_free(s->session->sess_cert);
+        s->session->sess_cert = sc;
 
-        sc->cert_chain=sk;
+        sc->cert_chain = sk;
         /* Inconsistency alert: cert_chain does include the peer's
          * certificate, which we don't include in s3_srvr.c */
-        x=sk_X509_value(sk,0);
-        sk=NULL;
-        /* VRS 19990621: possible memory leak; sk=null ==> !sk_pop_free() @end*/
+        x = sk_X509_value(sk, 0);
+        sk = NULL;
+        /* VRS 19990621: possible memory leak; sk=null ==> !sk_pop_free() @end*/
 
-        pkey=X509_get_pubkey(x);
+        pkey = X509_get_pubkey(x);
 
         /* VRS: allow null cert if auth == KRB5 */
         need_cert = ((s->s3->tmp.new_cipher->algorithm_mkey & SSL_kKRB5) &&
-                    (s->s3->tmp.new_cipher->algorithm_auth & SSL_aKRB5))
-                    ? 0 : 1;
+        (s->s3->tmp.new_cipher->algorithm_auth & SSL_aKRB5))
+        ? 0 : 1;
 
 #ifdef KSSL_DEBUG
-        printf("pkey,x = %p, %p\n", pkey,x);
-        printf("ssl_cert_type(x,pkey) = %d\n", ssl_cert_type(x,pkey));
+        printf("pkey, x = %p, %p\n", pkey, x);
+        printf("ssl_cert_type(x, pkey) = %d\n", ssl_cert_type(x, pkey));
         printf("cipher, alg, nc = %s, %lx, %lx, %d\n", s->s3->tmp.new_cipher->name,
-                s->s3->tmp.new_cipher->algorithm_mkey, s->s3->tmp.new_cipher->algorithm_auth, need_cert);
+        s->s3->tmp.new_cipher->algorithm_mkey, s->s3->tmp.new_cipher->algorithm_auth, need_cert);
 #endif    /* KSSL_DEBUG */
 
-        if (need_cert && ((pkey == NULL) || EVP_PKEY_missing_parameters(pkey)))
-                {
-                x=NULL;
-                al=SSL3_AL_FATAL;
+        if (need_cert && ((pkey == NULL) || EVP_PKEY_missing_parameters(pkey))) {
+                x = NULL;
+                al = SSL3_AL_FATAL;
                 SSLerr(SSL_F_SSL3_GET_SERVER_CERTIFICATE,
-                        SSL_R_UNABLE_TO_FIND_PUBLIC_KEY_PARAMETERS);
+                SSL_R_UNABLE_TO_FIND_PUBLIC_KEY_PARAMETERS);
                 goto f_err;
-                }
+        }
 
-        i=ssl_cert_type(x,pkey);
-        if (need_cert && i < 0)
-                {
-                x=NULL;
-                al=SSL3_AL_FATAL;
+        i = ssl_cert_type(x, pkey);
+        if (need_cert && i < 0) {
+                x = NULL;
+                al = SSL3_AL_FATAL;
                 SSLerr(SSL_F_SSL3_GET_SERVER_CERTIFICATE,
-                        SSL_R_UNKNOWN_CERTIFICATE_TYPE);
+                SSL_R_UNKNOWN_CERTIFICATE_TYPE);
                 goto f_err;
-                }
+        }
 
-        if (need_cert)
-                {
-                sc->peer_cert_type=i;
-                CRYPTO_add(&x->references,1,CRYPTO_LOCK_X509);
+        if (need_cert) {
+                sc->peer_cert_type = i;
+                CRYPTO_add(&x->references, 1, CRYPTO_LOCK_X509);
                 /* Why would the following ever happen?
                  * We just created sc a couple of lines ago. */
                 if (sc->peer_pkeys[i].x509 != NULL)
                         X509_free(sc->peer_pkeys[i].x509);
-                sc->peer_pkeys[i].x509=x;
-                sc->peer_key= &(sc->peer_pkeys[i]);
+                sc->peer_pkeys[i].x509 = x;
+                sc->peer_key = &(sc->peer_pkeys[i]);
 
                 if (s->session->peer != NULL)
                         X509_free(s->session->peer);
-                CRYPTO_add(&x->references,1,CRYPTO_LOCK_X509);
-                s->session->peer=x;
-                }
-        else
-                {
-                sc->peer_cert_type=i;
-                sc->peer_key= NULL;
+                CRYPTO_add(&x->references, 1, CRYPTO_LOCK_X509);
+                s->session->peer = x;
+        } else {
+                sc->peer_cert_type = i;
+                sc->peer_key = NULL;
 
                 if (s->session->peer != NULL)
                         X509_free(s->session->peer);
-                s->session->peer=NULL;
-                }
+                s->session->peer = NULL;
+        }
         s->session->verify_result = s->verify_result;
 
-        x=NULL;
-        ret=1;
+        x = NULL;
+        ret = 1;
 
-        if (0)
-                {
+        if (0) {
 f_err:
-                ssl3_send_alert(s,SSL3_AL_FATAL,al);
-                }
+                ssl3_send_alert(s, SSL3_AL_FATAL, al);
+        }
 err:
         EVP_PKEY_free(pkey);
         X509_free(x);
-        sk_X509_pop_free(sk,X509_free);
-        return(ret);
-        }
+        sk_X509_pop_free(sk, X509_free);
+        return (ret);
+}
 
-int ssl3_get_key_exchange(SSL *s)
-        {
+int
+ssl3_get_key_exchange(SSL *s)
+{
 #ifndef OPENSSL_NO_RSA
-        unsigned char *q,md_buf[EVP_MAX_MD_SIZE*2];
+        unsigned char *q, md_buf[EVP_MAX_MD_SIZE*2];
 #endif
         EVP_MD_CTX md_ctx;
-        unsigned char *param,*p;
-        int al,i,j,param_len,ok;
-        long n,alg_k,alg_a;
-        EVP_PKEY *pkey=NULL;
+        unsigned char *param, *p;
+        int al, i, j, param_len, ok;
+        long n, alg_k, alg_a;
+        EVP_PKEY *pkey = NULL;
         const EVP_MD *md = NULL;
 #ifndef OPENSSL_NO_RSA
-        RSA *rsa=NULL;
+        RSA *rsa = NULL;
 #endif
 #ifndef OPENSSL_NO_DH
-        DH *dh=NULL;
+        DH *dh = NULL;
 #endif
 #ifndef OPENSSL_NO_ECDH
         EC_KEY *ecdh = NULL;
@@ -1284,336 +1224,291 @@ int ssl3_get_key_exchange(SSL *s)
 
         /* use same message size as in ssl3_get_certificate_request()
          * as ServerKeyExchange message may be skipped */
-        n=s->method->ssl_get_message(s,
-                SSL3_ST_CR_KEY_EXCH_A,
-                SSL3_ST_CR_KEY_EXCH_B,
-                -1,
-                s->max_cert_list,
-                &ok);
-        if (!ok) return((int)n);
-
-        if (s->s3->tmp.message_type != SSL3_MT_SERVER_KEY_EXCHANGE)
-                {
+        n = s->method->ssl_get_message(s, SSL3_ST_CR_KEY_EXCH_A,
+            SSL3_ST_CR_KEY_EXCH_B, -1, s->max_cert_list, &ok);
+        if (!ok)
+                return ((int)n);
+
+        if (s->s3->tmp.message_type != SSL3_MT_SERVER_KEY_EXCHANGE) {
 #ifndef OPENSSL_NO_PSK
                 /* In plain PSK ciphersuite, ServerKeyExchange can be
                    omitted if no identity hint is sent. Set
                    session->sess_cert anyway to avoid problems
                    later.*/
-                if (s->s3->tmp.new_cipher->algorithm_mkey & SSL_kPSK)
-                        {
-                        s->session->sess_cert=ssl_sess_cert_new();
+                if (s->s3->tmp.new_cipher->algorithm_mkey & SSL_kPSK) {
+                        s->session->sess_cert = ssl_sess_cert_new();
                         if (s->ctx->psk_identity_hint)
                                 OPENSSL_free(s->ctx->psk_identity_hint);
                         s->ctx->psk_identity_hint = NULL;
-                        }
-#endif
-                s->s3->tmp.reuse_message=1;
-                return(1);
                 }
+#endif
+                s->s3->tmp.reuse_message = 1;
+                return (1);
+        }
 
-        param=p=(unsigned char *)s->init_msg;
-        if (s->session->sess_cert != NULL)
-                {
+        param = p = (unsigned char *)s->init_msg;
+        if (s->session->sess_cert != NULL) {
 #ifndef OPENSSL_NO_RSA
-                if (s->session->sess_cert->peer_rsa_tmp != NULL)
-                        {
+                if (s->session->sess_cert->peer_rsa_tmp != NULL) {
                         RSA_free(s->session->sess_cert->peer_rsa_tmp);
-                        s->session->sess_cert->peer_rsa_tmp=NULL;
-                        }
+                        s->session->sess_cert->peer_rsa_tmp = NULL;
+                }
 #endif
 #ifndef OPENSSL_NO_DH
-                if (s->session->sess_cert->peer_dh_tmp)
-                        {
+                if (s->session->sess_cert->peer_dh_tmp) {
                         DH_free(s->session->sess_cert->peer_dh_tmp);
-                        s->session->sess_cert->peer_dh_tmp=NULL;
-                        }
+                        s->session->sess_cert->peer_dh_tmp = NULL;
+                }
 #endif
 #ifndef OPENSSL_NO_ECDH
-                if (s->session->sess_cert->peer_ecdh_tmp)
-                        {
+                if (s->session->sess_cert->peer_ecdh_tmp) {
                         EC_KEY_free(s->session->sess_cert->peer_ecdh_tmp);
-                        s->session->sess_cert->peer_ecdh_tmp=NULL;
-                        }
-#endif
-                }
-        else
-                {
-                s->session->sess_cert=ssl_sess_cert_new();
+                        s->session->sess_cert->peer_ecdh_tmp = NULL;
                 }
+#endif
+        } else {
+                s->session->sess_cert = ssl_sess_cert_new();
+        }
 
-        param_len=0;
-        alg_k=s->s3->tmp.new_cipher->algorithm_mkey;
-        alg_a=s->s3->tmp.new_cipher->algorithm_auth;
+        param_len = 0;
+        alg_k = s->s3->tmp.new_cipher->algorithm_mkey;
+        alg_a = s->s3->tmp.new_cipher->algorithm_auth;
         EVP_MD_CTX_init(&md_ctx);
 
 #ifndef OPENSSL_NO_PSK
-        if (alg_k & SSL_kPSK)
-                {
-                char tmp_id_hint[PSK_MAX_IDENTITY_LEN+1];
+        if (alg_k & SSL_kPSK) {
+                char tmp_id_hint[PSK_MAX_IDENTITY_LEN + 1];
 
-                al=SSL_AD_HANDSHAKE_FAILURE;
-                n2s(p,i);
-                param_len=i+2;
+                al = SSL_AD_HANDSHAKE_FAILURE;
+                n2s(p, i);
+                param_len = i + 2;
                 /* Store PSK identity hint for later use, hint is used
                  * in ssl3_send_client_key_exchange.  Assume that the
                  * maximum length of a PSK identity hint can be as
                  * long as the maximum length of a PSK identity. */
-                if (i > PSK_MAX_IDENTITY_LEN)
-                        {
+                if (i > PSK_MAX_IDENTITY_LEN) {
                         SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,
-                                SSL_R_DATA_LENGTH_TOO_LONG);
+                        SSL_R_DATA_LENGTH_TOO_LONG);
                         goto f_err;
-                        }
-                if (param_len > n)
-                        {
-                        al=SSL_AD_DECODE_ERROR;
+                }
+                if (param_len > n) {
+                        al = SSL_AD_DECODE_ERROR;
                         SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,
-                                SSL_R_BAD_PSK_IDENTITY_HINT_LENGTH);
+                        SSL_R_BAD_PSK_IDENTITY_HINT_LENGTH);
                         goto f_err;
-                        }
+                }
                 /* If received PSK identity hint contains NULL
                  * characters, the hint is truncated from the first
                  * NULL. p may not be ending with NULL, so create a
                  * NULL-terminated string. */
                 memcpy(tmp_id_hint, p, i);
-                memset(tmp_id_hint+i, 0, PSK_MAX_IDENTITY_LEN+1-i);
+                memset(tmp_id_hint + i, 0, PSK_MAX_IDENTITY_LEN + 1 - i);
                 if (s->ctx->psk_identity_hint != NULL)
                         OPENSSL_free(s->ctx->psk_identity_hint);
                 s->ctx->psk_identity_hint = BUF_strdup(tmp_id_hint);
-                if (s->ctx->psk_identity_hint == NULL)
-                        {
+                if (s->ctx->psk_identity_hint == NULL) {
                         SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE, ERR_R_MALLOC_FAILURE);
                         goto f_err;
-                        }          
-
-                p+=i;
-                n-=param_len;
                 }
-        else
+
+                p += i;
+                n -= param_len;
+        } else
 #endif /* !OPENSSL_NO_PSK */
 #ifndef OPENSSL_NO_SRP
-        if (alg_k & SSL_kSRP)
-                {
-                n2s(p,i);
-                param_len=i+2;
-                if (param_len > n)
-                        {
-                        al=SSL_AD_DECODE_ERROR;
-                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_BAD_SRP_N_LENGTH);
+        if (alg_k & SSL_kSRP) {
+                n2s(p, i);
+                param_len = i + 2;
+                if (param_len > n) {
+                        al = SSL_AD_DECODE_ERROR;
+                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE, SSL_R_BAD_SRP_N_LENGTH);
                         goto f_err;
-                        }
-                if (!(s->srp_ctx.N=BN_bin2bn(p,i,NULL)))
-                        {
-                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,ERR_R_BN_LIB);
+                }
+                if (!(s->srp_ctx.N = BN_bin2bn(p, i, NULL))) {
+                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE, ERR_R_BN_LIB);
                         goto err;
-                        }
-                p+=i;
+                }
+                p += i;
 
-                n2s(p,i);
-                param_len+=i+2;
-                if (param_len > n)
-                        {
-                        al=SSL_AD_DECODE_ERROR;
-                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_BAD_SRP_G_LENGTH);
+                n2s(p, i);
+                param_len += i + 2;
+                if (param_len > n) {
+                        al = SSL_AD_DECODE_ERROR;
+                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE, SSL_R_BAD_SRP_G_LENGTH);
                         goto f_err;
-                        }
-                if (!(s->srp_ctx.g=BN_bin2bn(p,i,NULL)))
-                        {
-                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,ERR_R_BN_LIB);
+                }
+                if (!(s->srp_ctx.g = BN_bin2bn(p, i, NULL))) {
+                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE, ERR_R_BN_LIB);
                         goto err;
-                        }
-                p+=i;
+                }
+                p += i;
 
                 i = (unsigned int)(p[0]);
                 p++;
-                param_len+=i+1;
-                if (param_len > n)
-                        {
-                        al=SSL_AD_DECODE_ERROR;
-                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_BAD_SRP_S_LENGTH);
+                param_len += i + 1;
+                if (param_len > n) {
+                        al = SSL_AD_DECODE_ERROR;
+                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE, SSL_R_BAD_SRP_S_LENGTH);
                         goto f_err;
-                        }
-                if (!(s->srp_ctx.s=BN_bin2bn(p,i,NULL)))
-                        {
-                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,ERR_R_BN_LIB);
+                }
+                if (!(s->srp_ctx.s = BN_bin2bn(p, i, NULL))) {
+                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE, ERR_R_BN_LIB);
                         goto err;
-                        }
-                p+=i;
+                }
+                p += i;
 
-                n2s(p,i);
-                param_len+=i+2;
-                if (param_len > n)
-                        {
-                        al=SSL_AD_DECODE_ERROR;
-                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_BAD_SRP_B_LENGTH);
+                n2s(p, i);
+                param_len += i + 2;
+                if (param_len > n) {
+                        al = SSL_AD_DECODE_ERROR;
+                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE, SSL_R_BAD_SRP_B_LENGTH);
                         goto f_err;
-                        }
-                if (!(s->srp_ctx.B=BN_bin2bn(p,i,NULL)))
-                        {
-                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,ERR_R_BN_LIB);
+                }
+                if (!(s->srp_ctx.B = BN_bin2bn(p, i, NULL))) {
+                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE, ERR_R_BN_LIB);
                         goto err;
-                        }
-                p+=i;
-                n-=param_len;
+                }
+                p += i;
+                n -= param_len;
 
 /* We must check if there is a certificate */
 #ifndef OPENSSL_NO_RSA
                 if (alg_a & SSL_aRSA)
-                        pkey=X509_get_pubkey(s->session->sess_cert->peer_pkeys[SSL_PKEY_RSA_ENC].x509);
+                        pkey = X509_get_pubkey(s->session->sess_cert->peer_pkeys[SSL_PKEY_RSA_ENC].x509);
 #else
                 if (0)
-                        ;
+;
 #endif
 #ifndef OPENSSL_NO_DSA
                 else if (alg_a & SSL_aDSS)
-                        pkey=X509_get_pubkey(s->session->sess_cert->peer_pkeys[SSL_PKEY_DSA_SIGN].x509);
+                        pkey = X509_get_pubkey(s->session->sess_cert->peer_pkeys[SSL_PKEY_DSA_SIGN].x509);
 #endif
-                }
-        else
+        } else
 #endif /* !OPENSSL_NO_SRP */
 #ifndef OPENSSL_NO_RSA
-        if (alg_k & SSL_kRSA)
-                {
-                if ((rsa=RSA_new()) == NULL)
-                        {
-                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,ERR_R_MALLOC_FAILURE);
+        if (alg_k & SSL_kRSA) {
+                if ((rsa = RSA_new()) == NULL) {
+                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE, ERR_R_MALLOC_FAILURE);
                         goto err;
-                        }
-                n2s(p,i);
-                param_len=i+2;
-                if (param_len > n)
-                        {
-                        al=SSL_AD_DECODE_ERROR;
-                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_BAD_RSA_MODULUS_LENGTH);
+                }
+                n2s(p, i);
+                param_len = i + 2;
+                if (param_len > n) {
+                        al = SSL_AD_DECODE_ERROR;
+                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE, SSL_R_BAD_RSA_MODULUS_LENGTH);
                         goto f_err;
-                        }
-                if (!(rsa->n=BN_bin2bn(p,i,rsa->n)))
-                        {
-                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,ERR_R_BN_LIB);
+                }
+                if (!(rsa->n = BN_bin2bn(p, i, rsa->n))) {
+                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE, ERR_R_BN_LIB);
                         goto err;
-                        }
-                p+=i;
+                }
+                p += i;
 
-                n2s(p,i);
-                param_len+=i+2;
-                if (param_len > n)
-                        {
-                        al=SSL_AD_DECODE_ERROR;
-                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_BAD_RSA_E_LENGTH);
+                n2s(p, i);
+                param_len += i + 2;
+                if (param_len > n) {
+                        al = SSL_AD_DECODE_ERROR;
+                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE, SSL_R_BAD_RSA_E_LENGTH);
                         goto f_err;
-                        }
-                if (!(rsa->e=BN_bin2bn(p,i,rsa->e)))
-                        {
-                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,ERR_R_BN_LIB);
+                }
+                if (!(rsa->e = BN_bin2bn(p, i, rsa->e))) {
+                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE, ERR_R_BN_LIB);
                         goto err;
-                        }
-                p+=i;
-                n-=param_len;
+                }
+                p += i;
+                n -= param_len;
 
                 /* this should be because we are using an export cipher */
                 if (alg_a & SSL_aRSA)
-                        pkey=X509_get_pubkey(s->session->sess_cert->peer_pkeys[SSL_PKEY_RSA_ENC].x509);
-                else
-                        {
-                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,ERR_R_INTERNAL_ERROR);
+                        pkey = X509_get_pubkey(s->session->sess_cert->peer_pkeys[SSL_PKEY_RSA_ENC].x509);
+                else {
+                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE, ERR_R_INTERNAL_ERROR);
                         goto err;
-                        }
-                s->session->sess_cert->peer_rsa_tmp=rsa;
-                rsa=NULL;
                 }
+                s->session->sess_cert->peer_rsa_tmp = rsa;
+                rsa = NULL;
+        }
 #else /* OPENSSL_NO_RSA */
         if (0)
-                ;
+;
 #endif
 #ifndef OPENSSL_NO_DH
-        else if (alg_k & SSL_kEDH)
-                {
-                if ((dh=DH_new()) == NULL)
-                        {
-                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,ERR_R_DH_LIB);
+        else if (alg_k & SSL_kEDH) {
+                if ((dh = DH_new()) == NULL) {
+                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE, ERR_R_DH_LIB);
                         goto err;
-                        }
-                n2s(p,i);
-                param_len=i+2;
-                if (param_len > n)
-                        {
-                        al=SSL_AD_DECODE_ERROR;
-                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_BAD_DH_P_LENGTH);
+                }
+                n2s(p, i);
+                param_len = i + 2;
+                if (param_len > n) {
+                        al = SSL_AD_DECODE_ERROR;
+                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE, SSL_R_BAD_DH_P_LENGTH);
                         goto f_err;
-                        }
-                if (!(dh->p=BN_bin2bn(p,i,NULL)))
-                        {
-                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,ERR_R_BN_LIB);
+                }
+                if (!(dh->p = BN_bin2bn(p, i, NULL))) {
+                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE, ERR_R_BN_LIB);
                         goto err;
-                        }
-                p+=i;
+                }
+                p += i;
 
-                n2s(p,i);
-                param_len+=i+2;
-                if (param_len > n)
-                        {
-                        al=SSL_AD_DECODE_ERROR;
-                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_BAD_DH_G_LENGTH);
+                n2s(p, i);
+                param_len += i + 2;
+                if (param_len > n) {
+                        al = SSL_AD_DECODE_ERROR;
+                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE, SSL_R_BAD_DH_G_LENGTH);
                         goto f_err;
-                        }
-                if (!(dh->g=BN_bin2bn(p,i,NULL)))
-                        {
-                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,ERR_R_BN_LIB);
+                }
+                if (!(dh->g = BN_bin2bn(p, i, NULL))) {
+                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE, ERR_R_BN_LIB);
                         goto err;
-                        }
-                p+=i;
+                }
+                p += i;
 
-                n2s(p,i);
-                param_len+=i+2;
-                if (param_len > n)
-                        {
-                        al=SSL_AD_DECODE_ERROR;
-                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_BAD_DH_PUB_KEY_LENGTH);
+                n2s(p, i);
+                param_len += i + 2;
+                if (param_len > n) {
+                        al = SSL_AD_DECODE_ERROR;
+                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE, SSL_R_BAD_DH_PUB_KEY_LENGTH);
                         goto f_err;
-                        }
-                if (!(dh->pub_key=BN_bin2bn(p,i,NULL)))
-                        {
-                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,ERR_R_BN_LIB);
+                }
+                if (!(dh->pub_key = BN_bin2bn(p, i, NULL))) {
+                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE, ERR_R_BN_LIB);
                         goto err;
-                        }
-                p+=i;
-                n-=param_len;
+                }
+                p += i;
+                n -= param_len;
 
 #ifndef OPENSSL_NO_RSA
                 if (alg_a & SSL_aRSA)
-                        pkey=X509_get_pubkey(s->session->sess_cert->peer_pkeys[SSL_PKEY_RSA_ENC].x509);
+                        pkey = X509_get_pubkey(s->session->sess_cert->peer_pkeys[SSL_PKEY_RSA_ENC].x509);
 #else
                 if (0)
-                        ;
+;
 #endif
 #ifndef OPENSSL_NO_DSA
                 else if (alg_a & SSL_aDSS)
-                        pkey=X509_get_pubkey(s->session->sess_cert->peer_pkeys[SSL_PKEY_DSA_SIGN].x509);
+                        pkey = X509_get_pubkey(s->session->sess_cert->peer_pkeys[SSL_PKEY_DSA_SIGN].x509);
 #endif
                 /* else anonymous DH, so no certificate or pkey. */
 
-                s->session->sess_cert->peer_dh_tmp=dh;
-                dh=NULL;
-                }
-        else if ((alg_k & SSL_kDHr) || (alg_k & SSL_kDHd))
-                {
-                al=SSL_AD_ILLEGAL_PARAMETER;
-                SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_TRIED_TO_USE_UNSUPPORTED_CIPHER);
+                s->session->sess_cert->peer_dh_tmp = dh;
+                dh = NULL;
+        } else if ((alg_k & SSL_kDHr) || (alg_k & SSL_kDHd)) {
+                al = SSL_AD_ILLEGAL_PARAMETER;
+                SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE, SSL_R_TRIED_TO_USE_UNSUPPORTED_CIPHER);
                 goto f_err;
-                }
+        }
 #endif /* !OPENSSL_NO_DH */
 
 #ifndef OPENSSL_NO_ECDH
-        else if (alg_k & SSL_kEECDH)
-                {
+        else if (alg_k & SSL_kEECDH) {
                 EC_GROUP *ngroup;
                 const EC_GROUP *group;
 
-                if ((ecdh=EC_KEY_new()) == NULL)
-                        {
-                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,ERR_R_MALLOC_FAILURE);
+                if ((ecdh = EC_KEY_new()) == NULL) {
+                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE, ERR_R_MALLOC_FAILURE);
                         goto err;
-                        }
+                }
 
                 /* Extract elliptic curve parameters and the
                  * server's ephemeral ECDH public key.
@@ -1624,217 +1519,194 @@ int ssl3_get_key_exchange(SSL *s)
                 /* XXX: For now we only support named (not generic) curves
                  * and the ECParameters in this case is just three bytes.
                  */
-                param_len=3;
+                param_len = 3;
                 if ((param_len > n) ||
-                    (*p != NAMED_CURVE_TYPE) || 
-                    ((curve_nid = tls1_ec_curve_id2nid(*(p + 2))) == 0)) 
-                        {
-                        al=SSL_AD_INTERNAL_ERROR;
-                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_UNABLE_TO_FIND_ECDH_PARAMETERS);
+                        (*p != NAMED_CURVE_TYPE) ||
+                ((curve_nid = tls1_ec_curve_id2nid(*(p + 2))) == 0)) {
+                        al = SSL_AD_INTERNAL_ERROR;
+                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE, SSL_R_UNABLE_TO_FIND_ECDH_PARAMETERS);
                         goto f_err;
-                        }
+                }
 
                 ngroup = EC_GROUP_new_by_curve_name(curve_nid);
-                if (ngroup == NULL)
-                        {
-                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,ERR_R_EC_LIB);
+                if (ngroup == NULL) {
+                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE, ERR_R_EC_LIB);
                         goto err;
-                        }
-                if (EC_KEY_set_group(ecdh, ngroup) == 0)
-                        {
-                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,ERR_R_EC_LIB);
+                }
+                if (EC_KEY_set_group(ecdh, ngroup) == 0) {
+                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE, ERR_R_EC_LIB);
                         goto err;
-                        }
+                }
                 EC_GROUP_free(ngroup);
 
                 group = EC_KEY_get0_group(ecdh);
 
                 if (SSL_C_IS_EXPORT(s->s3->tmp.new_cipher) &&
-                    (EC_GROUP_get_degree(group) > 163))
-                        {
-                        al=SSL_AD_EXPORT_RESTRICTION;
-                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_ECGROUP_TOO_LARGE_FOR_CIPHER);
+                        (EC_GROUP_get_degree(group) > 163)) {
+                        al = SSL_AD_EXPORT_RESTRICTION;
+                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE, SSL_R_ECGROUP_TOO_LARGE_FOR_CIPHER);
                         goto f_err;
-                        }
+                }
 
-                p+=3;
+                p += 3;
 
                 /* Next, get the encoded ECPoint */
                 if (((srvr_ecpoint = EC_POINT_new(group)) == NULL) ||
-                    ((bn_ctx = BN_CTX_new()) == NULL))
-                        {
-                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,ERR_R_MALLOC_FAILURE);
+                        ((bn_ctx = BN_CTX_new()) == NULL)) {
+                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE, ERR_R_MALLOC_FAILURE);
                         goto err;
-                        }
+                }
 
-                encoded_pt_len = *p;  /* length of encoded point */
-                p+=1;
+                encoded_pt_len = *p;
+                /* length of encoded point */
+                p += 1;
                 param_len += (1 + encoded_pt_len);
                 if ((param_len > n) ||
-                    (EC_POINT_oct2point(group, srvr_ecpoint, 
-                        p, encoded_pt_len, bn_ctx) == 0))
-                        {
-                        al=SSL_AD_DECODE_ERROR;
-                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_BAD_ECPOINT);
+                        (EC_POINT_oct2point(group, srvr_ecpoint,
+                p, encoded_pt_len, bn_ctx) == 0)) {
+                        al = SSL_AD_DECODE_ERROR;
+                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE, SSL_R_BAD_ECPOINT);
                         goto f_err;
-                        }
+                }
 
-                n-=param_len;
-                p+=encoded_pt_len;
+                n -= param_len;
+                p += encoded_pt_len;
 
                 /* The ECC/TLS specification does not mention
                  * the use of DSA to sign ECParameters in the server
                  * key exchange message. We do support RSA and ECDSA.
                  */
-                if (0) ;
+                if (0);
 #ifndef OPENSSL_NO_RSA
                 else if (alg_a & SSL_aRSA)
-                        pkey=X509_get_pubkey(s->session->sess_cert->peer_pkeys[SSL_PKEY_RSA_ENC].x509);
+                        pkey = X509_get_pubkey(s->session->sess_cert->peer_pkeys[SSL_PKEY_RSA_ENC].x509);
 #endif
 #ifndef OPENSSL_NO_ECDSA
                 else if (alg_a & SSL_aECDSA)
-                        pkey=X509_get_pubkey(s->session->sess_cert->peer_pkeys[SSL_PKEY_ECC].x509);
+                        pkey = X509_get_pubkey(s->session->sess_cert->peer_pkeys[SSL_PKEY_ECC].x509);
 #endif
                 /* else anonymous ECDH, so no certificate or pkey. */
                 EC_KEY_set_public_key(ecdh, srvr_ecpoint);
-                s->session->sess_cert->peer_ecdh_tmp=ecdh;
-                ecdh=NULL;
+                s->session->sess_cert->peer_ecdh_tmp = ecdh;
+                ecdh = NULL;
                 BN_CTX_free(bn_ctx);
                 bn_ctx = NULL;
                 EC_POINT_free(srvr_ecpoint);
                 srvr_ecpoint = NULL;
-                }
-        else if (alg_k)
-                {
-                al=SSL_AD_UNEXPECTED_MESSAGE;
-                SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_UNEXPECTED_MESSAGE);
+        } else if (alg_k) {
+                al = SSL_AD_UNEXPECTED_MESSAGE;
+                SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE, SSL_R_UNEXPECTED_MESSAGE);
                 goto f_err;
-                }
+        }
 #endif /* !OPENSSL_NO_ECDH */
 
 
         /* p points to the next byte, there are 'n' bytes left */
 
         /* if it was signed, check the signature */
-        if (pkey != NULL)
-                {
-                if (TLS1_get_version(s) >= TLS1_2_VERSION)
-                        {
+        if (pkey != NULL) {
+                if (TLS1_get_version(s) >= TLS1_2_VERSION) {
                         int sigalg = tls12_get_sigid(pkey);
                         /* Should never happen */
-                        if (sigalg == -1)
-                                {
-                                SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,ERR_R_INTERNAL_ERROR);
+                        if (sigalg == -1) {
+                                SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE, ERR_R_INTERNAL_ERROR);
                                 goto err;
-                                }
+                        }
                         /* Check key type is consistent with signature */
-                        if (sigalg != (int)p[1])
-                                {
-                                SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_WRONG_SIGNATURE_TYPE);
-                                al=SSL_AD_DECODE_ERROR;
+                        if (sigalg != (int)p[1]) {
+                                SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE, SSL_R_WRONG_SIGNATURE_TYPE);
+                                al = SSL_AD_DECODE_ERROR;
                                 goto f_err;
-                                }
+                        }
                         md = tls12_get_hash(p[0]);
-                        if (md == NULL)
-                                {
-                                SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_UNKNOWN_DIGEST);
-                                al=SSL_AD_DECODE_ERROR;
+                        if (md == NULL) {
+                                SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE, SSL_R_UNKNOWN_DIGEST);
+                                al = SSL_AD_DECODE_ERROR;
                                 goto f_err;
-                                }
+                        }
 #ifdef SSL_DEBUG
-fprintf(stderr, "USING TLSv1.2 HASH %s\n", EVP_MD_name(md));
+                        fprintf(stderr, "USING TLSv1.2 HASH %s\n", EVP_MD_name(md));
 #endif
                         p += 2;
                         n -= 2;
-                        }
-                else
+                } else
                         md = EVP_sha1();
-                        
-                n2s(p,i);
-                n-=2;
-                j=EVP_PKEY_size(pkey);
 
-                if ((i != n) || (n > j) || (n <= 0))
-                        {
+                n2s(p, i);
+                n -= 2;
+                j = EVP_PKEY_size(pkey);
+
+                if ((i != n) || (n > j) || (n <= 0)) {
                         /* wrong packet length */
-                        al=SSL_AD_DECODE_ERROR;
-                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_WRONG_SIGNATURE_LENGTH);
+                        al = SSL_AD_DECODE_ERROR;
+                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE, SSL_R_WRONG_SIGNATURE_LENGTH);
                         goto f_err;
-                        }
+                }
 
 #ifndef OPENSSL_NO_RSA
-                if (pkey->type == EVP_PKEY_RSA && TLS1_get_version(s) < TLS1_2_VERSION)
-                        {
+                if (pkey->type == EVP_PKEY_RSA && TLS1_get_version(s) < TLS1_2_VERSION) {
                         int num;
 
-                        j=0;
-                        q=md_buf;
-                        for (num=2; num > 0; num--)
-                                {
+                        j = 0;
+                        q = md_buf;
+                        for (num = 2; num > 0; num--) {
                                 EVP_MD_CTX_set_flags(&md_ctx,
-                                        EVP_MD_CTX_FLAG_NON_FIPS_ALLOW);
+                                EVP_MD_CTX_FLAG_NON_FIPS_ALLOW);
                                 EVP_DigestInit_ex(&md_ctx,(num == 2)
-                                        ?s->ctx->md5:s->ctx->sha1, NULL);
-                                EVP_DigestUpdate(&md_ctx,&(s->s3->client_random[0]),SSL3_RANDOM_SIZE);
-                                EVP_DigestUpdate(&md_ctx,&(s->s3->server_random[0]),SSL3_RANDOM_SIZE);
-                                EVP_DigestUpdate(&md_ctx,param,param_len);
-                                EVP_DigestFinal_ex(&md_ctx,q,(unsigned int *)&i);
-                                q+=i;
-                                j+=i;
-                                }
-                        i=RSA_verify(NID_md5_sha1, md_buf, j, p, n,
-                                                                pkey->pkey.rsa);
-                        if (i < 0)
-                                {
-                                al=SSL_AD_DECRYPT_ERROR;
-                                SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_BAD_RSA_DECRYPT);
+                                ?s->ctx->md5 : s->ctx->sha1, NULL);
+                                EVP_DigestUpdate(&md_ctx, &(s->s3->client_random[0]), SSL3_RANDOM_SIZE);
+                                EVP_DigestUpdate(&md_ctx, &(s->s3->server_random[0]), SSL3_RANDOM_SIZE);
+                                EVP_DigestUpdate(&md_ctx, param, param_len);
+                                EVP_DigestFinal_ex(&md_ctx, q,(unsigned int *)&i);
+                                q += i;
+                                j += i;
+                        }
+                        i = RSA_verify(NID_md5_sha1, md_buf, j, p, n,
+                        pkey->pkey.rsa);
+                        if (i < 0) {
+                                al = SSL_AD_DECRYPT_ERROR;
+                                SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE, SSL_R_BAD_RSA_DECRYPT);
                                 goto f_err;
-                                }
-                        if (i == 0)
-                                {
+                        }
+                        if (i == 0) {
                                 /* bad signature */
-                                al=SSL_AD_DECRYPT_ERROR;
-                                SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_BAD_SIGNATURE);
+                                al = SSL_AD_DECRYPT_ERROR;
+                                SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE, SSL_R_BAD_SIGNATURE);
                                 goto f_err;
-                                }
                         }
-                else
+                } else
 #endif
-                        {
+                {
                         EVP_VerifyInit_ex(&md_ctx, md, NULL);
-                        EVP_VerifyUpdate(&md_ctx,&(s->s3->client_random[0]),SSL3_RANDOM_SIZE);
-                        EVP_VerifyUpdate(&md_ctx,&(s->s3->server_random[0]),SSL3_RANDOM_SIZE);
-                        EVP_VerifyUpdate(&md_ctx,param,param_len);
-                        if (EVP_VerifyFinal(&md_ctx,p,(int)n,pkey) <= 0)
-                                {
+                        EVP_VerifyUpdate(&md_ctx, &(s->s3->client_random[0]), SSL3_RANDOM_SIZE);
+                        EVP_VerifyUpdate(&md_ctx, &(s->s3->server_random[0]), SSL3_RANDOM_SIZE);
+                        EVP_VerifyUpdate(&md_ctx, param, param_len);
+                        if (EVP_VerifyFinal(&md_ctx, p,(int)n, pkey) <= 0) {
                                 /* bad signature */
-                                al=SSL_AD_DECRYPT_ERROR;
-                                SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_BAD_SIGNATURE);
+                                al = SSL_AD_DECRYPT_ERROR;
+                                SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE, SSL_R_BAD_SIGNATURE);
                                 goto f_err;
-                                }
                         }
                 }
-        else
-                {
+        } else {
                 if (!(alg_a & SSL_aNULL) && !(alg_k & SSL_kPSK))
                         /* aNULL or kPSK do not need public keys */
-                        {
-                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,ERR_R_INTERNAL_ERROR);
+                {
+                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE, ERR_R_INTERNAL_ERROR);
                         goto err;
-                        }
+                }
                 /* still data left over */
-                if (n != 0)
-                        {
-                        al=SSL_AD_DECODE_ERROR;
-                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_EXTRA_DATA_IN_MESSAGE);
+                if (n != 0) {
+                        al = SSL_AD_DECODE_ERROR;
+                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE, SSL_R_EXTRA_DATA_IN_MESSAGE);
                         goto f_err;
-                        }
                 }
+        }
         EVP_PKEY_free(pkey);
         EVP_MD_CTX_cleanup(&md_ctx);
-        return(1);
+        return (1);
 f_err:
-        ssl3_send_alert(s,SSL3_AL_FATAL,al);
+        ssl3_send_alert(s, SSL3_AL_FATAL, al);
 err:
         EVP_PKEY_free(pkey);
 #ifndef OPENSSL_NO_RSA
@@ -1852,241 +1724,219 @@ err:
                 EC_KEY_free(ecdh);
 #endif
         EVP_MD_CTX_cleanup(&md_ctx);
-        return(-1);
-        }
+        return (-1);
+}
 
-int ssl3_get_certificate_request(SSL *s)
-        {
-        int ok,ret=0;
-        unsigned long n,nc,l;
-        unsigned int llen, ctype_num,i;
-        X509_NAME *xn=NULL;
-        const unsigned char *p,*q;
+int
+ssl3_get_certificate_request(SSL *s)
+{
+        int ok, ret = 0;
+        unsigned long n, nc, l;
+        unsigned int llen, ctype_num, i;
+        X509_NAME *xn = NULL;
+        const unsigned char *p, *q;
         unsigned char *d;
-        STACK_OF(X509_NAME) *ca_sk=NULL;
+        STACK_OF(X509_NAME) *ca_sk = NULL;
 
-        n=s->method->ssl_get_message(s,
-                SSL3_ST_CR_CERT_REQ_A,
-                SSL3_ST_CR_CERT_REQ_B,
-                -1,
-                s->max_cert_list,
-                &ok);
+        n = s->method->ssl_get_message(s,
+        SSL3_ST_CR_CERT_REQ_A,
+        SSL3_ST_CR_CERT_REQ_B,
+        -1,
+        s->max_cert_list,
+        &ok);
 
-        if (!ok) return((int)n);
+        if (!ok)
+                return ((int)n);
 
-        s->s3->tmp.cert_req=0;
+        s->s3->tmp.cert_req = 0;
 
-        if (s->s3->tmp.message_type == SSL3_MT_SERVER_DONE)
-                {
-                s->s3->tmp.reuse_message=1;
+        if (s->s3->tmp.message_type == SSL3_MT_SERVER_DONE) {
+                s->s3->tmp.reuse_message = 1;
                 /* If we get here we don't need any cached handshake records
                  * as we wont be doing client auth.
                  */
-                if (s->s3->handshake_buffer)
-                        {
+                if (s->s3->handshake_buffer) {
                         if (!ssl3_digest_cached_records(s))
                                 goto err;
-                        }
-                return(1);
                 }
+                return (1);
+        }
 
-        if (s->s3->tmp.message_type != SSL3_MT_CERTIFICATE_REQUEST)
-                {
-                ssl3_send_alert(s,SSL3_AL_FATAL,SSL_AD_UNEXPECTED_MESSAGE);
-                SSLerr(SSL_F_SSL3_GET_CERTIFICATE_REQUEST,SSL_R_WRONG_MESSAGE_TYPE);
+        if (s->s3->tmp.message_type != SSL3_MT_CERTIFICATE_REQUEST) {
+                ssl3_send_alert(s, SSL3_AL_FATAL, SSL_AD_UNEXPECTED_MESSAGE);
+                SSLerr(SSL_F_SSL3_GET_CERTIFICATE_REQUEST, SSL_R_WRONG_MESSAGE_TYPE);
                 goto err;
-                }
+        }
 
         /* TLS does not like anon-DH with client cert */
-        if (s->version > SSL3_VERSION)
-                {
-                if (s->s3->tmp.new_cipher->algorithm_auth & SSL_aNULL)
-                        {
-                        ssl3_send_alert(s,SSL3_AL_FATAL,SSL_AD_UNEXPECTED_MESSAGE);
-                        SSLerr(SSL_F_SSL3_GET_CERTIFICATE_REQUEST,SSL_R_TLS_CLIENT_CERT_REQ_WITH_ANON_CIPHER);
+        if (s->version > SSL3_VERSION) {
+                if (s->s3->tmp.new_cipher->algorithm_auth & SSL_aNULL) {
+                        ssl3_send_alert(s, SSL3_AL_FATAL, SSL_AD_UNEXPECTED_MESSAGE);
+                        SSLerr(SSL_F_SSL3_GET_CERTIFICATE_REQUEST, SSL_R_TLS_CLIENT_CERT_REQ_WITH_ANON_CIPHER);
                         goto err;
-                        }
                 }
+        }
 
-        p=d=(unsigned char *)s->init_msg;
+        p = d=(unsigned char *)s->init_msg;
 
-        if ((ca_sk=sk_X509_NAME_new(ca_dn_cmp)) == NULL)
-                {
-                SSLerr(SSL_F_SSL3_GET_CERTIFICATE_REQUEST,ERR_R_MALLOC_FAILURE);
+        if ((ca_sk = sk_X509_NAME_new(ca_dn_cmp)) == NULL) {
+                SSLerr(SSL_F_SSL3_GET_CERTIFICATE_REQUEST, ERR_R_MALLOC_FAILURE);
                 goto err;
-                }
+        }
 
         /* get the certificate types */
         ctype_num= *(p++);
         if (ctype_num > SSL3_CT_NUMBER)
-                ctype_num=SSL3_CT_NUMBER;
-        for (i=0; i<ctype_num; i++)
-                s->s3->tmp.ctype[i]= p[i];
-        p+=ctype_num;
-        if (TLS1_get_version(s) >= TLS1_2_VERSION)
-                {
+                ctype_num = SSL3_CT_NUMBER;
+        for (i = 0; i < ctype_num; i++)
+                s->s3->tmp.ctype[i] = p[i];
+        p += ctype_num;
+        if (TLS1_get_version(s) >= TLS1_2_VERSION) {
                 n2s(p, llen);
                 /* Check we have enough room for signature algorithms and
                  * following length value.
                  */
-                if ((unsigned long)(p - d + llen + 2) > n)
-                        {
-                        ssl3_send_alert(s,SSL3_AL_FATAL,SSL_AD_DECODE_ERROR);
-                        SSLerr(SSL_F_SSL3_GET_CERTIFICATE_REQUEST,SSL_R_DATA_LENGTH_TOO_LONG);
+                if ((unsigned long)(p - d + llen + 2) > n) {
+                        ssl3_send_alert(s, SSL3_AL_FATAL, SSL_AD_DECODE_ERROR);
+                        SSLerr(SSL_F_SSL3_GET_CERTIFICATE_REQUEST, SSL_R_DATA_LENGTH_TOO_LONG);
                         goto err;
-                        }
-                if ((llen & 1) || !tls1_process_sigalgs(s, p, llen))
-                        {
-                        ssl3_send_alert(s,SSL3_AL_FATAL,SSL_AD_DECODE_ERROR);
-                        SSLerr(SSL_F_SSL3_GET_CERTIFICATE_REQUEST,SSL_R_SIGNATURE_ALGORITHMS_ERROR);
+                }
+                if ((llen & 1) || !tls1_process_sigalgs(s, p, llen)) {
+                        ssl3_send_alert(s, SSL3_AL_FATAL, SSL_AD_DECODE_ERROR);
+                        SSLerr(SSL_F_SSL3_GET_CERTIFICATE_REQUEST, SSL_R_SIGNATURE_ALGORITHMS_ERROR);
                         goto err;
-                        }
-                p += llen;
                 }
+                p += llen;
+        }
 
         /* get the CA RDNs */
-        n2s(p,llen);
+        n2s(p, llen);
 #if 0
-{
-FILE *out;
-out=fopen("/tmp/vsign.der","w");
-fwrite(p,1,llen,out);
-fclose(out);
-}
+        {
+                FILE *out;
+                out = fopen("/tmp/vsign.der", "w");
+                fwrite(p, 1, llen, out);
+                fclose(out);
+        }
 #endif
 
-        if ((unsigned long)(p - d + llen) != n)
-                {
-                ssl3_send_alert(s,SSL3_AL_FATAL,SSL_AD_DECODE_ERROR);
-                SSLerr(SSL_F_SSL3_GET_CERTIFICATE_REQUEST,SSL_R_LENGTH_MISMATCH);
+        if ((unsigned long)(p - d + llen) != n) {
+                ssl3_send_alert(s, SSL3_AL_FATAL, SSL_AD_DECODE_ERROR);
+                SSLerr(SSL_F_SSL3_GET_CERTIFICATE_REQUEST, SSL_R_LENGTH_MISMATCH);
                 goto err;
-                }
+        }
 
-        for (nc=0; nc<llen; )
-                {
-                n2s(p,l);
-                if ((l+nc+2) > llen)
-                        {
+        for (nc = 0; nc < llen; ) {
+                n2s(p, l);
+                if ((l + nc + 2) > llen) {
                         if ((s->options & SSL_OP_NETSCAPE_CA_DN_BUG))
                                 goto cont; /* netscape bugs */
-                        ssl3_send_alert(s,SSL3_AL_FATAL,SSL_AD_DECODE_ERROR);
-                        SSLerr(SSL_F_SSL3_GET_CERTIFICATE_REQUEST,SSL_R_CA_DN_TOO_LONG);
+                        ssl3_send_alert(s, SSL3_AL_FATAL, SSL_AD_DECODE_ERROR);
+                        SSLerr(SSL_F_SSL3_GET_CERTIFICATE_REQUEST, SSL_R_CA_DN_TOO_LONG);
                         goto err;
-                        }
+                }
 
-                q=p;
+                q = p;
 
-                if ((xn=d2i_X509_NAME(NULL,&q,l)) == NULL)
-                        {
+                if ((xn = d2i_X509_NAME(NULL, &q, l)) == NULL) {
                         /* If netscape tolerance is on, ignore errors */
                         if (s->options & SSL_OP_NETSCAPE_CA_DN_BUG)
                                 goto cont;
-                        else
-                                {
-                                ssl3_send_alert(s,SSL3_AL_FATAL,SSL_AD_DECODE_ERROR);
-                                SSLerr(SSL_F_SSL3_GET_CERTIFICATE_REQUEST,ERR_R_ASN1_LIB);
+                        else {
+                                ssl3_send_alert(s, SSL3_AL_FATAL, SSL_AD_DECODE_ERROR);
+                                SSLerr(SSL_F_SSL3_GET_CERTIFICATE_REQUEST, ERR_R_ASN1_LIB);
                                 goto err;
-                                }
                         }
+                }
 
-                if (q != (p+l))
-                        {
-                        ssl3_send_alert(s,SSL3_AL_FATAL,SSL_AD_DECODE_ERROR);
-                        SSLerr(SSL_F_SSL3_GET_CERTIFICATE_REQUEST,SSL_R_CA_DN_LENGTH_MISMATCH);
+                if (q != (p + l)) {
+                        ssl3_send_alert(s, SSL3_AL_FATAL, SSL_AD_DECODE_ERROR);
+                        SSLerr(SSL_F_SSL3_GET_CERTIFICATE_REQUEST, SSL_R_CA_DN_LENGTH_MISMATCH);
                         goto err;
-                        }
-                if (!sk_X509_NAME_push(ca_sk,xn))
-                        {
-                        SSLerr(SSL_F_SSL3_GET_CERTIFICATE_REQUEST,ERR_R_MALLOC_FAILURE);
+                }
+                if (!sk_X509_NAME_push(ca_sk, xn)) {
+                        SSLerr(SSL_F_SSL3_GET_CERTIFICATE_REQUEST, ERR_R_MALLOC_FAILURE);
                         goto err;
-                        }
-
-                p+=l;
-                nc+=l+2;
                 }
 
-        if (0)
-                {
+                p += l;
+                nc += l + 2;
+        }
+
+        if (0) {
 cont:
                 ERR_clear_error();
-                }
+        }
 
         /* we should setup a certificate to return.... */
-        s->s3->tmp.cert_req=1;
-        s->s3->tmp.ctype_num=ctype_num;
+        s->s3->tmp.cert_req = 1;
+        s->s3->tmp.ctype_num = ctype_num;
         if (s->s3->tmp.ca_names != NULL)
-                sk_X509_NAME_pop_free(s->s3->tmp.ca_names,X509_NAME_free);
-        s->s3->tmp.ca_names=ca_sk;
-        ca_sk=NULL;
+                sk_X509_NAME_pop_free(s->s3->tmp.ca_names, X509_NAME_free);
+        s->s3->tmp.ca_names = ca_sk;
+        ca_sk = NULL;
 
-        ret=1;
+        ret = 1;
 err:
-        if (ca_sk != NULL) sk_X509_NAME_pop_free(ca_sk,X509_NAME_free);
-        return(ret);
-        }
+        if (ca_sk != NULL)
+                sk_X509_NAME_pop_free(ca_sk, X509_NAME_free);
+        return (ret);
+}
+
+static int
+ca_dn_cmp(const X509_NAME * const *a, const X509_NAME * const *b)
+{
+        return (X509_NAME_cmp(*a, *b));
+}
 
-static int ca_dn_cmp(const X509_NAME * const *a, const X509_NAME * const *b)
-        {
-        return(X509_NAME_cmp(*a,*b));
-        }
 #ifndef OPENSSL_NO_TLSEXT
-int ssl3_get_new_session_ticket(SSL *s)
-        {
-        int ok,al,ret=0, ticklen;
+int
+ssl3_get_new_session_ticket(SSL *s)
+{
+        int ok, al, ret = 0, ticklen;
         long n;
         const unsigned char *p;
         unsigned char *d;
 
-        n=s->method->ssl_get_message(s,
-                SSL3_ST_CR_SESSION_TICKET_A,
-                SSL3_ST_CR_SESSION_TICKET_B,
-                -1,
-                16384,
-                &ok);
-
+        n = s->method->ssl_get_message(s, SSL3_ST_CR_SESSION_TICKET_A,
+            SSL3_ST_CR_SESSION_TICKET_B, -1, 16384, &ok);
         if (!ok)
-                return((int)n);
+                return ((int)n);
 
-        if (s->s3->tmp.message_type == SSL3_MT_FINISHED)
-                {
-                s->s3->tmp.reuse_message=1;
-                return(1);
-                }
-        if (s->s3->tmp.message_type != SSL3_MT_NEWSESSION_TICKET)
-                {
-                al=SSL_AD_UNEXPECTED_MESSAGE;
-                SSLerr(SSL_F_SSL3_GET_NEW_SESSION_TICKET,SSL_R_BAD_MESSAGE_TYPE);
+        if (s->s3->tmp.message_type == SSL3_MT_FINISHED) {
+                s->s3->tmp.reuse_message = 1;
+                return (1);
+        }
+        if (s->s3->tmp.message_type != SSL3_MT_NEWSESSION_TICKET) {
+                al = SSL_AD_UNEXPECTED_MESSAGE;
+                SSLerr(SSL_F_SSL3_GET_NEW_SESSION_TICKET, SSL_R_BAD_MESSAGE_TYPE);
                 goto f_err;
-                }
-        if (n < 6)
-                {
+        }
+        if (n < 6) {
                 /* need at least ticket_lifetime_hint + ticket length */
                 al = SSL_AD_DECODE_ERROR;
-                SSLerr(SSL_F_SSL3_GET_NEW_SESSION_TICKET,SSL_R_LENGTH_MISMATCH);
+                SSLerr(SSL_F_SSL3_GET_NEW_SESSION_TICKET, SSL_R_LENGTH_MISMATCH);
                 goto f_err;
-                }
+        }
 
-        p=d=(unsigned char *)s->init_msg;
+        p = d = (unsigned char *)s->init_msg;
         n2l(p, s->session->tlsext_tick_lifetime_hint);
         n2s(p, ticklen);
         /* ticket_lifetime_hint + ticket_length + ticket */
-        if (ticklen + 6 != n)
-                {
+        if (ticklen + 6 != n) {
                 al = SSL_AD_DECODE_ERROR;
-                SSLerr(SSL_F_SSL3_GET_NEW_SESSION_TICKET,SSL_R_LENGTH_MISMATCH);
+                SSLerr(SSL_F_SSL3_GET_NEW_SESSION_TICKET, SSL_R_LENGTH_MISMATCH);
                 goto f_err;
-                }
-        if (s->session->tlsext_tick)
-                {
+        }
+        if (s->session->tlsext_tick) {
                 OPENSSL_free(s->session->tlsext_tick);
                 s->session->tlsext_ticklen = 0;
-                }
+        }
         s->session->tlsext_tick = OPENSSL_malloc(ticklen);
-        if (!s->session->tlsext_tick)
-                {
-                SSLerr(SSL_F_SSL3_GET_NEW_SESSION_TICKET,ERR_R_MALLOC_FAILURE);
+        if (!s->session->tlsext_tick) {
+                SSLerr(SSL_F_SSL3_GET_NEW_SESSION_TICKET, ERR_R_MALLOC_FAILURE);
                 goto err;
-                }
+        }
         memcpy(s->session->tlsext_tick, p, ticklen);
         s->session->tlsext_ticklen = ticklen;
         /* There are two ways to detect a resumed ticket sesion.
@@ -2105,122 +1955,116 @@ int ssl3_get_new_session_ticket(SSL *s)
          * ticket.
          */ 
         EVP_Digest(p, ticklen,
-                        s->session->session_id, &s->session->session_id_length,
+        s->session->session_id, &s->session->session_id_length,
 #ifndef OPENSSL_NO_SHA256
-                                                        EVP_sha256(), NULL);
+        EVP_sha256(), NULL);
 #else
-                                                        EVP_sha1(), NULL);
+        EVP_sha1(), NULL);
 #endif
-        ret=1;
-        return(ret);
+        ret = 1;
+        return (ret);
 f_err:
-        ssl3_send_alert(s,SSL3_AL_FATAL,al);
+        ssl3_send_alert(s, SSL3_AL_FATAL, al);
 err:
-        return(-1);
-        }
+        return (-1);
+}
 
-int ssl3_get_cert_status(SSL *s)
-        {
+int
+ssl3_get_cert_status(SSL *s)
+{
         int ok, al;
-        unsigned long resplen,n;
+        unsigned long resplen, n;
         const unsigned char *p;
 
-        n=s->method->ssl_get_message(s,
-                SSL3_ST_CR_CERT_STATUS_A,
-                SSL3_ST_CR_CERT_STATUS_B,
-                SSL3_MT_CERTIFICATE_STATUS,
-                16384,
-                &ok);
+        n = s->method->ssl_get_message(s,
+        SSL3_ST_CR_CERT_STATUS_A,
+        SSL3_ST_CR_CERT_STATUS_B,
+        SSL3_MT_CERTIFICATE_STATUS,
+        16384,
+        &ok);
 
-        if (!ok) return((int)n);
-        if (n < 4)
-                {
+        if (!ok)
+                return ((int)n);
+        if (n < 4) {
                 /* need at least status type + length */
                 al = SSL_AD_DECODE_ERROR;
-                SSLerr(SSL_F_SSL3_GET_CERT_STATUS,SSL_R_LENGTH_MISMATCH);
+                SSLerr(SSL_F_SSL3_GET_CERT_STATUS, SSL_R_LENGTH_MISMATCH);
                 goto f_err;
-                }
+        }
         p = (unsigned char *)s->init_msg;
-        if (*p++ != TLSEXT_STATUSTYPE_ocsp)
-                {
+        if (*p++ != TLSEXT_STATUSTYPE_ocsp) {
                 al = SSL_AD_DECODE_ERROR;
-                SSLerr(SSL_F_SSL3_GET_CERT_STATUS,SSL_R_UNSUPPORTED_STATUS_TYPE);
+                SSLerr(SSL_F_SSL3_GET_CERT_STATUS, SSL_R_UNSUPPORTED_STATUS_TYPE);
                 goto f_err;
-                }
+        }
         n2l3(p, resplen);
-        if (resplen + 4 != n)
-                {
+        if (resplen + 4 != n) {
                 al = SSL_AD_DECODE_ERROR;
-                SSLerr(SSL_F_SSL3_GET_CERT_STATUS,SSL_R_LENGTH_MISMATCH);
+                SSLerr(SSL_F_SSL3_GET_CERT_STATUS, SSL_R_LENGTH_MISMATCH);
                 goto f_err;
-                }
+        }
         if (s->tlsext_ocsp_resp)
                 OPENSSL_free(s->tlsext_ocsp_resp);
         s->tlsext_ocsp_resp = BUF_memdup(p, resplen);
-        if (!s->tlsext_ocsp_resp)
-                {
+        if (!s->tlsext_ocsp_resp) {
                 al = SSL_AD_INTERNAL_ERROR;
-                SSLerr(SSL_F_SSL3_GET_CERT_STATUS,ERR_R_MALLOC_FAILURE);
+                SSLerr(SSL_F_SSL3_GET_CERT_STATUS, ERR_R_MALLOC_FAILURE);
                 goto f_err;
-                }
+        }
         s->tlsext_ocsp_resplen = resplen;
-        if (s->ctx->tlsext_status_cb)
-                {
+        if (s->ctx->tlsext_status_cb) {
                 int ret;
                 ret = s->ctx->tlsext_status_cb(s, s->ctx->tlsext_status_arg);
-                if (ret == 0)
-                        {
+                if (ret == 0) {
                         al = SSL_AD_BAD_CERTIFICATE_STATUS_RESPONSE;
-                        SSLerr(SSL_F_SSL3_GET_CERT_STATUS,SSL_R_INVALID_STATUS_RESPONSE);
+                        SSLerr(SSL_F_SSL3_GET_CERT_STATUS, SSL_R_INVALID_STATUS_RESPONSE);
                         goto f_err;
-                        }
-                if (ret < 0)
-                        {
+                }
+                if (ret < 0) {
                         al = SSL_AD_INTERNAL_ERROR;
-                        SSLerr(SSL_F_SSL3_GET_CERT_STATUS,ERR_R_MALLOC_FAILURE);
+                        SSLerr(SSL_F_SSL3_GET_CERT_STATUS, ERR_R_MALLOC_FAILURE);
                         goto f_err;
-                        }
                 }
+        }
         return 1;
 f_err:
-        ssl3_send_alert(s,SSL3_AL_FATAL,al);
-        return(-1);
-        }
+        ssl3_send_alert(s, SSL3_AL_FATAL, al);
+        return (-1);
+}
 #endif
 
-int ssl3_get_server_done(SSL *s)
-        {
-        int ok,ret=0;
+int
+ssl3_get_server_done(SSL *s)
+{
+        int ok, ret = 0;
         long n;
 
-        n=s->method->ssl_get_message(s,
-                SSL3_ST_CR_SRVR_DONE_A,
-                SSL3_ST_CR_SRVR_DONE_B,
-                SSL3_MT_SERVER_DONE,
-                30, /* should be very small, like 0 :-) */
-                &ok);
+        n = s->method->ssl_get_message(s, SSL3_ST_CR_SRVR_DONE_A,
+            SSL3_ST_CR_SRVR_DONE_B, SSL3_MT_SERVER_DONE,
+            30, /* should be very small, like 0 :-) */ &ok);
 
-        if (!ok) return((int)n);
-        if (n > 0)
-                {
+        if (!ok)
+                return ((int)n);
+        if (n > 0) {
                 /* should contain no data */
-                ssl3_send_alert(s,SSL3_AL_FATAL,SSL_AD_DECODE_ERROR);
-                SSLerr(SSL_F_SSL3_GET_SERVER_DONE,SSL_R_LENGTH_MISMATCH);
+                ssl3_send_alert(s, SSL3_AL_FATAL, SSL_AD_DECODE_ERROR);
+                SSLerr(SSL_F_SSL3_GET_SERVER_DONE, SSL_R_LENGTH_MISMATCH);
                 return -1;
-                }
-        ret=1;
-        return(ret);
         }
+        ret = 1;
+        return (ret);
+}
 
 
-int ssl3_send_client_key_exchange(SSL *s)
-        {
-        unsigned char *p,*d;
+int
+ssl3_send_client_key_exchange(SSL *s)
+{
+        unsigned char *p, *d;
         int n;
         unsigned long alg_k;
 #ifndef OPENSSL_NO_RSA
         unsigned char *q;
-        EVP_PKEY *pkey=NULL;
+        EVP_PKEY *pkey = NULL;
 #endif
 #ifndef OPENSSL_NO_KRB5
         KSSL_ERR kssl_err;
@@ -2234,77 +2078,73 @@ int ssl3_send_client_key_exchange(SSL *s)
         BN_CTX * bn_ctx = NULL;
 #endif
 
-        if (s->state == SSL3_ST_CW_KEY_EXCH_A)
-                {
-                d=(unsigned char *)s->init_buf->data;
-                p= &(d[4]);
+        if (s->state == SSL3_ST_CW_KEY_EXCH_A) {
+                d = (unsigned char *)s->init_buf->data;
+                p = &(d[4]);
 
-                alg_k=s->s3->tmp.new_cipher->algorithm_mkey;
+                alg_k = s->s3->tmp.new_cipher->algorithm_mkey;
 
                 /* Fool emacs indentation */
-                if (0) {}
+                if (0) {
+                }
 #ifndef OPENSSL_NO_RSA
-                else if (alg_k & SSL_kRSA)
-                        {
+                else if (alg_k & SSL_kRSA) {
                         RSA *rsa;
                         unsigned char tmp_buf[SSL_MAX_MASTER_KEY_LENGTH];
 
                         if (s->session->sess_cert->peer_rsa_tmp != NULL)
-                                rsa=s->session->sess_cert->peer_rsa_tmp;
-                        else
-                                {
-                                pkey=X509_get_pubkey(s->session->sess_cert->peer_pkeys[SSL_PKEY_RSA_ENC].x509);
+                                rsa = s->session->sess_cert->peer_rsa_tmp;
+                        else {
+                                pkey = X509_get_pubkey(s->session->sess_cert->peer_pkeys[SSL_PKEY_RSA_ENC].x509);
                                 if ((pkey == NULL) ||
-                                        (pkey->type != EVP_PKEY_RSA) ||
-                                        (pkey->pkey.rsa == NULL))
-                                        {
-                                        SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,ERR_R_INTERNAL_ERROR);
+                                    (pkey->type != EVP_PKEY_RSA) ||
+                                    (pkey->pkey.rsa == NULL)) {
+                                        SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE, ERR_R_INTERNAL_ERROR);
                                         goto err;
-                                        }
-                                rsa=pkey->pkey.rsa;
-                                EVP_PKEY_free(pkey);
                                 }
-                                
-                        tmp_buf[0]=s->client_version>>8;
-                        tmp_buf[1]=s->client_version&0xff;
-                        if (RAND_bytes(&(tmp_buf[2]),sizeof tmp_buf-2) <= 0)
-                                        goto err;
+                                rsa = pkey->pkey.rsa;
+                                EVP_PKEY_free(pkey);
+                        }
+
+                        tmp_buf[0] = s->client_version >> 8;
+                        tmp_buf[1] = s->client_version & 0xff;
+                        if (RAND_bytes(&(tmp_buf[2]), sizeof tmp_buf - 2) <= 0)
+                                goto err;
 
-                        s->session->master_key_length=sizeof tmp_buf;
+                        s->session->master_key_length = sizeof tmp_buf;
 
-                        q=p;
+                        q = p;
                         /* Fix buf for TLS and beyond */
                         if (s->version > SSL3_VERSION)
-                                p+=2;
-                        n=RSA_public_encrypt(sizeof tmp_buf,
-                                tmp_buf,p,rsa,RSA_PKCS1_PADDING);
+                                p += 2;
+                        n = RSA_public_encrypt(sizeof tmp_buf,
+                        tmp_buf, p, rsa, RSA_PKCS1_PADDING);
 #ifdef PKCS1_CHECK
-                        if (s->options & SSL_OP_PKCS1_CHECK_1) p[1]++;
-                        if (s->options & SSL_OP_PKCS1_CHECK_2) tmp_buf[0]=0x70;
+                        if (s->options & SSL_OP_PKCS1_CHECK_1)
+                                p[1]++;
+                        if (s->options & SSL_OP_PKCS1_CHECK_2)
+                                tmp_buf[0] = 0x70;
 #endif
-                        if (n <= 0)
-                                {
-                                SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,SSL_R_BAD_RSA_ENCRYPT);
+                        if (n <= 0) {
+                                SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE, SSL_R_BAD_RSA_ENCRYPT);
                                 goto err;
-                                }
+                        }
 
                         /* Fix buf for TLS and beyond */
-                        if (s->version > SSL3_VERSION)
-                                {
-                                s2n(n,q);
-                                n+=2;
-                                }
-
-                        s->session->master_key_length=
-                                s->method->ssl3_enc->generate_master_secret(s,
-                                        s->session->master_key,
-                                        tmp_buf,sizeof tmp_buf);
-                        OPENSSL_cleanse(tmp_buf,sizeof tmp_buf);
+                        if (s->version > SSL3_VERSION) {
+                                s2n(n, q);
+                                n += 2;
                         }
+
+                        s->session->master_key_length =
+                            s->method->ssl3_enc->generate_master_secret(
+                                s, s->session->master_key, tmp_buf,
+                                sizeof tmp_buf);
+                        OPENSSL_cleanse(tmp_buf, sizeof tmp_buf);
+                }
 #endif
 #ifndef OPENSSL_NO_KRB5
-                else if (alg_k & SSL_kKRB5)
-                        {
+                else if (alg_k & SSL_kKRB5) {
                         krb5_error_code krb5rc;
                         KSSL_CTX        *kssl_ctx = s->kssl_ctx;
                         /*  krb5_data   krb5_ap_req;  */
@@ -2314,43 +2154,43 @@ int ssl3_send_client_key_exchange(SSL *s)
                         const EVP_CIPHER *enc = NULL;
                         unsigned char   iv[EVP_MAX_IV_LENGTH];
                         unsigned char   tmp_buf[SSL_MAX_MASTER_KEY_LENGTH];
-                        unsigned char   epms[SSL_MAX_MASTER_KEY_LENGTH 
-                                                + EVP_MAX_IV_LENGTH];
+                        unsigned char   epms[SSL_MAX_MASTER_KEY_LENGTH
+                        + EVP_MAX_IV_LENGTH];
                         int             padl, outl = sizeof(epms);
 
                         EVP_CIPHER_CTX_init(&ciph_ctx);
 
 #ifdef KSSL_DEBUG
                         printf("ssl3_send_client_key_exchange(%lx & %lx)\n",
-                                alg_k, SSL_kKRB5);
+                        alg_k, SSL_kKRB5);
 #endif  /* KSSL_DEBUG */
 
                         authp = NULL;
 #ifdef KRB5SENDAUTH
-                        if (KRB5SENDAUTH)  authp = &authenticator;
+                        if (KRB5SENDAUTH)
+                                authp = &authenticator;
 #endif  /* KRB5SENDAUTH */
 
-                        krb5rc = kssl_cget_tkt(kssl_ctx, &enc_ticket, authp,
-                                &kssl_err);
+                        krb5rc = kssl_cget_tkt(kssl_ctx, &enc_ticket,
+                            authp, &kssl_err);
                         enc = kssl_map_enc(kssl_ctx->enctype);
                         if (enc == NULL)
-                            goto err;
+                                goto err;
 #ifdef KSSL_DEBUG
                         {
-                        printf("kssl_cget_tkt rtn %d\n", krb5rc);
-                        if (krb5rc && kssl_err.text)
-                          printf("kssl_cget_tkt kssl_err=%s\n", kssl_err.text);
+                                printf("kssl_cget_tkt rtn %d\n", krb5rc);
+                                if (krb5rc && kssl_err.text)
+                                        printf("kssl_cget_tkt kssl_err=%s\n", kssl_err.text);
                         }
 #endif  /* KSSL_DEBUG */
 
-                        if (krb5rc)
-                                {
-                                ssl3_send_alert(s,SSL3_AL_FATAL,
-                                                SSL_AD_HANDSHAKE_FAILURE);
+                        if (krb5rc) {
+                                ssl3_send_alert(s, SSL3_AL_FATAL,
+                                SSL_AD_HANDSHAKE_FAILURE);
                                 SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,
-                                                kssl_err.reason);
+                                kssl_err.reason);
                                 goto err;
-                                }
+                        }
 
                         /*  20010406 VRS - Earlier versions used KRB5 AP_REQ
                         **  in place of RFC 2712 KerberosWrapper, as in:
@@ -2372,32 +2212,29 @@ int ssl3_send_client_key_exchange(SSL *s)
                         */
 
                         /*  KerberosWrapper.Ticket              */
-                        s2n(enc_ticket->length,p);
+                        s2n(enc_ticket->length, p);
                         memcpy(p, enc_ticket->data, enc_ticket->length);
-                        p+= enc_ticket->length;
+                        p += enc_ticket->length;
                         n = enc_ticket->length + 2;
 
                         /*  KerberosWrapper.Authenticator       */
-                        if (authp  &&  authp->length)  
-                                {
-                                s2n(authp->length,p);
+                        if (authp && authp->length) {
+                                s2n(authp->length, p);
                                 memcpy(p, authp->data, authp->length);
-                                p+= authp->length;
-                                n+= authp->length + 2;
-                                
+                                p += authp->length;
+                                n += authp->length + 2;
+
                                 free(authp->data);
                                 authp->data = NULL;
                                 authp->length = 0;
-                                }
-                        else
-                                {
+                        } else {
                                 s2n(0,p);/*  null authenticator length  */
-                                n+=2;
-                                }
- 
-                            tmp_buf[0]=s->client_version>>8;
-                            tmp_buf[1]=s->client_version&0xff;
-                            if (RAND_bytes(&(tmp_buf[2]),sizeof tmp_buf-2) <= 0)
+                                n += 2;
+                        }
+
+                        tmp_buf[0] = s->client_version >> 8;
+                        tmp_buf[1] = s->client_version&0xff;
+                        if (RAND_bytes(&(tmp_buf[2]), sizeof tmp_buf - 2) <= 0)
                                 goto err;
 
                         /*  20010420 VRS.  Tried it this way; failed.
@@ -2407,104 +2244,97 @@ int ssl3_send_client_key_exchange(SSL *s)
                         **      EVP_EncryptInit_ex(&ciph_ctx,NULL, key,iv);
                         */
 
-                        memset(iv, 0, sizeof iv);  /* per RFC 1510 */
-                        EVP_EncryptInit_ex(&ciph_ctx,enc, NULL,
-                                kssl_ctx->key,iv);
-                        EVP_EncryptUpdate(&ciph_ctx,epms,&outl,tmp_buf,
-                                sizeof tmp_buf);
-                        EVP_EncryptFinal_ex(&ciph_ctx,&(epms[outl]),&padl);
+                        memset(iv, 0, sizeof iv);
+                        /* per RFC 1510 */
+                        EVP_EncryptInit_ex(&ciph_ctx, enc, NULL,
+                        kssl_ctx->key, iv);
+                        EVP_EncryptUpdate(&ciph_ctx, epms, &outl, tmp_buf,
+                        sizeof tmp_buf);
+                        EVP_EncryptFinal_ex(&ciph_ctx, &(epms[outl]), &padl);
                         outl += padl;
-                        if (outl > (int)sizeof epms)
-                                {
+                        if (outl > (int)sizeof epms) {
                                 SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE, ERR_R_INTERNAL_ERROR);
                                 goto err;
-                                }
+                        }
                         EVP_CIPHER_CTX_cleanup(&ciph_ctx);
 
                         /*  KerberosWrapper.EncryptedPreMasterSecret    */
-                        s2n(outl,p);
+                        s2n(outl, p);
                         memcpy(p, epms, outl);
-                        p+=outl;
-                        n+=outl + 2;
+                        p += outl;
+                        n += outl + 2;
 
-                        s->session->master_key_length=
-                                s->method->ssl3_enc->generate_master_secret(s,
-                                        s->session->master_key,
-                                        tmp_buf, sizeof tmp_buf);
+                        s->session->master_key_length =
+                        s->method->ssl3_enc->generate_master_secret(s,
+                        s->session->master_key,
+                        tmp_buf, sizeof tmp_buf);
 
                         OPENSSL_cleanse(tmp_buf, sizeof tmp_buf);
                         OPENSSL_cleanse(epms, outl);
-                        }
+                }
 #endif
 #ifndef OPENSSL_NO_DH
-                else if (alg_k & (SSL_kEDH|SSL_kDHr|SSL_kDHd))
-                        {
-                        DH *dh_srvr,*dh_clnt;
+                else if (alg_k & (SSL_kEDH|SSL_kDHr|SSL_kDHd)) {
+                        DH *dh_srvr, *dh_clnt;
 
-                        if (s->session->sess_cert == NULL) 
-                                {
-                                ssl3_send_alert(s,SSL3_AL_FATAL,SSL_AD_UNEXPECTED_MESSAGE);
-                                SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,SSL_R_UNEXPECTED_MESSAGE);
+                        if (s->session->sess_cert == NULL) {
+                                ssl3_send_alert(s, SSL3_AL_FATAL, SSL_AD_UNEXPECTED_MESSAGE);
+                                SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE, SSL_R_UNEXPECTED_MESSAGE);
                                 goto err;
-                                }
+                        }
 
                         if (s->session->sess_cert->peer_dh_tmp != NULL)
-                                dh_srvr=s->session->sess_cert->peer_dh_tmp;
-                        else
-                                {
+                                dh_srvr = s->session->sess_cert->peer_dh_tmp;
+                        else {
                                 /* we get them from the cert */
-                                ssl3_send_alert(s,SSL3_AL_FATAL,SSL_AD_HANDSHAKE_FAILURE);
-                                SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,SSL_R_UNABLE_TO_FIND_DH_PARAMETERS);
+                                ssl3_send_alert(s, SSL3_AL_FATAL, SSL_AD_HANDSHAKE_FAILURE);
+                                SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE, SSL_R_UNABLE_TO_FIND_DH_PARAMETERS);
                                 goto err;
-                                }
-                        
+                        }
+
                         /* generate a new random key */
-                        if ((dh_clnt=DHparams_dup(dh_srvr)) == NULL)
-                                {
-                                SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,ERR_R_DH_LIB);
+                        if ((dh_clnt = DHparams_dup(dh_srvr)) == NULL) {
+                                SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE, ERR_R_DH_LIB);
                                 goto err;
-                                }
-                        if (!DH_generate_key(dh_clnt))
-                                {
-                                SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,ERR_R_DH_LIB);
+                        }
+                        if (!DH_generate_key(dh_clnt)) {
+                                SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE, ERR_R_DH_LIB);
                                 DH_free(dh_clnt);
                                 goto err;
-                                }
+                        }
 
                         /* use the 'p' output buffer for the DH key, but
                          * make sure to clear it out afterwards */
 
-                        n=DH_compute_key(p,dh_srvr->pub_key,dh_clnt);
+                        n = DH_compute_key(p, dh_srvr->pub_key, dh_clnt);
 
-                        if (n <= 0)
-                                {
-                                SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,ERR_R_DH_LIB);
+                        if (n <= 0) {
+                                SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE, ERR_R_DH_LIB);
                                 DH_free(dh_clnt);
                                 goto err;
-                                }
+                        }
 
                         /* generate master key from the result */
-                        s->session->master_key_length=
-                                s->method->ssl3_enc->generate_master_secret(s,
-                                        s->session->master_key,p,n);
+                        s->session->master_key_length =
+                        s->method->ssl3_enc->generate_master_secret(s,
+                        s->session->master_key, p, n);
                         /* clean up */
-                        memset(p,0,n);
+                        memset(p, 0, n);
 
                         /* send off the data */
-                        n=BN_num_bytes(dh_clnt->pub_key);
-                        s2n(n,p);
-                        BN_bn2bin(dh_clnt->pub_key,p);
-                        n+=2;
+                        n = BN_num_bytes(dh_clnt->pub_key);
+                        s2n(n, p);
+                        BN_bn2bin(dh_clnt->pub_key, p);
+                        n += 2;
 
                         DH_free(dh_clnt);
 
                         /* perhaps clean things up a bit EAY EAY EAY EAY*/
-                        }
+                }
 #endif
 
 #ifndef OPENSSL_NO_ECDH 
-                else if (alg_k & (SSL_kEECDH|SSL_kECDHr|SSL_kECDHe))
-                        {
+                else if (alg_k & (SSL_kEECDH|SSL_kECDHr|SSL_kECDHe)) {
                         const EC_GROUP *srvr_group = NULL;
                         EC_KEY *tkey;
                         int ecdh_clnt_cert = 0;
@@ -2515,8 +2345,7 @@ int ssl3_send_client_key_exchange(SSL *s)
                          * computation as part of client certificate?
                          * If so, set ecdh_clnt_cert to 1.
                          */
-                        if ((alg_k & (SSL_kECDHr|SSL_kECDHe)) && (s->cert != NULL)) 
-                                {
+                        if ((alg_k & (SSL_kECDHr|SSL_kECDHe)) && (s->cert != NULL)) {
                                 /* XXX: For now, we do not support client
                                  * authentication using ECDH certificates.
                                  * To add such support, one needs to add
@@ -2536,52 +2365,44 @@ int ssl3_send_client_key_exchange(SSL *s)
                                  *      EVP_PKEY_EC) && ...)
                                  * ecdh_clnt_cert = 1;
                                  */
-                                }
+                        }
 
-                        if (s->session->sess_cert->peer_ecdh_tmp != NULL)
-                                {
+                        if (s->session->sess_cert->peer_ecdh_tmp != NULL) {
                                 tkey = s->session->sess_cert->peer_ecdh_tmp;
-                                }
-                        else
-                                {
+                        } else {
                                 /* Get the Server Public Key from Cert */
                                 srvr_pub_pkey = X509_get_pubkey(s->session-> \
                                     sess_cert->peer_pkeys[SSL_PKEY_ECC].x509);
                                 if ((srvr_pub_pkey == NULL) ||
-                                    (srvr_pub_pkey->type != EVP_PKEY_EC) ||
-                                    (srvr_pub_pkey->pkey.ec == NULL))
-                                        {
+                                        (srvr_pub_pkey->type != EVP_PKEY_EC) ||
+                                (srvr_pub_pkey->pkey.ec == NULL)) {
                                         SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,
-                                            ERR_R_INTERNAL_ERROR);
+                                        ERR_R_INTERNAL_ERROR);
                                         goto err;
-                                        }
+                                }
 
                                 tkey = srvr_pub_pkey->pkey.ec;
-                                }
+                        }
 
-                        srvr_group   = EC_KEY_get0_group(tkey);
+                        srvr_group = EC_KEY_get0_group(tkey);
                         srvr_ecpoint = EC_KEY_get0_public_key(tkey);
 
-                        if ((srvr_group == NULL) || (srvr_ecpoint == NULL))
-                                {
+                        if ((srvr_group == NULL) || (srvr_ecpoint == NULL)) {
                                 SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,
-                                    ERR_R_INTERNAL_ERROR);
+                                ERR_R_INTERNAL_ERROR);
                                 goto err;
-                                }
+                        }
 
-                        if ((clnt_ecdh=EC_KEY_new()) == NULL) 
-                                {
-                                SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,ERR_R_MALLOC_FAILURE);
+                        if ((clnt_ecdh = EC_KEY_new()) == NULL) {
+                                SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE, ERR_R_MALLOC_FAILURE);
                                 goto err;
-                                }
+                        }
 
-                        if (!EC_KEY_set_group(clnt_ecdh, srvr_group))
-                                {
-                                SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,ERR_R_EC_LIB);
+                        if (!EC_KEY_set_group(clnt_ecdh, srvr_group)) {
+                                SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE, ERR_R_EC_LIB);
                                 goto err;
-                                }
-                        if (ecdh_clnt_cert) 
-                                { 
+                        }
+                        if (ecdh_clnt_cert) {
                                 /* Reuse key info from our certificate
                                  * We only need our private key to perform
                                  * the ECDH computation.
@@ -2589,581 +2410,529 @@ int ssl3_send_client_key_exchange(SSL *s)
                                 const BIGNUM *priv_key;
                                 tkey = s->cert->key->privatekey->pkey.ec;
                                 priv_key = EC_KEY_get0_private_key(tkey);
-                                if (priv_key == NULL)
-                                        {
-                                        SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,ERR_R_MALLOC_FAILURE);
+                                if (priv_key == NULL) {
+                                        SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE, ERR_R_MALLOC_FAILURE);
                                         goto err;
-                                        }
-                                if (!EC_KEY_set_private_key(clnt_ecdh, priv_key))
-                                        {
-                                        SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,ERR_R_EC_LIB);
+                                }
+                                if (!EC_KEY_set_private_key(clnt_ecdh, priv_key)) {
+                                        SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE, ERR_R_EC_LIB);
                                         goto err;
-                                        }
                                 }
-                        else 
-                                {
+                        } else {
                                 /* Generate a new ECDH key pair */
-                                if (!(EC_KEY_generate_key(clnt_ecdh)))
-                                        {
+                                if (!(EC_KEY_generate_key(clnt_ecdh))) {
                                         SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE, ERR_R_ECDH_LIB);
                                         goto err;
-                                        }
                                 }
+                        }
 
                         /* use the 'p' output buffer for the ECDH key, but
                          * make sure to clear it out afterwards
                          */
 
                         field_size = EC_GROUP_get_degree(srvr_group);
-                        if (field_size <= 0)
-                                {
-                                SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE, 
-                                       ERR_R_ECDH_LIB);
+                        if (field_size <= 0) {
+                                SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,
+                                ERR_R_ECDH_LIB);
                                 goto err;
-                                }
-                        n=ECDH_compute_key(p, (field_size+7)/8, srvr_ecpoint, clnt_ecdh, NULL);
-                        if (n <= 0)
-                                {
-                                SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE, 
-                                       ERR_R_ECDH_LIB);
+                        }
+                        n = ECDH_compute_key(p, (field_size + 7)/8, srvr_ecpoint, clnt_ecdh, NULL);
+                        if (n <= 0) {
+                                SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,
+                                ERR_R_ECDH_LIB);
                                 goto err;
-                                }
+                        }
 
                         /* generate master key from the result */
                         s->session->master_key_length = s->method->ssl3_enc \
                             -> generate_master_secret(s, 
-                                s->session->master_key,
-                                p, n);
+                        s->session->master_key,
+                        p, n);
 
                         memset(p, 0, n); /* clean up */
 
-                        if (ecdh_clnt_cert) 
-                                {
+                        if (ecdh_clnt_cert) {
                                 /* Send empty client key exch message */
                                 n = 0;
-                                }
-                        else 
-                                {
+                        } else {
                                 /* First check the size of encoding and
                                  * allocate memory accordingly.
                                  */
-                                encoded_pt_len = 
-                                    EC_POINT_point2oct(srvr_group, 
-                                        EC_KEY_get0_public_key(clnt_ecdh), 
-                                        POINT_CONVERSION_UNCOMPRESSED, 
-                                        NULL, 0, NULL);
-
-                                encodedPoint = (unsigned char *) 
-                                    OPENSSL_malloc(encoded_pt_len * 
-                                        sizeof(unsigned char)); 
+                                encoded_pt_len =
+                                   EC_POINT_point2oct(srvr_group,
+                                       EC_KEY_get0_public_key(clnt_ecdh),
+                                       POINT_CONVERSION_UNCOMPRESSED,
+                                       NULL, 0, NULL);
+
+                                encodedPoint =
+                                    (unsigned char *)OPENSSL_malloc(
+                                        encoded_pt_len * sizeof(unsigned char));
+
                                 bn_ctx = BN_CTX_new();
-                                if ((encodedPoint == NULL) || 
-                                    (bn_ctx == NULL)) 
-                                        {
-                                        SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,ERR_R_MALLOC_FAILURE);
+                                if ((encodedPoint == NULL) ||
+                                    (bn_ctx == NULL)) {
+                                        SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE, ERR_R_MALLOC_FAILURE);
                                         goto err;
-                                        }
+                                }
 
                                 /* Encode the public key */
-                                n = EC_POINT_point2oct(srvr_group, 
-                                    EC_KEY_get0_public_key(clnt_ecdh), 
-                                    POINT_CONVERSION_UNCOMPRESSED, 
-                                    encodedPoint, encoded_pt_len, bn_ctx);
+                                n = EC_POINT_point2oct(srvr_group,
+                                EC_KEY_get0_public_key(clnt_ecdh),
+                                POINT_CONVERSION_UNCOMPRESSED,
+                                encodedPoint, encoded_pt_len, bn_ctx);
 
                                 *p = n; /* length of encoded point */
                                 /* Encoded point will be copied here */
-                                p += 1; 
+                                p += 1;
+
                                 /* copy the point */
                                 memcpy((unsigned char *)p, encodedPoint, n);
                                 /* increment n to account for length field */
-                                n += 1; 
-                                }
+                                n += 1;
+
+                        }
 
                         /* Free allocated memory */
                         BN_CTX_free(bn_ctx);
-                        if (encodedPoint != NULL) OPENSSL_free(encodedPoint);
-                        if (clnt_ecdh != NULL) 
-                                 EC_KEY_free(clnt_ecdh);
+                        if (encodedPoint != NULL)
+                                OPENSSL_free(encodedPoint);
+                        if (clnt_ecdh != NULL)
+                                EC_KEY_free(clnt_ecdh);
                         EVP_PKEY_free(srvr_pub_pkey);
-                        }
+                }
 #endif /* !OPENSSL_NO_ECDH */
-                else if (alg_k & SSL_kGOST) 
-                        {
+                else if (alg_k & SSL_kGOST) {
                         /* GOST key exchange message creation */
                         EVP_PKEY_CTX *pkey_ctx;
-                        X509 *peer_cert; 
+                        X509 *peer_cert;
+
                         size_t msglen;
                         unsigned int md_len;
                         int keytype;
-                        unsigned char premaster_secret[32],shared_ukm[32], tmp[256];
+                        unsigned char premaster_secret[32], shared_ukm[32], tmp[256];
                         EVP_MD_CTX *ukm_hash;
                         EVP_PKEY *pub_key;
 
                         /* Get server sertificate PKEY and create ctx from it */
-                        peer_cert=s->session->sess_cert->peer_pkeys[(keytype=SSL_PKEY_GOST01)].x509;
-                        if (!peer_cert) 
-                                peer_cert=s->session->sess_cert->peer_pkeys[(keytype=SSL_PKEY_GOST94)].x509;
-                        if (!peer_cert)         {
-                                        SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,SSL_R_NO_GOST_CERTIFICATE_SENT_BY_PEER);
-                                        goto err;
-                                }       
-                                
-                        pkey_ctx=EVP_PKEY_CTX_new(pub_key=X509_get_pubkey(peer_cert),NULL);
+                        peer_cert = s->session->sess_cert->peer_pkeys[(keytype = SSL_PKEY_GOST01)].x509;
+                        if (!peer_cert)
+                                peer_cert = s->session->sess_cert->peer_pkeys[(keytype = SSL_PKEY_GOST94)].x509;
+                        if (!peer_cert) {
+                                SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE, SSL_R_NO_GOST_CERTIFICATE_SENT_BY_PEER);
+                                goto err;
+                        }
+
+                        pkey_ctx = EVP_PKEY_CTX_new(pub_key = X509_get_pubkey(peer_cert), NULL);
                         /* If we have send a certificate, and certificate key
 
                          * parameters match those of server certificate, use
                          * certificate key for key exchange
                          */
 
-                         /* Otherwise, generate ephemeral key pair */
-                                        
+                        /* Otherwise, generate ephemeral key pair */
+
                         EVP_PKEY_encrypt_init(pkey_ctx);
-                          /* Generate session key */    
-                    RAND_bytes(premaster_secret,32);
+                        /* Generate session key */
+                        RAND_bytes(premaster_secret, 32);
                         /* If we have client certificate, use its secret as peer key */
                         if (s->s3->tmp.cert_req && s->cert->key->privatekey) {
-                                if (EVP_PKEY_derive_set_peer(pkey_ctx,s->cert->key->privatekey) <=0) {
+                                if (EVP_PKEY_derive_set_peer(pkey_ctx, s->cert->key->privatekey) <=0) {
                                         /* If there was an error - just ignore it. Ephemeral key
                                         * would be used
                                         */
                                         ERR_clear_error();
                                 }
-                        }                       
+                        }
                         /* Compute shared IV and store it in algorithm-specific
                          * context data */
                         ukm_hash = EVP_MD_CTX_create();
-                        EVP_DigestInit(ukm_hash,EVP_get_digestbynid(NID_id_GostR3411_94));
-                        EVP_DigestUpdate(ukm_hash,s->s3->client_random,SSL3_RANDOM_SIZE);
-                        EVP_DigestUpdate(ukm_hash,s->s3->server_random,SSL3_RANDOM_SIZE);
+                        EVP_DigestInit(ukm_hash, EVP_get_digestbynid(NID_id_GostR3411_94));
+                        EVP_DigestUpdate(ukm_hash, s->s3->client_random, SSL3_RANDOM_SIZE);
+                        EVP_DigestUpdate(ukm_hash, s->s3->server_random, SSL3_RANDOM_SIZE);
                         EVP_DigestFinal_ex(ukm_hash, shared_ukm, &md_len);
                         EVP_MD_CTX_destroy(ukm_hash);
-                        if (EVP_PKEY_CTX_ctrl(pkey_ctx,-1,EVP_PKEY_OP_ENCRYPT,EVP_PKEY_CTRL_SET_IV,
-                                8,shared_ukm)<0) {
-                                        SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,
-                                                SSL_R_LIBRARY_BUG);
-                                        goto err;
-                                }       
+                        if (EVP_PKEY_CTX_ctrl(pkey_ctx, -1, EVP_PKEY_OP_ENCRYPT, EVP_PKEY_CTRL_SET_IV,
+                                8, shared_ukm) < 0) {
+                                SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,
+                                SSL_R_LIBRARY_BUG);
+                                goto err;
+                        }
                         /* Make GOST keytransport blob message */
                         /*Encapsulate it into sequence */
-                        *(p++)=V_ASN1_SEQUENCE | V_ASN1_CONSTRUCTED;
-                        msglen=255;
-                        if (EVP_PKEY_encrypt(pkey_ctx,tmp,&msglen,premaster_secret,32)<0) {
-                        SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,
-                                        SSL_R_LIBRARY_BUG);
+                        *(p++) = V_ASN1_SEQUENCE | V_ASN1_CONSTRUCTED;
+                        msglen = 255;
+                        if (EVP_PKEY_encrypt(pkey_ctx, tmp, &msglen, premaster_secret, 32) < 0) {
+                                SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,
+                                SSL_R_LIBRARY_BUG);
                                 goto err;
                         }
-                        if (msglen >= 0x80)
-                                {
-                                *(p++)=0x81;
-                                *(p++)= msglen & 0xff;
-                                n=msglen+3;
-                                }
-                        else
-                                {
-                                *(p++)= msglen & 0xff;
-                                n=msglen+2;
-                                }
+                        if (msglen >= 0x80) {
+                                *(p++) = 0x81;
+                                *(p++) = msglen & 0xff;
+                                n = msglen + 3;
+                        } else {
+                                *(p++) = msglen & 0xff;
+                                n = msglen + 2;
+                        }
                         memcpy(p, tmp, msglen);
                         /* Check if pubkey from client certificate was used */
-                        if (EVP_PKEY_CTX_ctrl(pkey_ctx, -1, -1, EVP_PKEY_CTRL_PEER_KEY, 2, NULL) > 0)
-                                {
+                        if (EVP_PKEY_CTX_ctrl(pkey_ctx, -1, -1, EVP_PKEY_CTRL_PEER_KEY, 2, NULL) > 0) {
                                 /* Set flag "skip certificate verify" */
                                 s->s3->flags |= TLS1_FLAGS_SKIP_CERT_VERIFY;
-                                }
+                        }
                         EVP_PKEY_CTX_free(pkey_ctx);
-                        s->session->master_key_length=
-                                s->method->ssl3_enc->generate_master_secret(s,
-                                        s->session->master_key,premaster_secret,32);
+                        s->session->master_key_length =
+                        s->method->ssl3_enc->generate_master_secret(s,
+                        s->session->master_key, premaster_secret, 32);
                         EVP_PKEY_free(pub_key);
 
-                        }
+                }
 #ifndef OPENSSL_NO_SRP
-                else if (alg_k & SSL_kSRP)
-                        {
-                        if (s->srp_ctx.A != NULL)
-                                {
+                else if (alg_k & SSL_kSRP) {
+                        if (s->srp_ctx.A != NULL) {
                                 /* send off the data */
-                                n=BN_num_bytes(s->srp_ctx.A);
-                                s2n(n,p);
-                                BN_bn2bin(s->srp_ctx.A,p);
-                                n+=2;
-                                }
-                        else
-                                {
-                                SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,ERR_R_INTERNAL_ERROR);
+                                n = BN_num_bytes(s->srp_ctx.A);
+                                s2n(n, p);
+                                BN_bn2bin(s->srp_ctx.A, p);
+                                n += 2;
+                        } else {
+                                SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE, ERR_R_INTERNAL_ERROR);
                                 goto err;
-                                }
+                        }
                         if (s->session->srp_username != NULL)
                                 OPENSSL_free(s->session->srp_username);
                         s->session->srp_username = BUF_strdup(s->srp_ctx.login);
-                        if (s->session->srp_username == NULL)
-                                {
+                        if (s->session->srp_username == NULL) {
                                 SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,
-                                        ERR_R_MALLOC_FAILURE);
+                                ERR_R_MALLOC_FAILURE);
                                 goto err;
-                                }
+                        }
 
-                        if ((s->session->master_key_length = SRP_generate_client_master_secret(s,s->session->master_key))<0)
-                                {
-                                SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,ERR_R_INTERNAL_ERROR);
+                        if ((s->session->master_key_length = SRP_generate_client_master_secret(s, s->session->master_key)) < 0) {
+                                SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE, ERR_R_INTERNAL_ERROR);
                                 goto err;
-                                }
                         }
+                }
 #endif
 #ifndef OPENSSL_NO_PSK
-                else if (alg_k & SSL_kPSK)
-                        {
+                else if (alg_k & SSL_kPSK) {
                         char identity[PSK_MAX_IDENTITY_LEN];
                         unsigned char *t = NULL;
-                        unsigned char psk_or_pre_ms[PSK_MAX_PSK_LEN*2+4];
+                        unsigned char psk_or_pre_ms[PSK_MAX_PSK_LEN*2 + 4];
                         unsigned int pre_ms_len = 0, psk_len = 0;
                         int psk_err = 1;
 
                         n = 0;
-                        if (s->psk_client_callback == NULL)
-                                {
+                        if (s->psk_client_callback == NULL) {
                                 SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,
-                                        SSL_R_PSK_NO_CLIENT_CB);
+                                SSL_R_PSK_NO_CLIENT_CB);
                                 goto err;
-                                }
+                        }
 
                         psk_len = s->psk_client_callback(s, s->ctx->psk_identity_hint,
-                                identity, PSK_MAX_IDENTITY_LEN,
-                                psk_or_pre_ms, sizeof(psk_or_pre_ms));
-                        if (psk_len > PSK_MAX_PSK_LEN)
-                                {
+                        identity, PSK_MAX_IDENTITY_LEN,
+                        psk_or_pre_ms, sizeof(psk_or_pre_ms));
+                        if (psk_len > PSK_MAX_PSK_LEN) {
                                 SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,
-                                        ERR_R_INTERNAL_ERROR);
+                                ERR_R_INTERNAL_ERROR);
                                 goto psk_err;
-                                }
-                        else if (psk_len == 0)
-                                {
+                        } else if (psk_len == 0) {
                                 SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,
-                                        SSL_R_PSK_IDENTITY_NOT_FOUND);
+                                SSL_R_PSK_IDENTITY_NOT_FOUND);
                                 goto psk_err;
-                                }
+                        }
 
                         /* create PSK pre_master_secret */
-                        pre_ms_len = 2+psk_len+2+psk_len;
+                        pre_ms_len = 2 + psk_len + 2 + psk_len;
                         t = psk_or_pre_ms;
-                        memmove(psk_or_pre_ms+psk_len+4, psk_or_pre_ms, psk_len);
+                        memmove(psk_or_pre_ms + psk_len + 4, psk_or_pre_ms, psk_len);
                         s2n(psk_len, t);
                         memset(t, 0, psk_len);
-                        t+=psk_len;
+                        t += psk_len;
                         s2n(psk_len, t);
 
                         if (s->session->psk_identity_hint != NULL)
                                 OPENSSL_free(s->session->psk_identity_hint);
                         s->session->psk_identity_hint = BUF_strdup(s->ctx->psk_identity_hint);
                         if (s->ctx->psk_identity_hint != NULL &&
-                                s->session->psk_identity_hint == NULL)
-                                {
+                            s->session->psk_identity_hint == NULL) {
                                 SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,
-                                        ERR_R_MALLOC_FAILURE);
+                                ERR_R_MALLOC_FAILURE);
                                 goto psk_err;
-                                }
+                        }
 
                         if (s->session->psk_identity != NULL)
                                 OPENSSL_free(s->session->psk_identity);
                         s->session->psk_identity = BUF_strdup(identity);
-                        if (s->session->psk_identity == NULL)
-                                {
+                        if (s->session->psk_identity == NULL) {
                                 SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,
-                                        ERR_R_MALLOC_FAILURE);
+                                ERR_R_MALLOC_FAILURE);
                                 goto psk_err;
-                                }
+                        }
 
                         s->session->master_key_length =
-                                s->method->ssl3_enc->generate_master_secret(s,
-                                        s->session->master_key,
-                                        psk_or_pre_ms, pre_ms_len); 
+                            s->method->ssl3_enc->generate_master_secret(
+                                s, s->session->master_key, psk_or_pre_ms,
+                                pre_ms_len);
+
                         n = strlen(identity);
                         s2n(n, p);
                         memcpy(p, identity, n);
-                        n+=2;
+                        n += 2;
                         psk_err = 0;
-                psk_err:
+                        psk_err:
                         OPENSSL_cleanse(identity, PSK_MAX_IDENTITY_LEN);
                         OPENSSL_cleanse(psk_or_pre_ms, sizeof(psk_or_pre_ms));
-                        if (psk_err != 0)
-                                {
+                        if (psk_err != 0) {
                                 ssl3_send_alert(s, SSL3_AL_FATAL, SSL_AD_HANDSHAKE_FAILURE);
                                 goto err;
-                                }
                         }
+                }
 #endif
-                else
-                        {
+                else {
                         ssl3_send_alert(s, SSL3_AL_FATAL,
-                            SSL_AD_HANDSHAKE_FAILURE);
+                        SSL_AD_HANDSHAKE_FAILURE);
                         SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,
-                            ERR_R_INTERNAL_ERROR);
+                        ERR_R_INTERNAL_ERROR);
                         goto err;
-                        }
-                
-                *(d++)=SSL3_MT_CLIENT_KEY_EXCHANGE;
-                l2n3(n,d);
+                }
 
-                s->state=SSL3_ST_CW_KEY_EXCH_B;
+                *(d++) = SSL3_MT_CLIENT_KEY_EXCHANGE;
+                l2n3(n, d);
+
+                s->state = SSL3_ST_CW_KEY_EXCH_B;
                 /* number of bytes to write */
-                s->init_num=n+4;
-                s->init_off=0;
-                }
+                s->init_num = n + 4;
+                s->init_off = 0;
+        }
 
         /* SSL3_ST_CW_KEY_EXCH_B */
-        return(ssl3_do_write(s,SSL3_RT_HANDSHAKE));
+        return (ssl3_do_write(s, SSL3_RT_HANDSHAKE));
 err:
 #ifndef OPENSSL_NO_ECDH
         BN_CTX_free(bn_ctx);
-        if (encodedPoint != NULL) OPENSSL_free(encodedPoint);
-        if (clnt_ecdh != NULL) 
+        if (encodedPoint != NULL)
+                OPENSSL_free(encodedPoint);
+        if (clnt_ecdh != NULL)
                 EC_KEY_free(clnt_ecdh);
         EVP_PKEY_free(srvr_pub_pkey);
 #endif
-        return(-1);
-        }
+        return (-1);
+}
 
-int ssl3_send_client_verify(SSL *s)
-        {
-        unsigned char *p,*d;
-        unsigned char data[MD5_DIGEST_LENGTH+SHA_DIGEST_LENGTH];
+int
+ssl3_send_client_verify(SSL *s)
+{
+        unsigned char *p, *d;
+        unsigned char data[MD5_DIGEST_LENGTH + SHA_DIGEST_LENGTH];
         EVP_PKEY *pkey;
-        EVP_PKEY_CTX *pctx=NULL;
+        EVP_PKEY_CTX *pctx = NULL;
         EVP_MD_CTX mctx;
-        unsigned u=0;
+        unsigned u = 0;
         unsigned long n;
         int j;
 
         EVP_MD_CTX_init(&mctx);
 
-        if (s->state == SSL3_ST_CW_CERT_VRFY_A)
-                {
-                d=(unsigned char *)s->init_buf->data;
-                p= &(d[4]);
-                pkey=s->cert->key->privatekey;
+        if (s->state == SSL3_ST_CW_CERT_VRFY_A) {
+                d = (unsigned char *)s->init_buf->data;
+                p = &(d[4]);
+                pkey = s->cert->key->privatekey;
 /* Create context from key and test if sha1 is allowed as digest */
-                pctx = EVP_PKEY_CTX_new(pkey,NULL);
+                pctx = EVP_PKEY_CTX_new(pkey, NULL);
                 EVP_PKEY_sign_init(pctx);
-                if (EVP_PKEY_CTX_set_signature_md(pctx, EVP_sha1())>0)
-                        {
+                if (EVP_PKEY_CTX_set_signature_md(pctx, EVP_sha1()) > 0) {
                         if (TLS1_get_version(s) < TLS1_2_VERSION)
                                 s->method->ssl3_enc->cert_verify_mac(s,
-                                                NID_sha1,
-                                                &(data[MD5_DIGEST_LENGTH]));
-                        }
-                else
-                        {
+                        NID_sha1,
+                        &(data[MD5_DIGEST_LENGTH]));
+                } else {
                         ERR_clear_error();
-                        }
+                }
                 /* For TLS v1.2 send signature algorithm and signature
                  * using agreed digest and cached handshake records.
                  */
-                if (TLS1_get_version(s) >= TLS1_2_VERSION)
-                        {
+                if (TLS1_get_version(s) >= TLS1_2_VERSION) {
                         long hdatalen = 0;
                         void *hdata;
                         const EVP_MD *md = s->cert->key->digest;
                         hdatalen = BIO_get_mem_data(s->s3->handshake_buffer,
-                                                                &hdata);
-                        if (hdatalen <= 0 || !tls12_get_sigandhash(p, pkey, md))
-                                {
+                        &hdata);
+                        if (hdatalen <= 0 || !tls12_get_sigandhash(p, pkey, md)) {
                                 SSLerr(SSL_F_SSL3_SEND_CLIENT_VERIFY,
-                                                ERR_R_INTERNAL_ERROR);
+                                ERR_R_INTERNAL_ERROR);
                                 goto err;
-                                }
+                        }
                         p += 2;
 #ifdef SSL_DEBUG
                         fprintf(stderr, "Using TLS 1.2 with client alg %s\n",
-                                                        EVP_MD_name(md));
+                        EVP_MD_name(md));
 #endif
-                        if (!EVP_SignInit_ex(&mctx, md, NULL)
-                                || !EVP_SignUpdate(&mctx, hdata, hdatalen)
-                                || !EVP_SignFinal(&mctx, p + 2, &u, pkey))
-                                {
+                        if (!EVP_SignInit_ex(&mctx, md, NULL) ||
+                            !EVP_SignUpdate(&mctx, hdata, hdatalen) ||
+                            !EVP_SignFinal(&mctx, p + 2, &u, pkey)) {
                                 SSLerr(SSL_F_SSL3_SEND_CLIENT_VERIFY,
-                                                ERR_R_EVP_LIB);
+                                ERR_R_EVP_LIB);
                                 goto err;
-                                }
-                        s2n(u,p);
+                        }
+                        s2n(u, p);
                         n = u + 4;
                         if (!ssl3_digest_cached_records(s))
                                 goto err;
-                        }
-                else
+                } else
 #ifndef OPENSSL_NO_RSA
-                if (pkey->type == EVP_PKEY_RSA)
-                        {
-                        s->method->ssl3_enc->cert_verify_mac(s,
-                                NID_md5,
-                                &(data[0]));
+                if (pkey->type == EVP_PKEY_RSA) {
+                        s->method->ssl3_enc->cert_verify_mac(
+                            s, NID_md5, &(data[0]));
                         if (RSA_sign(NID_md5_sha1, data,
-                                         MD5_DIGEST_LENGTH+SHA_DIGEST_LENGTH,
-                                        &(p[2]), &u, pkey->pkey.rsa) <= 0 )
-                                {
-                                SSLerr(SSL_F_SSL3_SEND_CLIENT_VERIFY,ERR_R_RSA_LIB);
+                            MD5_DIGEST_LENGTH + SHA_DIGEST_LENGTH, &(p[2]),
+                            &u, pkey->pkey.rsa) <= 0 ) {
+                                SSLerr(SSL_F_SSL3_SEND_CLIENT_VERIFY, ERR_R_RSA_LIB);
                                 goto err;
-                                }
-                        s2n(u,p);
-                        n=u+2;
                         }
-                else
+                        s2n(u, p);
+                        n = u + 2;
+                } else
 #endif
 #ifndef OPENSSL_NO_DSA
-                        if (pkey->type == EVP_PKEY_DSA)
-                        {
+                if (pkey->type == EVP_PKEY_DSA) {
                         if (!DSA_sign(pkey->save_type,
-                                &(data[MD5_DIGEST_LENGTH]),
-                                SHA_DIGEST_LENGTH,&(p[2]),
-                                (unsigned int *)&j,pkey->pkey.dsa))
-                                {
-                                SSLerr(SSL_F_SSL3_SEND_CLIENT_VERIFY,ERR_R_DSA_LIB);
+                            &(data[MD5_DIGEST_LENGTH]),
+                            SHA_DIGEST_LENGTH, &(p[2]),
+                            (unsigned int *)&j, pkey->pkey.dsa)) {
+                                SSLerr(SSL_F_SSL3_SEND_CLIENT_VERIFY, ERR_R_DSA_LIB);
                                 goto err;
-                                }
-                        s2n(j,p);
-                        n=j+2;
                         }
-                else
+                        s2n(j, p);
+                        n = j + 2;
+                } else
 #endif
 #ifndef OPENSSL_NO_ECDSA
-                        if (pkey->type == EVP_PKEY_EC)
-                        {
+                if (pkey->type == EVP_PKEY_EC) {
                         if (!ECDSA_sign(pkey->save_type,
-                                &(data[MD5_DIGEST_LENGTH]),
-                                SHA_DIGEST_LENGTH,&(p[2]),
-                                (unsigned int *)&j,pkey->pkey.ec))
-                                {
+                            &(data[MD5_DIGEST_LENGTH]),
+                            SHA_DIGEST_LENGTH, &(p[2]),
+                            (unsigned int *)&j, pkey->pkey.ec)) {
                                 SSLerr(SSL_F_SSL3_SEND_CLIENT_VERIFY,
-                                    ERR_R_ECDSA_LIB);
+                                ERR_R_ECDSA_LIB);
                                 goto err;
-                                }
-                        s2n(j,p);
-                        n=j+2;
                         }
-                else
+                        s2n(j, p);
+                        n = j + 2;
+                } else
 #endif
-                if (pkey->type == NID_id_GostR3410_94 || pkey->type == NID_id_GostR3410_2001) 
-                {
-                unsigned char signbuf[64];
-                int i;
-                size_t sigsize=64;
-                s->method->ssl3_enc->cert_verify_mac(s,
+                if (pkey->type == NID_id_GostR3410_94 || pkey->type == NID_id_GostR3410_2001) {
+                        unsigned char signbuf[64];
+                        int i;
+                        size_t sigsize = 64;
+                        s->method->ssl3_enc->cert_verify_mac(s,
                         NID_id_GostR3411_94,
                         data);
-                if (EVP_PKEY_sign(pctx, signbuf, &sigsize, data, 32) <= 0) {
-                        SSLerr(SSL_F_SSL3_SEND_CLIENT_VERIFY,
-                        ERR_R_INTERNAL_ERROR);
-                        goto err;
-                }
-                for (i=63,j=0; i>=0; j++, i--) {
-                        p[2+j]=signbuf[i];
-                }       
-                s2n(j,p);
-                n=j+2;
-                }
-                else
-                {
-                        SSLerr(SSL_F_SSL3_SEND_CLIENT_VERIFY,ERR_R_INTERNAL_ERROR);
+                        if (EVP_PKEY_sign(pctx, signbuf, &sigsize, data, 32) <= 0) {
+                                SSLerr(SSL_F_SSL3_SEND_CLIENT_VERIFY,
+                                ERR_R_INTERNAL_ERROR);
+                                goto err;
+                        }
+                        for (i = 63, j = 0; i >= 0; j++, i--) {
+                                p[2 + j] = signbuf[i];
+                        }
+                        s2n(j, p);
+                        n = j + 2;
+                } else {
+                        SSLerr(SSL_F_SSL3_SEND_CLIENT_VERIFY, ERR_R_INTERNAL_ERROR);
                         goto err;
                 }
-                *(d++)=SSL3_MT_CERTIFICATE_VERIFY;
-                l2n3(n,d);
+                *(d++) = SSL3_MT_CERTIFICATE_VERIFY;
+                l2n3(n, d);
 
-                s->state=SSL3_ST_CW_CERT_VRFY_B;
-                s->init_num=(int)n+4;
-                s->init_off=0;
-                }
+                s->state = SSL3_ST_CW_CERT_VRFY_B;
+                s->init_num = (int)n + 4;
+                s->init_off = 0;
+        }
         EVP_MD_CTX_cleanup(&mctx);
         EVP_PKEY_CTX_free(pctx);
-        return(ssl3_do_write(s,SSL3_RT_HANDSHAKE));
+        return (ssl3_do_write(s, SSL3_RT_HANDSHAKE));
 err:
         EVP_MD_CTX_cleanup(&mctx);
         EVP_PKEY_CTX_free(pctx);
-        return(-1);
-        }
+        return (-1);
+}
 
-int ssl3_send_client_certificate(SSL *s)
-        {
-        X509 *x509=NULL;
-        EVP_PKEY *pkey=NULL;
+int
+ssl3_send_client_certificate(SSL *s)
+{
+        X509 *x509 = NULL;
+        EVP_PKEY *pkey = NULL;
         int i;
         unsigned long l;
 
-        if (s->state == SSL3_ST_CW_CERT_A)
-                {
-                if ((s->cert == NULL) ||
-                        (s->cert->key->x509 == NULL) ||
-                        (s->cert->key->privatekey == NULL))
-                        s->state=SSL3_ST_CW_CERT_B;
+        if (s->state == SSL3_ST_CW_CERT_A) {
+                if ((s->cert == NULL) || (s->cert->key->x509 == NULL) ||
+                    (s->cert->key->privatekey == NULL))
+                        s->state = SSL3_ST_CW_CERT_B;
                 else
-                        s->state=SSL3_ST_CW_CERT_C;
-                }
+                        s->state = SSL3_ST_CW_CERT_C;
+        }
 
         /* We need to get a client cert */
-        if (s->state == SSL3_ST_CW_CERT_B)
-                {
+        if (s->state == SSL3_ST_CW_CERT_B) {
                 /* If we get an error, we need to
                  * ssl->rwstate=SSL_X509_LOOKUP; return(-1);
                  * We then get retied later */
-                i=0;
+                i = 0;
                 i = ssl_do_client_cert_cb(s, &x509, &pkey);
-                if (i < 0)
-                        {
-                        s->rwstate=SSL_X509_LOOKUP;
-                        return(-1);
-                        }
-                s->rwstate=SSL_NOTHING;
-                if ((i == 1) && (pkey != NULL) && (x509 != NULL))
-                        {
-                        s->state=SSL3_ST_CW_CERT_B;
-                        if (    !SSL_use_certificate(s,x509) ||
-                                !SSL_use_PrivateKey(s,pkey))
-                                i=0;
-                        }
-                else if (i == 1)
-                        {
-                        i=0;
-                        SSLerr(SSL_F_SSL3_SEND_CLIENT_CERTIFICATE,SSL_R_BAD_DATA_RETURNED_BY_CALLBACK);
-                        }
-
-                if (x509 != NULL) X509_free(x509);
-                if (pkey != NULL) EVP_PKEY_free(pkey);
-                if (i == 0)
-                        {
-                        if (s->version == SSL3_VERSION)
-                                {
-                                s->s3->tmp.cert_req=0;
-                                ssl3_send_alert(s,SSL3_AL_WARNING,SSL_AD_NO_CERTIFICATE);
-                                return(1);
-                                }
-                        else
-                                {
-                                s->s3->tmp.cert_req=2;
-                                }
+                if (i < 0) {
+                        s->rwstate = SSL_X509_LOOKUP;
+                        return (-1);
+                }
+                s->rwstate = SSL_NOTHING;
+                if ((i == 1) && (pkey != NULL) && (x509 != NULL)) {
+                        s->state = SSL3_ST_CW_CERT_B;
+                        if (!SSL_use_certificate(s, x509) ||
+                            !SSL_use_PrivateKey(s, pkey))
+                                i = 0;
+                } else if (i == 1) {
+                        i = 0;
+                        SSLerr(SSL_F_SSL3_SEND_CLIENT_CERTIFICATE, SSL_R_BAD_DATA_RETURNED_BY_CALLBACK);
+                }
+
+                if (x509 != NULL)
+                        X509_free(x509);
+                if (pkey != NULL)
+                        EVP_PKEY_free(pkey);
+                if (i == 0) {
+                        if (s->version == SSL3_VERSION) {
+                                s->s3->tmp.cert_req = 0;
+                                ssl3_send_alert(s, SSL3_AL_WARNING, SSL_AD_NO_CERTIFICATE);
+                                return (1);
+                        } else {
+                                s->s3->tmp.cert_req = 2;
                         }
+                }
 
                 /* Ok, we have a cert */
-                s->state=SSL3_ST_CW_CERT_C;
-                }
+                s->state = SSL3_ST_CW_CERT_C;
+        }
 
-        if (s->state == SSL3_ST_CW_CERT_C)
-                {
-                s->state=SSL3_ST_CW_CERT_D;
-                l=ssl3_output_cert_chain(s,
-                        (s->s3->tmp.cert_req == 2)?NULL:s->cert->key->x509);
-                s->init_num=(int)l;
-                s->init_off=0;
-                }
-        /* SSL3_ST_CW_CERT_D */
-        return(ssl3_do_write(s,SSL3_RT_HANDSHAKE));
+        if (s->state == SSL3_ST_CW_CERT_C) {
+                s->state = SSL3_ST_CW_CERT_D;
+                l = ssl3_output_cert_chain(s,
+                (s->s3->tmp.cert_req == 2) ? NULL : s->cert->key->x509);
+                s->init_num = (int)l;
+                s->init_off = 0;
         }
+        /* SSL3_ST_CW_CERT_D */
+        return (ssl3_do_write(s, SSL3_RT_HANDSHAKE));
+}
 
 #define has_bits(i,m)   (((i)&(m)) == (m))
 
-int ssl3_check_cert_and_algorithm(SSL *s)
-        {
-        int i,idx;
-        long alg_k,alg_a;
-        EVP_PKEY *pkey=NULL;
+int
+ssl3_check_cert_and_algorithm(SSL *s)
+{
+        int i, idx;
+        long alg_k, alg_a;
+        EVP_PKEY *pkey = NULL;
         SESS_CERT *sc;
 #ifndef OPENSSL_NO_RSA
         RSA *rsa;
@@ -3172,138 +2941,120 @@ int ssl3_check_cert_and_algorithm(SSL *s)
         DH *dh;
 #endif
 
-        alg_k=s->s3->tmp.new_cipher->algorithm_mkey;
-        alg_a=s->s3->tmp.new_cipher->algorithm_auth;
+        alg_k = s->s3->tmp.new_cipher->algorithm_mkey;
+        alg_a = s->s3->tmp.new_cipher->algorithm_auth;
 
         /* we don't have a certificate */
         if ((alg_a & (SSL_aDH|SSL_aNULL|SSL_aKRB5)) || (alg_k & SSL_kPSK))
-                return(1);
+                return (1);
 
-        sc=s->session->sess_cert;
-        if (sc == NULL)
-                {
-                SSLerr(SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM,ERR_R_INTERNAL_ERROR);
+        sc = s->session->sess_cert;
+        if (sc == NULL) {
+                SSLerr(SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM, ERR_R_INTERNAL_ERROR);
                 goto err;
-                }
+        }
 
 #ifndef OPENSSL_NO_RSA
-        rsa=s->session->sess_cert->peer_rsa_tmp;
+        rsa = s->session->sess_cert->peer_rsa_tmp;
 #endif
 #ifndef OPENSSL_NO_DH
-        dh=s->session->sess_cert->peer_dh_tmp;
+        dh = s->session->sess_cert->peer_dh_tmp;
 #endif
 
         /* This is the passed certificate */
 
-        idx=sc->peer_cert_type;
+        idx = sc->peer_cert_type;
 #ifndef OPENSSL_NO_ECDH
-        if (idx == SSL_PKEY_ECC)
-                {
+        if (idx == SSL_PKEY_ECC) {
                 if (ssl_check_srvr_ecc_cert_and_alg(sc->peer_pkeys[idx].x509,
-                                                                s) == 0) 
+                        s) == 0)
                         { /* check failed */
-                        SSLerr(SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM,SSL_R_BAD_ECC_CERT);
+                        SSLerr(SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM, SSL_R_BAD_ECC_CERT);
                         goto f_err;
-                        }
-                else 
-                        {
+                } else {
                         return 1;
-                        }
                 }
+        }
 #endif
-        pkey=X509_get_pubkey(sc->peer_pkeys[idx].x509);
-        i=X509_certificate_type(sc->peer_pkeys[idx].x509,pkey);
+        pkey = X509_get_pubkey(sc->peer_pkeys[idx].x509);
+        i = X509_certificate_type(sc->peer_pkeys[idx].x509, pkey);
         EVP_PKEY_free(pkey);
 
-        
+
         /* Check that we have a certificate if we require one */
-        if ((alg_a & SSL_aRSA) && !has_bits(i,EVP_PK_RSA|EVP_PKT_SIGN))
-                {
-                SSLerr(SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM,SSL_R_MISSING_RSA_SIGNING_CERT);
+        if ((alg_a & SSL_aRSA) && !has_bits(i, EVP_PK_RSA|EVP_PKT_SIGN)) {
+                SSLerr(SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM, SSL_R_MISSING_RSA_SIGNING_CERT);
                 goto f_err;
-                }
+        }
 #ifndef OPENSSL_NO_DSA
-        else if ((alg_a & SSL_aDSS) && !has_bits(i,EVP_PK_DSA|EVP_PKT_SIGN))
-                {
-                SSLerr(SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM,SSL_R_MISSING_DSA_SIGNING_CERT);
+        else if ((alg_a & SSL_aDSS) && !has_bits(i, EVP_PK_DSA|EVP_PKT_SIGN)) {
+                SSLerr(SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM, SSL_R_MISSING_DSA_SIGNING_CERT);
                 goto f_err;
-                }
+        }
 #endif
 #ifndef OPENSSL_NO_RSA
         if ((alg_k & SSL_kRSA) &&
-                !(has_bits(i,EVP_PK_RSA|EVP_PKT_ENC) || (rsa != NULL)))
-                {
-                SSLerr(SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM,SSL_R_MISSING_RSA_ENCRYPTING_CERT);
+            !(has_bits(i, EVP_PK_RSA|EVP_PKT_ENC) || (rsa != NULL))) {
+                SSLerr(SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM, SSL_R_MISSING_RSA_ENCRYPTING_CERT);
                 goto f_err;
-                }
+        }
 #endif
 #ifndef OPENSSL_NO_DH
         if ((alg_k & SSL_kEDH) &&
-                !(has_bits(i,EVP_PK_DH|EVP_PKT_EXCH) || (dh != NULL)))
-                {
-                SSLerr(SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM,SSL_R_MISSING_DH_KEY);
+            !(has_bits(i, EVP_PK_DH|EVP_PKT_EXCH) || (dh != NULL))) {
+                SSLerr(SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM, SSL_R_MISSING_DH_KEY);
                 goto f_err;
-                }
-        else if ((alg_k & SSL_kDHr) && !has_bits(i,EVP_PK_DH|EVP_PKS_RSA))
-                {
-                SSLerr(SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM,SSL_R_MISSING_DH_RSA_CERT);
+        } else if ((alg_k & SSL_kDHr) && !has_bits(i, EVP_PK_DH|EVP_PKS_RSA)) {
+                SSLerr(SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM, SSL_R_MISSING_DH_RSA_CERT);
                 goto f_err;
-                }
+        }
 #ifndef OPENSSL_NO_DSA
-        else if ((alg_k & SSL_kDHd) && !has_bits(i,EVP_PK_DH|EVP_PKS_DSA))
-                {
-                SSLerr(SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM,SSL_R_MISSING_DH_DSA_CERT);
+        else if ((alg_k & SSL_kDHd) && !has_bits(i, EVP_PK_DH|EVP_PKS_DSA)) {
+                SSLerr(SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM, SSL_R_MISSING_DH_DSA_CERT);
                 goto f_err;
-                }
+        }
 #endif
 #endif
 
-        if (SSL_C_IS_EXPORT(s->s3->tmp.new_cipher) && !has_bits(i,EVP_PKT_EXP))
-                {
+        if (SSL_C_IS_EXPORT(s->s3->tmp.new_cipher) && !has_bits(i, EVP_PKT_EXP)) {
 #ifndef OPENSSL_NO_RSA
-                if (alg_k & SSL_kRSA)
-                        {
-                        if (rsa == NULL
-                            || RSA_size(rsa)*8 > SSL_C_EXPORT_PKEYLENGTH(s->s3->tmp.new_cipher))
-                                {
-                                SSLerr(SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM,SSL_R_MISSING_EXPORT_TMP_RSA_KEY);
+                if (alg_k & SSL_kRSA) {
+                        if (rsa == NULL ||
+                            RSA_size(rsa) * 8 > SSL_C_EXPORT_PKEYLENGTH(s->s3->tmp.new_cipher)) {
+                                SSLerr(SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM, SSL_R_MISSING_EXPORT_TMP_RSA_KEY);
                                 goto f_err;
-                                }
                         }
-                else
+                } else
 #endif
 #ifndef OPENSSL_NO_DH
-                        if (alg_k & (SSL_kEDH|SSL_kDHr|SSL_kDHd))
-                            {
-                            if (dh == NULL
-                                || DH_size(dh)*8 > SSL_C_EXPORT_PKEYLENGTH(s->s3->tmp.new_cipher))
-                                {
-                                SSLerr(SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM,SSL_R_MISSING_EXPORT_TMP_DH_KEY);
+                if (alg_k & (SSL_kEDH|SSL_kDHr|SSL_kDHd)) {
+                        if (dh == NULL ||
+                            DH_size(dh) * 8 > SSL_C_EXPORT_PKEYLENGTH(s->s3->tmp.new_cipher)) {
+                                SSLerr(SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM, SSL_R_MISSING_EXPORT_TMP_DH_KEY);
                                 goto f_err;
-                                }
                         }
-                else
+                } else
 #endif
-                        {
-                        SSLerr(SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM,SSL_R_UNKNOWN_KEY_EXCHANGE_TYPE);
+                {
+                        SSLerr(SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM, SSL_R_UNKNOWN_KEY_EXCHANGE_TYPE);
                         goto f_err;
-                        }
                 }
-        return(1);
+        }
+        return (1);
 f_err:
-        ssl3_send_alert(s,SSL3_AL_FATAL,SSL_AD_HANDSHAKE_FAILURE);
+        ssl3_send_alert(s, SSL3_AL_FATAL, SSL_AD_HANDSHAKE_FAILURE);
 err:
-        return(0);
-        }
+        return (0);
+}
 
 #if !defined(OPENSSL_NO_TLSEXT) && !defined(OPENSSL_NO_NEXTPROTONEG)
-int ssl3_send_next_proto(SSL *s)
-        {
+int
+ssl3_send_next_proto(SSL *s)
+{
         unsigned int len, padding_len;
         unsigned char *d;
 
-        if (s->state == SSL3_ST_CW_NEXT_PROTO_A)
-                {
+        if (s->state == SSL3_ST_CW_NEXT_PROTO_A) {
                 len = s->next_proto_negotiated_len;
                 padding_len = 32 - ((len + 2) % 32);
                 d = (unsigned char *)s->init_buf->data;
@@ -3311,12 +3062,12 @@ int ssl3_send_next_proto(SSL *s)
                 memcpy(d + 5, s->next_proto_negotiated, len);
                 d[5 + len] = padding_len;
                 memset(d + 6 + len, 0, padding_len);
-                *(d++)=SSL3_MT_NEXT_PROTO;
+                *(d++) = SSL3_MT_NEXT_PROTO;
                 l2n3(2 + len + padding_len, d);
                 s->state = SSL3_ST_CW_NEXT_PROTO_B;
                 s->init_num = 4 + 2 + len + padding_len;
                 s->init_off = 0;
-                }
+        }
 
         return ssl3_do_write(s, SSL3_RT_HANDSHAKE);
 }
@@ -3328,8 +3079,9 @@ int ssl3_send_next_proto(SSL *s)
  */
 
 #ifndef OPENSSL_NO_TLSEXT
-int ssl3_check_finished(SSL *s)
-        {
+int
+ssl3_check_finished(SSL *s)
+{
         int ok;
         long n;
         /* If we have no ticket it cannot be a resumed session. */
@@ -3337,36 +3089,33 @@ int ssl3_check_finished(SSL *s)
                 return 1;
         /* this function is called when we really expect a Certificate
          * message, so permit appropriate message length */
-        n=s->method->ssl_get_message(s,
-                SSL3_ST_CR_CERT_A,
-                SSL3_ST_CR_CERT_B,
-                -1,
-                s->max_cert_list,
-                &ok);
-        if (!ok) return((int)n);
+        n = s->method->ssl_get_message(s, SSL3_ST_CR_CERT_A,
+            SSL3_ST_CR_CERT_B, -1, s->max_cert_list, &ok);
+        if (!ok)
+                return ((int)n);
         s->s3->tmp.reuse_message = 1;
-        if ((s->s3->tmp.message_type == SSL3_MT_FINISHED)
-                || (s->s3->tmp.message_type == SSL3_MT_NEWSESSION_TICKET))
+        if ((s->s3->tmp.message_type == SSL3_MT_FINISHED) ||
+            (s->s3->tmp.message_type == SSL3_MT_NEWSESSION_TICKET))
                 return 2;
 
         return 1;
-        }
+}
 #endif
 
-int ssl_do_client_cert_cb(SSL *s, X509 **px509, EVP_PKEY **ppkey)
-        {
+int
+ssl_do_client_cert_cb(SSL *s, X509 **px509, EVP_PKEY **ppkey)
+{
         int i = 0;
 #ifndef OPENSSL_NO_ENGINE
-        if (s->ctx->client_cert_engine)
-                {
+        if (s->ctx->client_cert_engine) {
                 i = ENGINE_load_ssl_client_cert(s->ctx->client_cert_engine, s,
-                                                SSL_get_client_CA_list(s),
-                                                px509, ppkey, NULL, NULL, NULL);
+                SSL_get_client_CA_list(s),
+                px509, ppkey, NULL, NULL, NULL);
                 if (i != 0)
                         return i;
-                }
+        }
 #endif
         if (s->ctx->client_cert_cb)
-                i = s->ctx->client_cert_cb(s,px509,ppkey);
+                i = s->ctx->client_cert_cb(s, px509, ppkey);
         return i;
-        }
+}
diff --git a/src/lib/libssl/src/ssl/s3_srvr.c b/src/lib/libssl/src/ssl/s3_srvr.c
index 518dfcd5e2..eeadb160d1 100644
--- a/src/lib/libssl/src/ssl/s3_srvr.c
+++ b/src/lib/libssl/src/ssl/s3_srvr.c
@@ -171,92 +171,86 @@
 
 static const SSL_METHOD *ssl3_get_server_method(int ver);
 
-static const SSL_METHOD *ssl3_get_server_method(int ver)
-        {
+static const SSL_METHOD
+*ssl3_get_server_method(int ver)
+{
         if (ver == SSL3_VERSION)
-                return(SSLv3_server_method());
+                return (SSLv3_server_method());
         else
-                return(NULL);
-        }
+                return (NULL);
+}
 
 #ifndef OPENSSL_NO_SRP
-static int ssl_check_srp_ext_ClientHello(SSL *s, int *al)
-        {
+static int
+ssl_check_srp_ext_ClientHello(SSL *s, int *al)
+{
         int ret = SSL_ERROR_NONE;
 
         *al = SSL_AD_UNRECOGNIZED_NAME;
 
         if ((s->s3->tmp.new_cipher->algorithm_mkey & SSL_kSRP) &&
-            (s->srp_ctx.TLS_ext_srp_username_callback != NULL))
-                {
-                if(s->srp_ctx.login == NULL)
-                        {
+                (s->srp_ctx.TLS_ext_srp_username_callback != NULL)) {
+                if (s->srp_ctx.login == NULL) {
                         /* RFC 5054 says SHOULD reject, 
                            we do so if There is no srp login name */
                         ret = SSL3_AL_FATAL;
                         *al = SSL_AD_UNKNOWN_PSK_IDENTITY;
-                        }
-                else
-                        {
-                        ret = SSL_srp_server_param_with_username(s,al);
-                        }
+                } else {
+                        ret = SSL_srp_server_param_with_username(s, al);
                 }
-        return ret;
         }
+        return ret;
+}
 #endif
 
 IMPLEMENT_ssl3_meth_func(SSLv3_server_method,
-                        ssl3_accept,
-                        ssl_undefined_function,
-                        ssl3_get_server_method)
+    ssl3_accept, ssl_undefined_function, ssl3_get_server_method)
 
-int ssl3_accept(SSL *s)
-        {
+int
+ssl3_accept(SSL *s)
+{
         BUF_MEM *buf;
-        unsigned long alg_k,Time=(unsigned long)time(NULL);
-        void (*cb)(const SSL *ssl,int type,int val)=NULL;
-        int ret= -1;
-        int new_state,state,skip=0;
+        unsigned long alg_k, Time = (unsigned long)time(NULL);
+        void (*cb)(const SSL *ssl, int type, int val) = NULL;
+        int ret = -1;
+        int new_state, state, skip = 0;
 
-        RAND_add(&Time,sizeof(Time),0);
+        RAND_add(&Time, sizeof(Time), 0);
         ERR_clear_error();
         errno = 0;
 
         if (s->info_callback != NULL)
-                cb=s->info_callback;
+                cb = s->info_callback;
         else if (s->ctx->info_callback != NULL)
-                cb=s->ctx->info_callback;
+                cb = s->ctx->info_callback;
 
         /* init things to blank */
         s->in_handshake++;
-        if (!SSL_in_init(s) || SSL_in_before(s)) SSL_clear(s);
+        if (!SSL_in_init(s) || SSL_in_before(s))
+                SSL_clear(s);
 
-        if (s->cert == NULL)
-                {
-                SSLerr(SSL_F_SSL3_ACCEPT,SSL_R_NO_CERTIFICATE_SET);
-                return(-1);
-                }
+        if (s->cert == NULL) {
+                SSLerr(SSL_F_SSL3_ACCEPT, SSL_R_NO_CERTIFICATE_SET);
+                return (-1);
+        }
 
 #ifndef OPENSSL_NO_HEARTBEATS
         /* If we're awaiting a HeartbeatResponse, pretend we
          * already got and don't await it anymore, because
          * Heartbeats don't make sense during handshakes anyway.
          */
-        if (s->tlsext_hb_pending)
-                {
+        if (s->tlsext_hb_pending) {
                 s->tlsext_hb_pending = 0;
                 s->tlsext_hb_seq++;
-                }
+        }
 #endif
 
-        for (;;)
-                {
-                state=s->state;
+        for (;;) {
+                state = s->state;
 
-                switch (s->state)
-                        {
+                switch (s->state) {
                 case SSL_ST_RENEGOTIATE:
-                        s->renegotiate=1;
+                        s->renegotiate = 1;
                         /* s->state=SSL_ST_ACCEPT; */
 
                 case SSL_ST_BEFORE:
@@ -264,146 +258,143 @@ int ssl3_accept(SSL *s)
                 case SSL_ST_BEFORE|SSL_ST_ACCEPT:
                 case SSL_ST_OK|SSL_ST_ACCEPT:
 
-                        s->server=1;
-                        if (cb != NULL) cb(s,SSL_CB_HANDSHAKE_START,1);
+                        s->server = 1;
+                        if (cb != NULL)
+                                cb(s, SSL_CB_HANDSHAKE_START, 1);
 
-                        if ((s->version>>8) != 3)
-                                {
+                        if ((s->version >> 8) != 3) {
                                 SSLerr(SSL_F_SSL3_ACCEPT, ERR_R_INTERNAL_ERROR);
                                 return -1;
-                                }
-                        s->type=SSL_ST_ACCEPT;
+                        }
+                        s->type = SSL_ST_ACCEPT;
 
-                        if (s->init_buf == NULL)
-                                {
-                                if ((buf=BUF_MEM_new()) == NULL)
-                                        {
-                                        ret= -1;
+                        if (s->init_buf == NULL) {
+                                if ((buf = BUF_MEM_new()) == NULL) {
+                                        ret = -1;
                                         goto end;
-                                        }
-                                if (!BUF_MEM_grow(buf,SSL3_RT_MAX_PLAIN_LENGTH))
-                                        {
-                                        ret= -1;
+                                }
+                                if (!BUF_MEM_grow(buf, SSL3_RT_MAX_PLAIN_LENGTH)) {
+                                        ret = -1;
                                         goto end;
-                                        }
-                                s->init_buf=buf;
                                 }
+                                s->init_buf = buf;
+                        }
 
-                        if (!ssl3_setup_buffers(s))
-                                {
-                                ret= -1;
+                        if (!ssl3_setup_buffers(s)) {
+                                ret = -1;
                                 goto end;
-                                }
+                        }
 
-                        s->init_num=0;
+                        s->init_num = 0;
                         s->s3->flags &= ~SSL3_FLAGS_SGC_RESTART_DONE;
 
-                        if (s->state != SSL_ST_RENEGOTIATE)
-                                {
+                        if (s->state != SSL_ST_RENEGOTIATE) {
                                 /* Ok, we now need to push on a buffering BIO so that
                                  * the output is sent in a way that TCP likes :-)
                                  */
-                                if (!ssl_init_wbio_buffer(s,1)) { ret= -1; goto end; }
-                                
+                                if (!ssl_init_wbio_buffer(s, 1)) {
+                                        ret = -1;
+                                        goto end;
+                                }
+
                                 ssl3_init_finished_mac(s);
-                                s->state=SSL3_ST_SR_CLNT_HELLO_A;
+                                s->state = SSL3_ST_SR_CLNT_HELLO_A;
                                 s->ctx->stats.sess_accept++;
-                                }
-                        else if (!s->s3->send_connection_binding &&
-                                !(s->options & SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION))
-                                {
+                        } else if (!s->s3->send_connection_binding &&
+                            !(s->options & SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION)) {
                                 /* Server attempting to renegotiate with
                                  * client that doesn't support secure
                                  * renegotiation.
                                  */
                                 SSLerr(SSL_F_SSL3_ACCEPT, SSL_R_UNSAFE_LEGACY_RENEGOTIATION_DISABLED);
-                                ssl3_send_alert(s,SSL3_AL_FATAL,SSL_AD_HANDSHAKE_FAILURE);
+                                ssl3_send_alert(s, SSL3_AL_FATAL, SSL_AD_HANDSHAKE_FAILURE);
                                 ret = -1;
                                 goto end;
-                                }
-                        else
-                                {
+                        } else {
                                 /* s->state == SSL_ST_RENEGOTIATE,
                                  * we will just send a HelloRequest */
                                 s->ctx->stats.sess_accept_renegotiate++;
-                                s->state=SSL3_ST_SW_HELLO_REQ_A;
-                                }
+                                s->state = SSL3_ST_SW_HELLO_REQ_A;
+                        }
                         break;
 
                 case SSL3_ST_SW_HELLO_REQ_A:
                 case SSL3_ST_SW_HELLO_REQ_B:
 
-                        s->shutdown=0;
-                        ret=ssl3_send_hello_request(s);
-                        if (ret <= 0) goto end;
-                        s->s3->tmp.next_state=SSL3_ST_SW_HELLO_REQ_C;
-                        s->state=SSL3_ST_SW_FLUSH;
-                        s->init_num=0;
+                        s->shutdown = 0;
+                        ret = ssl3_send_hello_request(s);
+                        if (ret <= 0)
+                                goto end;
+                        s->s3->tmp.next_state = SSL3_ST_SW_HELLO_REQ_C;
+                        s->state = SSL3_ST_SW_FLUSH;
+                        s->init_num = 0;
 
                         ssl3_init_finished_mac(s);
                         break;
 
                 case SSL3_ST_SW_HELLO_REQ_C:
-                        s->state=SSL_ST_OK;
+                        s->state = SSL_ST_OK;
                         break;
 
                 case SSL3_ST_SR_CLNT_HELLO_A:
                 case SSL3_ST_SR_CLNT_HELLO_B:
                 case SSL3_ST_SR_CLNT_HELLO_C:
 
-                        s->shutdown=0;
-                        if (s->rwstate != SSL_X509_LOOKUP)
-                        {
-                                ret=ssl3_get_client_hello(s);
-                                if (ret <= 0) goto end;
+                        s->shutdown = 0;
+                        if (s->rwstate != SSL_X509_LOOKUP) {
+                                ret = ssl3_get_client_hello(s);
+                                if (ret <= 0)
+                                        goto end;
                         }
 #ifndef OPENSSL_NO_SRP
                         {
-                        int al;
-                        if ((ret = ssl_check_srp_ext_ClientHello(s,&al))  < 0)
-                                        {
+                                int al;
+                                if ((ret = ssl_check_srp_ext_ClientHello(s, &al))  < 0) {
                                         /* callback indicates firther work to be done */
-                                        s->rwstate=SSL_X509_LOOKUP;
+                                        s->rwstate = SSL_X509_LOOKUP;
                                         goto end;
-                                        }
-                        if (ret != SSL_ERROR_NONE)
-                                {
-                                ssl3_send_alert(s,SSL3_AL_FATAL,al);    
+                                }
+                                if (ret != SSL_ERROR_NONE) {
+                                        ssl3_send_alert(s, SSL3_AL_FATAL, al);
+
                                 /* This is not really an error but the only means to
                                    for a client to detect whether srp is supported. */
-                                   if (al != TLS1_AD_UNKNOWN_PSK_IDENTITY)      
-                                        SSLerr(SSL_F_SSL3_ACCEPT,SSL_R_CLIENTHELLO_TLSEXT);                     
-                                ret = SSL_TLSEXT_ERR_ALERT_FATAL;                       
-                                ret= -1;
-                                goto end;       
+                                        if (al != TLS1_AD_UNKNOWN_PSK_IDENTITY)
+                                                SSLerr(SSL_F_SSL3_ACCEPT, SSL_R_CLIENTHELLO_TLSEXT);
+
+                                        ret = SSL_TLSEXT_ERR_ALERT_FATAL;
+
+                                        ret = -1;
+                                        goto end;
+
                                 }
                         }
 #endif          
-                        
+
                         s->renegotiate = 2;
-                        s->state=SSL3_ST_SW_SRVR_HELLO_A;
-                        s->init_num=0;
+                        s->state = SSL3_ST_SW_SRVR_HELLO_A;
+                        s->init_num = 0;
                         break;
 
                 case SSL3_ST_SW_SRVR_HELLO_A:
                 case SSL3_ST_SW_SRVR_HELLO_B:
-                        ret=ssl3_send_server_hello(s);
-                        if (ret <= 0) goto end;
+                        ret = ssl3_send_server_hello(s);
+                        if (ret <= 0)
+                                goto end;
 #ifndef OPENSSL_NO_TLSEXT
-                        if (s->hit)
-                                {
+                        if (s->hit) {
                                 if (s->tlsext_ticket_expected)
-                                        s->state=SSL3_ST_SW_SESSION_TICKET_A;
+                                        s->state = SSL3_ST_SW_SESSION_TICKET_A;
                                 else
-                                        s->state=SSL3_ST_SW_CHANGE_A;
-                                }
+                                        s->state = SSL3_ST_SW_CHANGE_A;
+                        }
 #else
                         if (s->hit)
-                                        s->state=SSL3_ST_SW_CHANGE_A;
+                                s->state = SSL3_ST_SW_CHANGE_A;
 #endif
                         else
-                                s->state=SSL3_ST_SW_CERT_A;
-                        s->init_num=0;
+                                s->state = SSL3_ST_SW_CERT_A;
+                        s->init_num = 0;
                         break;
 
                 case SSL3_ST_SW_CERT_A:
@@ -412,29 +403,26 @@ int ssl3_accept(SSL *s)
                         /* normal PSK or KRB5 or SRP */
                         if (!(s->s3->tmp.new_cipher->algorithm_auth & SSL_aNULL)
                                 && !(s->s3->tmp.new_cipher->algorithm_mkey & SSL_kPSK)
-                                && !(s->s3->tmp.new_cipher->algorithm_auth & SSL_aKRB5))
-                                {
-                                ret=ssl3_send_server_certificate(s);
-                                if (ret <= 0) goto end;
+                        && !(s->s3->tmp.new_cipher->algorithm_auth & SSL_aKRB5)) {
+                                ret = ssl3_send_server_certificate(s);
+                                if (ret <= 0)
+                                        goto end;
 #ifndef OPENSSL_NO_TLSEXT
                                 if (s->tlsext_status_expected)
-                                        s->state=SSL3_ST_SW_CERT_STATUS_A;
+                                        s->state = SSL3_ST_SW_CERT_STATUS_A;
                                 else
-                                        s->state=SSL3_ST_SW_KEY_EXCH_A;
-                                }
-                        else
-                                {
+                                        s->state = SSL3_ST_SW_KEY_EXCH_A;
+                        } else {
                                 skip = 1;
-                                s->state=SSL3_ST_SW_KEY_EXCH_A;
-                                }
+                                s->state = SSL3_ST_SW_KEY_EXCH_A;
+                        }
 #else
-                                }
-                        else
-                                skip=1;
+                        } else
+                                skip = 1;
 
-                        s->state=SSL3_ST_SW_KEY_EXCH_A;
+                        s->state = SSL3_ST_SW_KEY_EXCH_A;
 #endif
-                        s->init_num=0;
+                        s->init_num = 0;
                         break;
 
                 case SSL3_ST_SW_KEY_EXCH_A:
@@ -445,16 +433,16 @@ int ssl3_accept(SSL *s)
                          * send_server_key_exchange */
                         if ((s->options & SSL_OP_EPHEMERAL_RSA)
 #ifndef OPENSSL_NO_KRB5
-                                && !(alg_k & SSL_kKRB5)
+                            && !(alg_k & SSL_kKRB5)
 #endif /* OPENSSL_NO_KRB5 */
-                                )
+                            )
                                 /* option SSL_OP_EPHEMERAL_RSA sends temporary RSA key
                                  * even when forbidden by protocol specs
                                  * (handshake may fail as clients are not required to
                                  * be able to handle this) */
-                                s->s3->tmp.use_rsa_tmp=1;
+                                s->s3->tmp.use_rsa_tmp = 1;
                         else
-                                s->s3->tmp.use_rsa_tmp=0;
+                                s->s3->tmp.use_rsa_tmp = 0;
 
 
                         /* only send if a DH key exchange, fortezza or
@@ -475,83 +463,81 @@ int ssl3_accept(SSL *s)
                             || ((alg_k & SSL_kPSK) && s->ctx->psk_identity_hint)
 #endif
 #ifndef OPENSSL_NO_SRP
-                            /* SRP: send ServerKeyExchange */
+                        /* SRP: send ServerKeyExchange */
                             || (alg_k & SSL_kSRP)
 #endif
                             || (alg_k & (SSL_kDHr|SSL_kDHd|SSL_kEDH))
                             || (alg_k & SSL_kEECDH)
                             || ((alg_k & SSL_kRSA)
-                                && (s->cert->pkeys[SSL_PKEY_RSA_ENC].privatekey == NULL
-                                    || (SSL_C_IS_EXPORT(s->s3->tmp.new_cipher)
-                                        && EVP_PKEY_size(s->cert->pkeys[SSL_PKEY_RSA_ENC].privatekey)*8 > SSL_C_EXPORT_PKEYLENGTH(s->s3->tmp.new_cipher)
-                                        )
-                                    )
-                                )
+                            && (s->cert->pkeys[SSL_PKEY_RSA_ENC].privatekey == NULL
+                            || (SSL_C_IS_EXPORT(s->s3->tmp.new_cipher)
+                            && EVP_PKEY_size(s->cert->pkeys[SSL_PKEY_RSA_ENC].privatekey)*8 > SSL_C_EXPORT_PKEYLENGTH(s->s3->tmp.new_cipher)
                             )
-                                {
-                                ret=ssl3_send_server_key_exchange(s);
-                                if (ret <= 0) goto end;
-                                }
-                        else
-                                skip=1;
+                            )
+                            )
+                            ) {
+                                ret = ssl3_send_server_key_exchange(s);
+                                if (ret <= 0)
+                                        goto end;
+                        } else
+                                skip = 1;
 
-                        s->state=SSL3_ST_SW_CERT_REQ_A;
-                        s->init_num=0;
+                        s->state = SSL3_ST_SW_CERT_REQ_A;
+                        s->init_num = 0;
                         break;
 
                 case SSL3_ST_SW_CERT_REQ_A:
                 case SSL3_ST_SW_CERT_REQ_B:
                         if (/* don't request cert unless asked for it: */
-                                !(s->verify_mode & SSL_VERIFY_PEER) ||
+                            !(s->verify_mode & SSL_VERIFY_PEER) ||
                                 /* if SSL_VERIFY_CLIENT_ONCE is set,
                                  * don't request cert during re-negotiation: */
-                                ((s->session->peer != NULL) &&
-                                 (s->verify_mode & SSL_VERIFY_CLIENT_ONCE)) ||
+                            ((s->session->peer != NULL) &&
+                            (s->verify_mode & SSL_VERIFY_CLIENT_ONCE)) ||
                                 /* never request cert in anonymous ciphersuites
                                  * (see section "Certificate request" in SSL 3 drafts
                                  * and in RFC 2246): */
-                                ((s->s3->tmp.new_cipher->algorithm_auth & SSL_aNULL) &&
+                            ((s->s3->tmp.new_cipher->algorithm_auth & SSL_aNULL) &&
                                  /* ... except when the application insists on verification
                                   * (against the specs, but s3_clnt.c accepts this for SSL 3) */
-                                 !(s->verify_mode & SSL_VERIFY_FAIL_IF_NO_PEER_CERT)) ||
-                                 /* never request cert in Kerberos ciphersuites */
-                                (s->s3->tmp.new_cipher->algorithm_auth & SSL_aKRB5)
+                            !(s->verify_mode & SSL_VERIFY_FAIL_IF_NO_PEER_CERT)) ||
+                        /* never request cert in Kerberos ciphersuites */
+                            (s->s3->tmp.new_cipher->algorithm_auth & SSL_aKRB5)
                                 /* With normal PSK Certificates and
                                  * Certificate Requests are omitted */
-                                || (s->s3->tmp.new_cipher->algorithm_mkey & SSL_kPSK))
-                                {
+                            || (s->s3->tmp.new_cipher->algorithm_mkey & SSL_kPSK)) {
                                 /* no cert request */
-                                skip=1;
-                                s->s3->tmp.cert_request=0;
-                                s->state=SSL3_ST_SW_SRVR_DONE_A;
+                                skip = 1;
+                                s->s3->tmp.cert_request = 0;
+                                s->state = SSL3_ST_SW_SRVR_DONE_A;
                                 if (s->s3->handshake_buffer)
                                         if (!ssl3_digest_cached_records(s))
                                                 return -1;
-                                }
-                        else
-                                {
-                                s->s3->tmp.cert_request=1;
-                                ret=ssl3_send_certificate_request(s);
-                                if (ret <= 0) goto end;
+                        } else {
+                                s->s3->tmp.cert_request = 1;
+                                ret = ssl3_send_certificate_request(s);
+                                if (ret <= 0)
+                                        goto end;
 #ifndef NETSCAPE_HANG_BUG
-                                s->state=SSL3_ST_SW_SRVR_DONE_A;
+                                s->state = SSL3_ST_SW_SRVR_DONE_A;
 #else
-                                s->state=SSL3_ST_SW_FLUSH;
-                                s->s3->tmp.next_state=SSL3_ST_SR_CERT_A;
+                                s->state = SSL3_ST_SW_FLUSH;
+                                s->s3->tmp.next_state = SSL3_ST_SR_CERT_A;
 #endif
-                                s->init_num=0;
-                                }
+                                s->init_num = 0;
+                        }
                         break;
 
                 case SSL3_ST_SW_SRVR_DONE_A:
                 case SSL3_ST_SW_SRVR_DONE_B:
-                        ret=ssl3_send_server_done(s);
-                        if (ret <= 0) goto end;
-                        s->s3->tmp.next_state=SSL3_ST_SR_CERT_A;
-                        s->state=SSL3_ST_SW_FLUSH;
-                        s->init_num=0;
+                        ret = ssl3_send_server_done(s);
+                        if (ret <= 0)
+                                goto end;
+                        s->s3->tmp.next_state = SSL3_ST_SR_CERT_A;
+                        s->state = SSL3_ST_SW_FLUSH;
+                        s->init_num = 0;
                         break;
-                
+
                 case SSL3_ST_SW_FLUSH:
 
                         /* This code originally checked to see if
@@ -564,15 +550,14 @@ int ssl3_accept(SSL *s)
                          * unconditionally.
                          */
 
-                        s->rwstate=SSL_WRITING;
-                        if (BIO_flush(s->wbio) <= 0)
-                                {
-                                ret= -1;
+                        s->rwstate = SSL_WRITING;
+                        if (BIO_flush(s->wbio) <= 0) {
+                                ret = -1;
                                 goto end;
-                                }
-                        s->rwstate=SSL_NOTHING;
+                        }
+                        s->rwstate = SSL_NOTHING;
 
-                        s->state=s->s3->tmp.next_state;
+                        s->state = s->s3->tmp.next_state;
                         break;
 
                 case SSL3_ST_SR_CERT_A:
@@ -584,23 +569,22 @@ int ssl3_accept(SSL *s)
                         if (ret == 2)
                                 s->state = SSL3_ST_SR_CLNT_HELLO_C;
                         else {
-                                if (s->s3->tmp.cert_request)
-                                        {
-                                        ret=ssl3_get_client_certificate(s);
-                                        if (ret <= 0) goto end;
-                                        }
-                                s->init_num=0;
-                                s->state=SSL3_ST_SR_KEY_EXCH_A;
+                                if (s->s3->tmp.cert_request) {
+                                        ret = ssl3_get_client_certificate(s);
+                                        if (ret <= 0)
+                                                goto end;
+                                }
+                                s->init_num = 0;
+                                s->state = SSL3_ST_SR_KEY_EXCH_A;
                         }
                         break;
 
                 case SSL3_ST_SR_KEY_EXCH_A:
                 case SSL3_ST_SR_KEY_EXCH_B:
-                        ret=ssl3_get_client_key_exchange(s);
+                        ret = ssl3_get_client_key_exchange(s);
                         if (ret <= 0)
                                 goto end;
-                        if (ret == 2)
-                                {
+                        if (ret == 2) {
                                 /* For the ECDH ciphersuites when
                                  * the client sends its ECDH pub key in
                                  * a certificate, the CertificateVerify
@@ -610,40 +594,35 @@ int ssl3_accept(SSL *s)
                                  * for key exchange.
                                  */
 #if defined(OPENSSL_NO_TLSEXT) || defined(OPENSSL_NO_NEXTPROTONEG)
-                                s->state=SSL3_ST_SR_FINISHED_A;
+                                s->state = SSL3_ST_SR_FINISHED_A;
 #else
                                 if (s->s3->next_proto_neg_seen)
-                                        s->state=SSL3_ST_SR_NEXT_PROTO_A;
+                                        s->state = SSL3_ST_SR_NEXT_PROTO_A;
                                 else
-                                        s->state=SSL3_ST_SR_FINISHED_A;
+                                        s->state = SSL3_ST_SR_FINISHED_A;
 #endif
                                 s->init_num = 0;
-                                }
-                        else if (TLS1_get_version(s) >= TLS1_2_VERSION)
-                                {
-                                s->state=SSL3_ST_SR_CERT_VRFY_A;
-                                s->init_num=0;
+                        } else if (TLS1_get_version(s) >= TLS1_2_VERSION) {
+                                s->state = SSL3_ST_SR_CERT_VRFY_A;
+                                s->init_num = 0;
                                 if (!s->session->peer)
                                         break;
                                 /* For TLS v1.2 freeze the handshake buffer
                                  * at this point and digest cached records.
                                  */
-                                if (!s->s3->handshake_buffer)
-                                        {
-                                        SSLerr(SSL_F_SSL3_ACCEPT,ERR_R_INTERNAL_ERROR);
+                                if (!s->s3->handshake_buffer) {
+                                        SSLerr(SSL_F_SSL3_ACCEPT, ERR_R_INTERNAL_ERROR);
                                         return -1;
-                                        }
+                                }
                                 s->s3->flags |= TLS1_FLAGS_KEEP_HANDSHAKE;
                                 if (!ssl3_digest_cached_records(s))
                                         return -1;
-                                }
-                        else
-                                {
-                                int offset=0;
+                        } else {
+                                int offset = 0;
                                 int dgst_num;
 
-                                s->state=SSL3_ST_SR_CERT_VRFY_A;
-                                s->init_num=0;
+                                s->state = SSL3_ST_SR_CERT_VRFY_A;
+                                s->init_num = 0;
 
                                 /* We need to get hashes here so if there is
                                  * a client cert, it can be verified
@@ -653,82 +632,85 @@ int ssl3_accept(SSL *s)
                                 if (s->s3->handshake_buffer)
                                         if (!ssl3_digest_cached_records(s))
                                                 return -1;
-                                for (dgst_num=0; dgst_num<SSL_MAX_DIGEST;dgst_num++)    
-                                        if (s->s3->handshake_dgst[dgst_num]) 
-                                                {
-                                                int dgst_size;
-
-                                                s->method->ssl3_enc->cert_verify_mac(s,EVP_MD_CTX_type(s->s3->handshake_dgst[dgst_num]),&(s->s3->tmp.cert_verify_md[offset]));
-                                                dgst_size=EVP_MD_CTX_size(s->s3->handshake_dgst[dgst_num]);
-                                                if (dgst_size < 0)
-                                                        {
-                                                        ret = -1;
-                                                        goto end;
-                                                        }
-                                                offset+=dgst_size;
-                                                }               
+                                for (dgst_num = 0; dgst_num < SSL_MAX_DIGEST; dgst_num++)
+                                        if (s->s3->handshake_dgst[dgst_num]) {
+                                        int dgst_size;
+
+                                        s->method->ssl3_enc->cert_verify_mac(s, EVP_MD_CTX_type(s->s3->handshake_dgst[dgst_num]), &(s->s3->tmp.cert_verify_md[offset]));
+                                        dgst_size = EVP_MD_CTX_size(s->s3->handshake_dgst[dgst_num]);
+                                        if (dgst_size < 0) {
+                                                ret = -1;
+                                                goto end;
+                                        }
+                                        offset += dgst_size;
                                 }
+                        }
                         break;
 
                 case SSL3_ST_SR_CERT_VRFY_A:
                 case SSL3_ST_SR_CERT_VRFY_B:
 
                         /* we should decide if we expected this one */
-                        ret=ssl3_get_cert_verify(s);
-                        if (ret <= 0) goto end;
+                        ret = ssl3_get_cert_verify(s);
+                        if (ret <= 0)
+                                goto end;
 
 #if defined(OPENSSL_NO_TLSEXT) || defined(OPENSSL_NO_NEXTPROTONEG)
-                        s->state=SSL3_ST_SR_FINISHED_A;
+                        s->state = SSL3_ST_SR_FINISHED_A;
 #else
                         if (s->s3->next_proto_neg_seen)
-                                s->state=SSL3_ST_SR_NEXT_PROTO_A;
+                                s->state = SSL3_ST_SR_NEXT_PROTO_A;
                         else
-                                s->state=SSL3_ST_SR_FINISHED_A;
+                                s->state = SSL3_ST_SR_FINISHED_A;
 #endif
-                        s->init_num=0;
+                        s->init_num = 0;
                         break;
 
 #if !defined(OPENSSL_NO_TLSEXT) && !defined(OPENSSL_NO_NEXTPROTONEG)
                 case SSL3_ST_SR_NEXT_PROTO_A:
                 case SSL3_ST_SR_NEXT_PROTO_B:
-                        ret=ssl3_get_next_proto(s);
-                        if (ret <= 0) goto end;
+                        ret = ssl3_get_next_proto(s);
+                        if (ret <= 0)
+                                goto end;
                         s->init_num = 0;
-                        s->state=SSL3_ST_SR_FINISHED_A;
+                        s->state = SSL3_ST_SR_FINISHED_A;
                         break;
 #endif
 
                 case SSL3_ST_SR_FINISHED_A:
                 case SSL3_ST_SR_FINISHED_B:
-                        ret=ssl3_get_finished(s,SSL3_ST_SR_FINISHED_A,
-                                SSL3_ST_SR_FINISHED_B);
-                        if (ret <= 0) goto end;
+                        ret = ssl3_get_finished(s, SSL3_ST_SR_FINISHED_A,
+                            SSL3_ST_SR_FINISHED_B);
+                        if (ret <= 0)
+                                goto end;
                         if (s->hit)
-                                s->state=SSL_ST_OK;
+                                s->state = SSL_ST_OK;
 #ifndef OPENSSL_NO_TLSEXT
                         else if (s->tlsext_ticket_expected)
-                                s->state=SSL3_ST_SW_SESSION_TICKET_A;
+                                s->state = SSL3_ST_SW_SESSION_TICKET_A;
 #endif
                         else
-                                s->state=SSL3_ST_SW_CHANGE_A;
-                        s->init_num=0;
+                                s->state = SSL3_ST_SW_CHANGE_A;
+                        s->init_num = 0;
                         break;
 
 #ifndef OPENSSL_NO_TLSEXT
                 case SSL3_ST_SW_SESSION_TICKET_A:
                 case SSL3_ST_SW_SESSION_TICKET_B:
-                        ret=ssl3_send_newsession_ticket(s);
-                        if (ret <= 0) goto end;
-                        s->state=SSL3_ST_SW_CHANGE_A;
-                        s->init_num=0;
+                        ret = ssl3_send_newsession_ticket(s);
+                        if (ret <= 0)
+                                goto end;
+                        s->state = SSL3_ST_SW_CHANGE_A;
+                        s->init_num = 0;
                         break;
 
                 case SSL3_ST_SW_CERT_STATUS_A:
                 case SSL3_ST_SW_CERT_STATUS_B:
-                        ret=ssl3_send_cert_status(s);
-                        if (ret <= 0) goto end;
-                        s->state=SSL3_ST_SW_KEY_EXCH_A;
-                        s->init_num=0;
+                        ret = ssl3_send_cert_status(s);
+                        if (ret <= 0)
+                                goto end;
+                        s->state = SSL3_ST_SW_KEY_EXCH_A;
+                        s->init_num = 0;
                         break;
 
 #endif
@@ -736,48 +718,49 @@ int ssl3_accept(SSL *s)
                 case SSL3_ST_SW_CHANGE_A:
                 case SSL3_ST_SW_CHANGE_B:
 
-                        s->session->cipher=s->s3->tmp.new_cipher;
-                        if (!s->method->ssl3_enc->setup_key_block(s))
-                                { ret= -1; goto end; }
+                        s->session->cipher = s->s3->tmp.new_cipher;
+                        if (!s->method->ssl3_enc->setup_key_block(s)) {
+                                ret = -1;
+                                goto end;
+                        }
 
-                        ret=ssl3_send_change_cipher_spec(s,
-                                SSL3_ST_SW_CHANGE_A,SSL3_ST_SW_CHANGE_B);
+                        ret = ssl3_send_change_cipher_spec(s,
+                        SSL3_ST_SW_CHANGE_A, SSL3_ST_SW_CHANGE_B);
 
-                        if (ret <= 0) goto end;
-                        s->state=SSL3_ST_SW_FINISHED_A;
-                        s->init_num=0;
+                        if (ret <= 0)
+                                goto end;
+                        s->state = SSL3_ST_SW_FINISHED_A;
+                        s->init_num = 0;
 
-                        if (!s->method->ssl3_enc->change_cipher_state(s,
-                                SSL3_CHANGE_CIPHER_SERVER_WRITE))
-                                {
-                                ret= -1;
+                        if (!s->method->ssl3_enc->change_cipher_state(
+                            s, SSL3_CHANGE_CIPHER_SERVER_WRITE)) {
+                                ret = -1;
                                 goto end;
-                                }
+                        }
 
                         break;
 
                 case SSL3_ST_SW_FINISHED_A:
                 case SSL3_ST_SW_FINISHED_B:
-                        ret=ssl3_send_finished(s,
-                                SSL3_ST_SW_FINISHED_A,SSL3_ST_SW_FINISHED_B,
-                                s->method->ssl3_enc->server_finished_label,
-                                s->method->ssl3_enc->server_finished_label_len);
-                        if (ret <= 0) goto end;
-                        s->state=SSL3_ST_SW_FLUSH;
-                        if (s->hit)
-                                {
+                        ret = ssl3_send_finished(s,
+                        SSL3_ST_SW_FINISHED_A, SSL3_ST_SW_FINISHED_B,
+                        s->method->ssl3_enc->server_finished_label,
+                        s->method->ssl3_enc->server_finished_label_len);
+                        if (ret <= 0)
+                                goto end;
+                        s->state = SSL3_ST_SW_FLUSH;
+                        if (s->hit) {
 #if defined(OPENSSL_NO_TLSEXT) || defined(OPENSSL_NO_NEXTPROTONEG)
-                                s->s3->tmp.next_state=SSL3_ST_SR_FINISHED_A;
+                                s->s3->tmp.next_state = SSL3_ST_SR_FINISHED_A;
 #else
                                 if (s->s3->next_proto_neg_seen)
-                                        s->s3->tmp.next_state=SSL3_ST_SR_NEXT_PROTO_A;
+                                        s->s3->tmp.next_state = SSL3_ST_SR_NEXT_PROTO_A;
                                 else
-                                        s->s3->tmp.next_state=SSL3_ST_SR_FINISHED_A;
+                                        s->s3->tmp.next_state = SSL3_ST_SR_FINISHED_A;
 #endif
-                                }
-                        else
-                                s->s3->tmp.next_state=SSL_ST_OK;
-                        s->init_num=0;
+                        } else
+                                s->s3->tmp.next_state = SSL_ST_OK;
+                        s->init_num = 0;
                         break;
 
                 case SSL_ST_OK:
@@ -785,146 +768,143 @@ int ssl3_accept(SSL *s)
                         ssl3_cleanup_key_block(s);
 
                         BUF_MEM_free(s->init_buf);
-                        s->init_buf=NULL;
+                        s->init_buf = NULL;
 
                         /* remove buffering on output */
                         ssl_free_wbio_buffer(s);
 
-                        s->init_num=0;
+                        s->init_num = 0;
 
                         if (s->renegotiate == 2) /* skipped if we just sent a HelloRequest */
-                                {
-                                s->renegotiate=0;
-                                s->new_session=0;
-                                
-                                ssl_update_cache(s,SSL_SESS_CACHE_SERVER);
-                                
+                        {
+                                s->renegotiate = 0;
+                                s->new_session = 0;
+
+                                ssl_update_cache(s, SSL_SESS_CACHE_SERVER);
+
                                 s->ctx->stats.sess_accept_good++;
                                 /* s->server=1; */
-                                s->handshake_func=ssl3_accept;
+                                s->handshake_func = ssl3_accept;
+
+                                if (cb != NULL)
+                                        cb(s, SSL_CB_HANDSHAKE_DONE, 1);
+                        }
 
-                                if (cb != NULL) cb(s,SSL_CB_HANDSHAKE_DONE,1);
-                                }
-                        
                         ret = 1;
                         goto end;
                         /* break; */
 
                 default:
-                        SSLerr(SSL_F_SSL3_ACCEPT,SSL_R_UNKNOWN_STATE);
-                        ret= -1;
+                        SSLerr(SSL_F_SSL3_ACCEPT, SSL_R_UNKNOWN_STATE);
+                        ret = -1;
                         goto end;
                         /* break; */
-                        }
-                
-                if (!s->s3->tmp.reuse_message && !skip)
-                        {
-                        if (s->debug)
-                                {
-                                if ((ret=BIO_flush(s->wbio)) <= 0)
+                }
+
+                if (!s->s3->tmp.reuse_message && !skip) {
+                        if (s->debug) {
+                                if ((ret = BIO_flush(s->wbio)) <= 0)
                                         goto end;
-                                }
+                        }
 
 
-                        if ((cb != NULL) && (s->state != state))
-                                {
-                                new_state=s->state;
-                                s->state=state;
-                                cb(s,SSL_CB_ACCEPT_LOOP,1);
-                                s->state=new_state;
-                                }
+                        if ((cb != NULL) && (s->state != state)) {
+                                new_state = s->state;
+                                s->state = state;
+                                cb(s, SSL_CB_ACCEPT_LOOP, 1);
+                                s->state = new_state;
                         }
-                skip=0;
                 }
+                skip = 0;
+        }
 end:
         /* BIO_flush(s->wbio); */
 
         s->in_handshake--;
         if (cb != NULL)
-                cb(s,SSL_CB_ACCEPT_EXIT,ret);
-        return(ret);
-        }
+                cb(s, SSL_CB_ACCEPT_EXIT, ret);
+        return (ret);
+}
 
-int ssl3_send_hello_request(SSL *s)
-        {
+int
+ssl3_send_hello_request(SSL *s)
+{
         unsigned char *p;
 
-        if (s->state == SSL3_ST_SW_HELLO_REQ_A)
-                {
-                p=(unsigned char *)s->init_buf->data;
-                *(p++)=SSL3_MT_HELLO_REQUEST;
-                *(p++)=0;
-                *(p++)=0;
-                *(p++)=0;
+        if (s->state == SSL3_ST_SW_HELLO_REQ_A) {
+                p = (unsigned char *)s->init_buf->data;
+                *(p++) = SSL3_MT_HELLO_REQUEST;
+                *(p++) = 0;
+                *(p++) = 0;
+                *(p++) = 0;
 
-                s->state=SSL3_ST_SW_HELLO_REQ_B;
+                s->state = SSL3_ST_SW_HELLO_REQ_B;
                 /* number of bytes to write */
-                s->init_num=4;
-                s->init_off=0;
-                }
+                s->init_num = 4;
+                s->init_off = 0;
+        }
 
         /* SSL3_ST_SW_HELLO_REQ_B */
-        return(ssl3_do_write(s,SSL3_RT_HANDSHAKE));
-        }
+        return (ssl3_do_write(s, SSL3_RT_HANDSHAKE));
+}
 
-int ssl3_check_client_hello(SSL *s)
-        {
+int
+ssl3_check_client_hello(SSL *s)
+{
         int ok;
         long n;
 
         /* this function is called when we really expect a Certificate message,
          * so permit appropriate message length */
-        n=s->method->ssl_get_message(s,
-                SSL3_ST_SR_CERT_A,
-                SSL3_ST_SR_CERT_B,
-                -1,
-                s->max_cert_list,
-                &ok);
-        if (!ok) return((int)n);
+        n = s->method->ssl_get_message(s,
+        SSL3_ST_SR_CERT_A,
+        SSL3_ST_SR_CERT_B,
+        -1,
+        s->max_cert_list,
+        &ok);
+        if (!ok)
+                return ((int)n);
         s->s3->tmp.reuse_message = 1;
-        if (s->s3->tmp.message_type == SSL3_MT_CLIENT_HELLO)
-                {
+        if (s->s3->tmp.message_type == SSL3_MT_CLIENT_HELLO) {
                 /* We only allow the client to restart the handshake once per
                  * negotiation. */
-                if (s->s3->flags & SSL3_FLAGS_SGC_RESTART_DONE)
-                        {
+                if (s->s3->flags & SSL3_FLAGS_SGC_RESTART_DONE) {
                         SSLerr(SSL_F_SSL3_CHECK_CLIENT_HELLO, SSL_R_MULTIPLE_SGC_RESTARTS);
                         return -1;
-                        }
+                }
                 /* Throw away what we have done so far in the current handshake,
                  * which will now be aborted. (A full SSL_clear would be too much.) */
 #ifndef OPENSSL_NO_DH
-                if (s->s3->tmp.dh != NULL)
-                        {
+                if (s->s3->tmp.dh != NULL) {
                         DH_free(s->s3->tmp.dh);
                         s->s3->tmp.dh = NULL;
-                        }
+                }
 #endif
 #ifndef OPENSSL_NO_ECDH
-                if (s->s3->tmp.ecdh != NULL)
-                        {
+                if (s->s3->tmp.ecdh != NULL) {
                         EC_KEY_free(s->s3->tmp.ecdh);
                         s->s3->tmp.ecdh = NULL;
-                        }
+                }
 #endif
                 s->s3->flags |= SSL3_FLAGS_SGC_RESTART_DONE;
                 return 2;
-                }
+        }
         return 1;
 }
 
-int ssl3_get_client_hello(SSL *s)
-        {
-        int i,j,ok,al,ret= -1;
+int
+ssl3_get_client_hello(SSL *s)
+{
+        int i, j, ok, al, ret = -1;
         unsigned int cookie_len;
         long n;
         unsigned long id;
-        unsigned char *p,*d,*q;
+        unsigned char *p, *d, *q;
         SSL_CIPHER *c;
 #ifndef OPENSSL_NO_COMP
-        SSL_COMP *comp=NULL;
+        SSL_COMP *comp = NULL;
 #endif
-        STACK_OF(SSL_CIPHER) *ciphers=NULL;
+        STACK_OF(SSL_CIPHER) *ciphers = NULL;
 
         /* We do this so that we will respond with our native type.
          * If we are TLSv1 and we get SSLv3, we will respond with TLSv1,
@@ -932,65 +912,61 @@ int ssl3_get_client_hello(SSL *s)
          * If we are SSLv3, we will respond with SSLv3, even if prompted with
          * TLSv1.
          */
-        if (s->state == SSL3_ST_SR_CLNT_HELLO_A
-                )
-                {
-                s->state=SSL3_ST_SR_CLNT_HELLO_B;
-                }
-        s->first_packet=1;
-        n=s->method->ssl_get_message(s,
-                SSL3_ST_SR_CLNT_HELLO_B,
-                SSL3_ST_SR_CLNT_HELLO_C,
-                SSL3_MT_CLIENT_HELLO,
-                SSL3_RT_MAX_PLAIN_LENGTH,
-                &ok);
+        if (s->state == SSL3_ST_SR_CLNT_HELLO_A) {
+                s->state = SSL3_ST_SR_CLNT_HELLO_B;
+        }
+        s->first_packet = 1;
+        n = s->method->ssl_get_message(s,
+        SSL3_ST_SR_CLNT_HELLO_B,
+        SSL3_ST_SR_CLNT_HELLO_C,
+        SSL3_MT_CLIENT_HELLO,
+        SSL3_RT_MAX_PLAIN_LENGTH,
+        &ok);
 
-        if (!ok) return((int)n);
-        s->first_packet=0;
-        d=p=(unsigned char *)s->init_msg;
+        if (!ok)
+                return ((int)n);
+        s->first_packet = 0;
+        d = p=(unsigned char *)s->init_msg;
 
         /* use version from inside client hello, not from record header
          * (may differ: see RFC 2246, Appendix E, second paragraph) */
-        s->client_version=(((int)p[0])<<8)|(int)p[1];
-        p+=2;
+        s->client_version = (((int)p[0]) << 8)|(int)p[1];
+        p += 2;
 
         if ((s->version == DTLS1_VERSION && s->client_version > s->version) ||
-            (s->version != DTLS1_VERSION && s->client_version < s->version))
-                {
+            (s->version != DTLS1_VERSION && s->client_version < s->version)) {
                 SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO, SSL_R_WRONG_VERSION_NUMBER);
-                if ((s->client_version>>8) == SSL3_VERSION_MAJOR && 
-                        !s->enc_write_ctx && !s->write_hash)
-                        {
+                if ((s->client_version >> 8) == SSL3_VERSION_MAJOR &&
+                        !s->enc_write_ctx && !s->write_hash) {
                         /* similar to ssl3_get_record, send alert using remote version number */
                         s->version = s->client_version;
-                        }
+                }
                 al = SSL_AD_PROTOCOL_VERSION;
                 goto f_err;
-                }
+        }
 
         /* If we require cookies and this ClientHello doesn't
          * contain one, just return since we do not want to
          * allocate any memory yet. So check cookie length...
          */
-        if (SSL_get_options(s) & SSL_OP_COOKIE_EXCHANGE)
-                {
+        if (SSL_get_options(s) & SSL_OP_COOKIE_EXCHANGE) {
                 unsigned int session_length, cookie_length;
-                
+
                 session_length = *(p + SSL3_RANDOM_SIZE);
                 cookie_length = *(p + SSL3_RANDOM_SIZE + session_length + 1);
 
                 if (cookie_length == 0)
                         return 1;
-                }
+        }
 
         /* load the client random */
-        memcpy(s->s3->client_random,p,SSL3_RANDOM_SIZE);
-        p+=SSL3_RANDOM_SIZE;
+        memcpy(s->s3->client_random, p, SSL3_RANDOM_SIZE);
+        p += SSL3_RANDOM_SIZE;
 
         /* get the session-id */
         j= *(p++);
 
-        s->hit=0;
+        s->hit = 0;
         /* Versions before 0.9.7 always allow clients to resume sessions in renegotiation.
          * 0.9.7 and later allow this by default, but optionally ignore resumption requests
          * with flag SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION (it's a new flag rather
@@ -1002,31 +978,26 @@ int ssl3_get_client_hello(SSL *s)
          * this essentially just means that the SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION
          * setting will be ignored.
          */
-        if ((s->new_session && (s->options & SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION)))
-                {
-                if (!ssl_get_new_session(s,1))
+        if ((s->new_session && (s->options & SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION))) {
+                if (!ssl_get_new_session(s, 1))
                         goto err;
-                }
-        else
-                {
-                i=ssl_get_prev_session(s, p, j, d + n);
+        } else {
+                i = ssl_get_prev_session(s, p, j, d + n);
                 if (i == 1)
-                        { /* previous session */
-                        s->hit=1;
-                        }
-                else if (i == -1)
+                                { /* previous session */
+                        s->hit = 1;
+                } else if (i == -1)
                         goto err;
                 else /* i == 0 */
-                        {
-                        if (!ssl_get_new_session(s,1))
+                {
+                        if (!ssl_get_new_session(s, 1))
                                 goto err;
-                        }
                 }
+        }
 
-        p+=j;
+        p += j;
 
-        if (s->version == DTLS1_VERSION || s->version == DTLS1_BAD_VER)
-                {
+        if (s->version == DTLS1_VERSION || s->version == DTLS1_BAD_VER) {
                 /* cookie stuff */
                 cookie_len = *(p++);
 
@@ -1035,159 +1006,141 @@ int ssl3_get_client_hello(SSL *s)
                  * HelloVerify message has not been sent--make sure that it
                  * does not cause an overflow.
                  */
-                if ( cookie_len > sizeof(s->d1->rcvd_cookie))
-                        {
+                if (cookie_len > sizeof(s->d1->rcvd_cookie)) {
                         /* too much data */
                         al = SSL_AD_DECODE_ERROR;
                         SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO, SSL_R_COOKIE_MISMATCH);
                         goto f_err;
-                        }
+                }
 
                 /* verify the cookie if appropriate option is set. */
                 if ((SSL_get_options(s) & SSL_OP_COOKIE_EXCHANGE) &&
-                        cookie_len > 0)
-                        {
+                    cookie_len > 0) {
                         memcpy(s->d1->rcvd_cookie, p, cookie_len);
 
-                        if ( s->ctx->app_verify_cookie_cb != NULL)
-                                {
-                                if ( s->ctx->app_verify_cookie_cb(s, s->d1->rcvd_cookie,
-                                        cookie_len) == 0)
-                                        {
-                                        al=SSL_AD_HANDSHAKE_FAILURE;
-                                        SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO, 
-                                                SSL_R_COOKIE_MISMATCH);
-                                        goto f_err;
-                                        }
-                                /* else cookie verification succeeded */
-                                }
-                        else if ( memcmp(s->d1->rcvd_cookie, s->d1->cookie, 
-                                                  s->d1->cookie_len) != 0) /* default verification */
-                                {
-                                        al=SSL_AD_HANDSHAKE_FAILURE;
-                                        SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO, 
-                                                SSL_R_COOKIE_MISMATCH);
+                        if (s->ctx->app_verify_cookie_cb != NULL) {
+                                if (s->ctx->app_verify_cookie_cb(s, s->d1->rcvd_cookie,
+                                        cookie_len) == 0) {
+                                        al = SSL_AD_HANDSHAKE_FAILURE;
+                                        SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO,
+                                        SSL_R_COOKIE_MISMATCH);
                                         goto f_err;
                                 }
+                                /* else cookie verification succeeded */
+                        } else if (memcmp(s->d1->rcvd_cookie, s->d1->cookie,
+                            s->d1->cookie_len) != 0) /* default verification */
+                        {
+                                al = SSL_AD_HANDSHAKE_FAILURE;
+                                SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO,
+                                SSL_R_COOKIE_MISMATCH);
+                                goto f_err;
+                        }
 
                         ret = 2;
-                        }
+                }
 
                 p += cookie_len;
-                }
+        }
 
-        n2s(p,i);
-        if ((i == 0) && (j != 0))
-                {
+        n2s(p, i);
+        if ((i == 0) && (j != 0)) {
                 /* we need a cipher if we are not resuming a session */
-                al=SSL_AD_ILLEGAL_PARAMETER;
-                SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO,SSL_R_NO_CIPHERS_SPECIFIED);
+                al = SSL_AD_ILLEGAL_PARAMETER;
+                SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO, SSL_R_NO_CIPHERS_SPECIFIED);
                 goto f_err;
-                }
-        if ((p+i) >= (d+n))
-                {
+        }
+        if ((p + i) >= (d + n)) {
                 /* not enough data */
-                al=SSL_AD_DECODE_ERROR;
-                SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO,SSL_R_LENGTH_MISMATCH);
+                al = SSL_AD_DECODE_ERROR;
+                SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO, SSL_R_LENGTH_MISMATCH);
                 goto f_err;
-                }
-        if ((i > 0) && (ssl_bytes_to_cipher_list(s,p,i,&(ciphers))
-                == NULL))
-                {
+        }
+        if ((i > 0) &&
+            (ssl_bytes_to_cipher_list(s, p, i, &(ciphers)) == NULL)) {
                 goto err;
-                }
-        p+=i;
+        }
+        p += i;
 
         /* If it is a hit, check that the cipher is in the list */
-        if ((s->hit) && (i > 0))
-                {
-                j=0;
-                id=s->session->cipher->id;
+        if ((s->hit) && (i > 0)) {
+                j = 0;
+                id = s->session->cipher->id;
 
 #ifdef CIPHER_DEBUG
-                printf("client sent %d ciphers\n",sk_num(ciphers));
+                printf("client sent %d ciphers\n", sk_num(ciphers));
 #endif
-                for (i=0; i<sk_SSL_CIPHER_num(ciphers); i++)
-                        {
-                        c=sk_SSL_CIPHER_value(ciphers,i);
+                for (i = 0; i < sk_SSL_CIPHER_num(ciphers); i++) {
+                        c = sk_SSL_CIPHER_value(ciphers, i);
 #ifdef CIPHER_DEBUG
                         printf("client [%2d of %2d]:%s\n",
-                                i,sk_num(ciphers),SSL_CIPHER_get_name(c));
+                        i, sk_num(ciphers), SSL_CIPHER_get_name(c));
 #endif
-                        if (c->id == id)
-                                {
-                                j=1;
+                        if (c->id == id) {
+                                j = 1;
                                 break;
-                                }
                         }
+                }
 /* Disabled because it can be used in a ciphersuite downgrade
  * attack: CVE-2010-4180.
  */
 #if 0
-                if (j == 0 && (s->options & SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG) && (sk_SSL_CIPHER_num(ciphers) == 1))
-                        {
+                if (j == 0 && (s->options & SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG) && (sk_SSL_CIPHER_num(ciphers) == 1)) {
                         /* Special case as client bug workaround: the previously used cipher may
                          * not be in the current list, the client instead might be trying to
                          * continue using a cipher that before wasn't chosen due to server
                          * preferences.  We'll have to reject the connection if the cipher is not
                          * enabled, though. */
                         c = sk_SSL_CIPHER_value(ciphers, 0);
-                        if (sk_SSL_CIPHER_find(SSL_get_ciphers(s), c) >= 0)
-                                {
+                        if (sk_SSL_CIPHER_find(SSL_get_ciphers(s), c) >= 0) {
                                 s->session->cipher = c;
                                 j = 1;
-                                }
                         }
+                }
 #endif
-                if (j == 0)
-                        {
+                if (j == 0) {
                         /* we need to have the cipher in the cipher
                          * list if we are asked to reuse it */
-                        al=SSL_AD_ILLEGAL_PARAMETER;
-                        SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO,SSL_R_REQUIRED_CIPHER_MISSING);
+                        al = SSL_AD_ILLEGAL_PARAMETER;
+                        SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO, SSL_R_REQUIRED_CIPHER_MISSING);
                         goto f_err;
-                        }
                 }
+        }
 
         /* compression */
         i= *(p++);
-        if ((p+i) > (d+n))
-                {
+        if ((p + i) > (d + n)) {
                 /* not enough data */
-                al=SSL_AD_DECODE_ERROR;
-                SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO,SSL_R_LENGTH_MISMATCH);
+                al = SSL_AD_DECODE_ERROR;
+                SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO, SSL_R_LENGTH_MISMATCH);
                 goto f_err;
-                }
-        q=p;
-        for (j=0; j<i; j++)
-                {
-                if (p[j] == 0) break;
-                }
+        }
+        q = p;
+        for (j = 0; j < i; j++) {
+                if (p[j] == 0)
+                        break;
+        }
 
-        p+=i;
-        if (j >= i)
-                {
+        p += i;
+        if (j >= i) {
                 /* no compress */
-                al=SSL_AD_DECODE_ERROR;
-                SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO,SSL_R_NO_COMPRESSION_SPECIFIED);
+                al = SSL_AD_DECODE_ERROR;
+                SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO, SSL_R_NO_COMPRESSION_SPECIFIED);
                 goto f_err;
-                }
+        }
 
 #ifndef OPENSSL_NO_TLSEXT
         /* TLS extensions*/
-        if (s->version >= SSL3_VERSION)
-                {
-                if (!ssl_parse_clienthello_tlsext(s,&p,d,n, &al))
-                        {
+        if (s->version >= SSL3_VERSION) {
+                if (!ssl_parse_clienthello_tlsext(s, &p, d, n, &al)) {
                         /* 'al' set by ssl_parse_clienthello_tlsext */
-                        SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO,SSL_R_PARSE_TLSEXT);
+                        SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO, SSL_R_PARSE_TLSEXT);
                         goto f_err;
-                        }
-                }
-                if (ssl_check_clienthello_tlsext_early(s) <= 0) {
-                        SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO,SSL_R_CLIENTHELLO_TLSEXT);
-                        goto err;
                 }
+        }
+        if (ssl_check_clienthello_tlsext_early(s) <= 0) {
+                SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO, SSL_R_CLIENTHELLO_TLSEXT);
+                goto err;
+        }
 
         /* Check if we want to use external pre-shared secret for this
          * handshake for not reused session only. We need to generate
@@ -1195,38 +1148,34 @@ int ssl3_get_client_hello(SSL *s)
          * SessionTicket processing to use it in key derivation. */
         {
                 unsigned char *pos;
-                pos=s->s3->server_random;
-                if (ssl_fill_hello_random(s, 1, pos, SSL3_RANDOM_SIZE) <= 0)
-                        {
-                        al=SSL_AD_INTERNAL_ERROR;
+                pos = s->s3->server_random;
+                if (ssl_fill_hello_random(s, 1, pos, SSL3_RANDOM_SIZE) <= 0) {
+                        al = SSL_AD_INTERNAL_ERROR;
                         goto f_err;
-                        }
+                }
         }
 
-        if (!s->hit && s->version >= TLS1_VERSION && s->tls_session_secret_cb)
-                {
-                SSL_CIPHER *pref_cipher=NULL;
+        if (!s->hit && s->version >= TLS1_VERSION && s->tls_session_secret_cb) {
+                SSL_CIPHER *pref_cipher = NULL;
 
-                s->session->master_key_length=sizeof(s->session->master_key);
-                if(s->tls_session_secret_cb(s, s->session->master_key, &s->session->master_key_length,
-                        ciphers, &pref_cipher, s->tls_session_secret_cb_arg))
-                        {
-                        s->hit=1;
-                        s->session->ciphers=ciphers;
-                        s->session->verify_result=X509_V_OK;
+                s->session->master_key_length = sizeof(s->session->master_key);
+                if (s->tls_session_secret_cb(s, s->session->master_key, &s->session->master_key_length,
+                        ciphers, &pref_cipher, s->tls_session_secret_cb_arg)) {
+                        s->hit = 1;
+                        s->session->ciphers = ciphers;
+                        s->session->verify_result = X509_V_OK;
 
-                        ciphers=NULL;
+                        ciphers = NULL;
 
                         /* check if some cipher was preferred by call back */
-                        pref_cipher=pref_cipher ? pref_cipher : ssl3_choose_cipher(s, s->session->ciphers, SSL_get_ciphers(s));
-                        if (pref_cipher == NULL)
-                                {
-                                al=SSL_AD_HANDSHAKE_FAILURE;
-                                SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO,SSL_R_NO_SHARED_CIPHER);
+                        pref_cipher = pref_cipher ? pref_cipher : ssl3_choose_cipher(s, s->session->ciphers, SSL_get_ciphers(s));
+                        if (pref_cipher == NULL) {
+                                al = SSL_AD_HANDSHAKE_FAILURE;
+                                SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO, SSL_R_NO_SHARED_CIPHER);
                                 goto f_err;
-                                }
+                        }
 
-                        s->session->cipher=pref_cipher;
+                        s->session->cipher = pref_cipher;
 
                         if (s->cipher_list)
                                 sk_SSL_CIPHER_free(s->cipher_list);
@@ -1236,165 +1185,144 @@ int ssl3_get_client_hello(SSL *s)
 
                         s->cipher_list = sk_SSL_CIPHER_dup(s->session->ciphers);
                         s->cipher_list_by_id = sk_SSL_CIPHER_dup(s->session->ciphers);
-                        }
                 }
+        }
 #endif
 
         /* Worst case, we will use the NULL compression, but if we have other
          * options, we will now look for them.  We have i-1 compression
          * algorithms from the client, starting at q. */
-        s->s3->tmp.new_compression=NULL;
+        s->s3->tmp.new_compression = NULL;
 #ifndef OPENSSL_NO_COMP
         /* This only happens if we have a cache hit */
-        if (s->session->compress_meth != 0)
-                {
+        if (s->session->compress_meth != 0) {
                 int m, comp_id = s->session->compress_meth;
                 /* Perform sanity checks on resumed compression algorithm */
                 /* Can't disable compression */
-                if (s->options & SSL_OP_NO_COMPRESSION)
-                        {
-                        al=SSL_AD_INTERNAL_ERROR;
-                        SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO,SSL_R_INCONSISTENT_COMPRESSION);
+                if (s->options & SSL_OP_NO_COMPRESSION) {
+                        al = SSL_AD_INTERNAL_ERROR;
+                        SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO, SSL_R_INCONSISTENT_COMPRESSION);
                         goto f_err;
-                        }
+                }
                 /* Look for resumed compression method */
-                for (m = 0; m < sk_SSL_COMP_num(s->ctx->comp_methods); m++)
-                        {
-                        comp=sk_SSL_COMP_value(s->ctx->comp_methods,m);
-                        if (comp_id == comp->id)
-                                {
-                                s->s3->tmp.new_compression=comp;
+                for (m = 0; m < sk_SSL_COMP_num(s->ctx->comp_methods); m++) {
+                        comp = sk_SSL_COMP_value(s->ctx->comp_methods, m);
+                        if (comp_id == comp->id) {
+                                s->s3->tmp.new_compression = comp;
                                 break;
-                                }
                         }
-                if (s->s3->tmp.new_compression == NULL)
-                        {
-                        al=SSL_AD_INTERNAL_ERROR;
-                        SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO,SSL_R_INVALID_COMPRESSION_ALGORITHM);
+                }
+                if (s->s3->tmp.new_compression == NULL) {
+                        al = SSL_AD_INTERNAL_ERROR;
+                        SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO, SSL_R_INVALID_COMPRESSION_ALGORITHM);
                         goto f_err;
-                        }
+                }
                 /* Look for resumed method in compression list */
-                for (m = 0; m < i; m++)
-                        {
+                for (m = 0; m < i; m++) {
                         if (q[m] == comp_id)
                                 break;
-                        }
-                if (m >= i)
-                        {
-                        al=SSL_AD_ILLEGAL_PARAMETER;
-                        SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO,SSL_R_REQUIRED_COMPRESSSION_ALGORITHM_MISSING);
+                }
+                if (m >= i) {
+                        al = SSL_AD_ILLEGAL_PARAMETER;
+                        SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO, SSL_R_REQUIRED_COMPRESSSION_ALGORITHM_MISSING);
                         goto f_err;
-                        }
                 }
-        else if (s->hit)
+        } else if (s->hit)
                 comp = NULL;
         else if (!(s->options & SSL_OP_NO_COMPRESSION) && s->ctx->comp_methods)
-                { /* See if we have a match */
-                int m,nn,o,v,done=0;
-
-                nn=sk_SSL_COMP_num(s->ctx->comp_methods);
-                for (m=0; m<nn; m++)
-                        {
-                        comp=sk_SSL_COMP_value(s->ctx->comp_methods,m);
-                        v=comp->id;
-                        for (o=0; o<i; o++)
-                                {
-                                if (v == q[o])
-                                        {
-                                        done=1;
+        { /* See if we have a match */
+                int m, nn, o, v, done = 0;
+
+                nn = sk_SSL_COMP_num(s->ctx->comp_methods);
+                for (m = 0; m < nn; m++) {
+                        comp = sk_SSL_COMP_value(s->ctx->comp_methods, m);
+                        v = comp->id;
+                        for (o = 0; o < i; o++) {
+                                if (v == q[o]) {
+                                        done = 1;
                                         break;
-                                        }
                                 }
-                        if (done) break;
                         }
+                        if (done)
+                                break;
+                }
                 if (done)
-                        s->s3->tmp.new_compression=comp;
+                        s->s3->tmp.new_compression = comp;
                 else
-                        comp=NULL;
-                }
+                        comp = NULL;
+        }
 #else
         /* If compression is disabled we'd better not try to resume a session
          * using compression.
          */
-        if (s->session->compress_meth != 0)
-                {
-                al=SSL_AD_INTERNAL_ERROR;
-                SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO,SSL_R_INCONSISTENT_COMPRESSION);
+        if (s->session->compress_meth != 0) {
+                al = SSL_AD_INTERNAL_ERROR;
+                SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO, SSL_R_INCONSISTENT_COMPRESSION);
                 goto f_err;
-                }
+        }
 #endif
 
         /* Given s->session->ciphers and SSL_get_ciphers, we must
          * pick a cipher */
 
-        if (!s->hit)
-                {
+        if (!s->hit) {
 #ifdef OPENSSL_NO_COMP
-                s->session->compress_meth=0;
+                s->session->compress_meth = 0;
 #else
-                s->session->compress_meth=(comp == NULL)?0:comp->id;
+                s->session->compress_meth = (comp == NULL) ? 0 : comp->id;
 #endif
                 if (s->session->ciphers != NULL)
                         sk_SSL_CIPHER_free(s->session->ciphers);
-                s->session->ciphers=ciphers;
-                if (ciphers == NULL)
-                        {
-                        al=SSL_AD_ILLEGAL_PARAMETER;
-                        SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO,SSL_R_NO_CIPHERS_PASSED);
+                s->session->ciphers = ciphers;
+                if (ciphers == NULL) {
+                        al = SSL_AD_ILLEGAL_PARAMETER;
+                        SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO, SSL_R_NO_CIPHERS_PASSED);
                         goto f_err;
-                        }
-                ciphers=NULL;
-                c=ssl3_choose_cipher(s,s->session->ciphers,
-                                     SSL_get_ciphers(s));
+                }
+                ciphers = NULL;
+                c = ssl3_choose_cipher(s, s->session->ciphers,
+                SSL_get_ciphers(s));
 
-                if (c == NULL)
-                        {
-                        al=SSL_AD_HANDSHAKE_FAILURE;
-                        SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO,SSL_R_NO_SHARED_CIPHER);
+                if (c == NULL) {
+                        al = SSL_AD_HANDSHAKE_FAILURE;
+                        SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO, SSL_R_NO_SHARED_CIPHER);
                         goto f_err;
-                        }
-                s->s3->tmp.new_cipher=c;
                 }
-        else
-                {
+                s->s3->tmp.new_cipher = c;
+        } else {
                 /* Session-id reuse */
 #ifdef REUSE_CIPHER_BUG
                 STACK_OF(SSL_CIPHER) *sk;
-                SSL_CIPHER *nc=NULL;
-                SSL_CIPHER *ec=NULL;
+                SSL_CIPHER *nc = NULL;
+                SSL_CIPHER *ec = NULL;
 
-                if (s->options & SSL_OP_NETSCAPE_DEMO_CIPHER_CHANGE_BUG)
-                        {
-                        sk=s->session->ciphers;
-                        for (i=0; i<sk_SSL_CIPHER_num(sk); i++)
-                                {
-                                c=sk_SSL_CIPHER_value(sk,i);
+                if (s->options & SSL_OP_NETSCAPE_DEMO_CIPHER_CHANGE_BUG) {
+                        sk = s->session->ciphers;
+                        for (i = 0; i < sk_SSL_CIPHER_num(sk); i++) {
+                                c = sk_SSL_CIPHER_value(sk, i);
                                 if (c->algorithm_enc & SSL_eNULL)
-                                        nc=c;
+                                        nc = c;
                                 if (SSL_C_IS_EXPORT(c))
-                                        ec=c;
-                                }
+                                        ec = c;
+                        }
                         if (nc != NULL)
-                                s->s3->tmp.new_cipher=nc;
+                                s->s3->tmp.new_cipher = nc;
                         else if (ec != NULL)
-                                s->s3->tmp.new_cipher=ec;
+                                s->s3->tmp.new_cipher = ec;
                         else
-                                s->s3->tmp.new_cipher=s->session->cipher;
-                        }
-                else
+                                s->s3->tmp.new_cipher = s->session->cipher;
+                } else
 #endif
-                s->s3->tmp.new_cipher=s->session->cipher;
-                }
+                s->s3->tmp.new_cipher = s->session->cipher;
+        }
 
-        if (TLS1_get_version(s) < TLS1_2_VERSION || !(s->verify_mode & SSL_VERIFY_PEER))
-                {
-                if (!ssl3_digest_cached_records(s))
-                        {
+        if (TLS1_get_version(s) < TLS1_2_VERSION || !(s->verify_mode & SSL_VERIFY_PEER)) {
+                if (!ssl3_digest_cached_records(s)) {
                         al = SSL_AD_INTERNAL_ERROR;
                         goto f_err;
-                        }
                 }
-        
+        }
+
         /* we now have the following setup. 
          * client_random
          * cipher_list          - our prefered list of ciphers
@@ -1407,50 +1335,49 @@ int ssl3_get_client_hello(SSL *s)
          */
 
         /* Handles TLS extensions that we couldn't check earlier */
-        if (s->version >= SSL3_VERSION)
-                {
-                if (ssl_check_clienthello_tlsext_late(s) <= 0)
-                        {
+        if (s->version >= SSL3_VERSION) {
+                if (ssl_check_clienthello_tlsext_late(s) <= 0) {
                         SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO, SSL_R_CLIENTHELLO_TLSEXT);
                         goto err;
-                        }
                 }
+        }
 
-        if (ret < 0) ret=1;
-        if (0)
-                {
+        if (ret < 0)
+                ret = 1;
+        if (0) {
 f_err:
-                ssl3_send_alert(s,SSL3_AL_FATAL,al);
-                }
-err:
-        if (ciphers != NULL) sk_SSL_CIPHER_free(ciphers);
-        return(ret);
+                ssl3_send_alert(s, SSL3_AL_FATAL, al);
         }
+err:
+        if (ciphers != NULL)
+                sk_SSL_CIPHER_free(ciphers);
+        return (ret);
+}
 
-int ssl3_send_server_hello(SSL *s)
-        {
+int
+ssl3_send_server_hello(SSL *s)
+{
         unsigned char *buf;
-        unsigned char *p,*d;
-        int i,sl;
+        unsigned char *p, *d;
+        int i, sl;
         unsigned long l;
 
-        if (s->state == SSL3_ST_SW_SRVR_HELLO_A)
-                {
-                buf=(unsigned char *)s->init_buf->data;
+        if (s->state == SSL3_ST_SW_SRVR_HELLO_A) {
+                buf = (unsigned char *)s->init_buf->data;
 #ifdef OPENSSL_NO_TLSEXT
-                p=s->s3->server_random;
+                p = s->s3->server_random;
                 if (ssl_fill_hello_random(s, 1, p, SSL3_RANDOM_SIZE) <= 0)
                         return -1;
 #endif
                 /* Do the message type and length last */
-                d=p= &(buf[4]);
+                d = p= &(buf[4]);
 
-                *(p++)=s->version>>8;
-                *(p++)=s->version&0xff;
+                *(p++) = s->version >> 8;
+                *(p++) = s->version&0xff;
 
                 /* Random stuff */
-                memcpy(p,s->s3->server_random,SSL3_RANDOM_SIZE);
-                p+=SSL3_RANDOM_SIZE;
+                memcpy(p, s->s3->server_random, SSL3_RANDOM_SIZE);
+                p += SSL3_RANDOM_SIZE;
 
                 /* There are several cases for the session ID to send
                  * back in the server hello:
@@ -1469,317 +1396,287 @@ int ssl3_send_server_hello(SSL *s)
                  */
                 if (!(s->ctx->session_cache_mode & SSL_SESS_CACHE_SERVER)
                         && !s->hit)
-                        s->session->session_id_length=0;
+                s->session->session_id_length = 0;
 
-                sl=s->session->session_id_length;
-                if (sl > (int)sizeof(s->session->session_id))
-                        {
+                sl = s->session->session_id_length;
+                if (sl > (int)sizeof(s->session->session_id)) {
                         SSLerr(SSL_F_SSL3_SEND_SERVER_HELLO, ERR_R_INTERNAL_ERROR);
                         return -1;
-                        }
-                *(p++)=sl;
-                memcpy(p,s->session->session_id,sl);
-                p+=sl;
+                }
+                *(p++) = sl;
+                memcpy(p, s->session->session_id, sl);
+                p += sl;
 
                 /* put the cipher */
-                i=ssl3_put_cipher_by_char(s->s3->tmp.new_cipher,p);
-                p+=i;
+                i = ssl3_put_cipher_by_char(s->s3->tmp.new_cipher, p);
+                p += i;
 
                 /* put the compression method */
 #ifdef OPENSSL_NO_COMP
-                        *(p++)=0;
+                *(p++) = 0;
 #else
                 if (s->s3->tmp.new_compression == NULL)
-                        *(p++)=0;
+                        *(p++) = 0;
                 else
-                        *(p++)=s->s3->tmp.new_compression->id;
+                        *(p++) = s->s3->tmp.new_compression->id;
 #endif
 #ifndef OPENSSL_NO_TLSEXT
-                if (ssl_prepare_serverhello_tlsext(s) <= 0)
-                        {
-                        SSLerr(SSL_F_SSL3_SEND_SERVER_HELLO,SSL_R_SERVERHELLO_TLSEXT);
+                if (ssl_prepare_serverhello_tlsext(s) <= 0) {
+                        SSLerr(SSL_F_SSL3_SEND_SERVER_HELLO, SSL_R_SERVERHELLO_TLSEXT);
                         return -1;
-                        }
-                if ((p = ssl_add_serverhello_tlsext(s, p, buf+SSL3_RT_MAX_PLAIN_LENGTH)) == NULL)
-                        {
-                        SSLerr(SSL_F_SSL3_SEND_SERVER_HELLO,ERR_R_INTERNAL_ERROR);
+                }
+                if ((p = ssl_add_serverhello_tlsext(s, p, buf + SSL3_RT_MAX_PLAIN_LENGTH)) == NULL) {
+                        SSLerr(SSL_F_SSL3_SEND_SERVER_HELLO, ERR_R_INTERNAL_ERROR);
                         return -1;
-                        }
+                }
 #endif
                 /* do the header */
-                l=(p-d);
-                d=buf;
-                *(d++)=SSL3_MT_SERVER_HELLO;
-                l2n3(l,d);
+                l = (p - d);
+                d = buf;
+                *(d++) = SSL3_MT_SERVER_HELLO;
+                l2n3(l, d);
 
-                s->state=SSL3_ST_SW_SRVR_HELLO_B;
+                s->state = SSL3_ST_SW_SRVR_HELLO_B;
                 /* number of bytes to write */
-                s->init_num=p-buf;
-                s->init_off=0;
-                }
+                s->init_num = p - buf;
+                s->init_off = 0;
+        }
 
         /* SSL3_ST_SW_SRVR_HELLO_B */
-        return(ssl3_do_write(s,SSL3_RT_HANDSHAKE));
-        }
+        return (ssl3_do_write(s, SSL3_RT_HANDSHAKE));
+}
 
-int ssl3_send_server_done(SSL *s)
-        {
+int
+ssl3_send_server_done(SSL *s)
+{
         unsigned char *p;
 
-        if (s->state == SSL3_ST_SW_SRVR_DONE_A)
-                {
-                p=(unsigned char *)s->init_buf->data;
+        if (s->state == SSL3_ST_SW_SRVR_DONE_A) {
+                p = (unsigned char *)s->init_buf->data;
 
                 /* do the header */
-                *(p++)=SSL3_MT_SERVER_DONE;
-                *(p++)=0;
-                *(p++)=0;
-                *(p++)=0;
+                *(p++) = SSL3_MT_SERVER_DONE;
+                *(p++) = 0;
+                *(p++) = 0;
+                *(p++) = 0;
 
-                s->state=SSL3_ST_SW_SRVR_DONE_B;
+                s->state = SSL3_ST_SW_SRVR_DONE_B;
                 /* number of bytes to write */
-                s->init_num=4;
-                s->init_off=0;
-                }
+                s->init_num = 4;
+                s->init_off = 0;
+        }
 
         /* SSL3_ST_SW_SRVR_DONE_B */
-        return(ssl3_do_write(s,SSL3_RT_HANDSHAKE));
-        }
+        return (ssl3_do_write(s, SSL3_RT_HANDSHAKE));
+}
 
-int ssl3_send_server_key_exchange(SSL *s)
-        {
+int
+ssl3_send_server_key_exchange(SSL *s)
+{
 #ifndef OPENSSL_NO_RSA
         unsigned char *q;
-        int j,num;
+        int j, num;
         RSA *rsa;
-        unsigned char md_buf[MD5_DIGEST_LENGTH+SHA_DIGEST_LENGTH];
+        unsigned char md_buf[MD5_DIGEST_LENGTH + SHA_DIGEST_LENGTH];
         unsigned int u;
 #endif
 #ifndef OPENSSL_NO_DH
-        DH *dh=NULL,*dhp;
+        DH *dh = NULL, *dhp;
 #endif
 #ifndef OPENSSL_NO_ECDH
-        EC_KEY *ecdh=NULL, *ecdhp;
+        EC_KEY *ecdh = NULL, *ecdhp;
         unsigned char *encodedPoint = NULL;
         int encodedlen = 0;
         int curve_id = 0;
-        BN_CTX *bn_ctx = NULL; 
+        BN_CTX *bn_ctx = NULL;
+
 #endif
         EVP_PKEY *pkey;
         const EVP_MD *md = NULL;
-        unsigned char *p,*d;
-        int al,i;
+        unsigned char *p, *d;
+        int al, i;
         unsigned long type;
         int n;
         CERT *cert;
         BIGNUM *r[4];
-        int nr[4],kn;
+        int nr[4], kn;
         BUF_MEM *buf;
         EVP_MD_CTX md_ctx;
 
         EVP_MD_CTX_init(&md_ctx);
-        if (s->state == SSL3_ST_SW_KEY_EXCH_A)
-                {
-                type=s->s3->tmp.new_cipher->algorithm_mkey;
-                cert=s->cert;
+        if (s->state == SSL3_ST_SW_KEY_EXCH_A) {
+                type = s->s3->tmp.new_cipher->algorithm_mkey;
+                cert = s->cert;
 
-                buf=s->init_buf;
+                buf = s->init_buf;
 
-                r[0]=r[1]=r[2]=r[3]=NULL;
-                n=0;
+                r[0] = r[1] = r[2] = r[3] = NULL;
+                n = 0;
 #ifndef OPENSSL_NO_RSA
-                if (type & SSL_kRSA)
-                        {
-                        rsa=cert->rsa_tmp;
-                        if ((rsa == NULL) && (s->cert->rsa_tmp_cb != NULL))
-                                {
-                                rsa=s->cert->rsa_tmp_cb(s,
-                                      SSL_C_IS_EXPORT(s->s3->tmp.new_cipher),
-                                      SSL_C_EXPORT_PKEYLENGTH(s->s3->tmp.new_cipher));
-                                if(rsa == NULL)
-                                {
-                                        al=SSL_AD_HANDSHAKE_FAILURE;
-                                        SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE,SSL_R_ERROR_GENERATING_TMP_RSA_KEY);
+                if (type & SSL_kRSA) {
+                        rsa = cert->rsa_tmp;
+                        if ((rsa == NULL) && (s->cert->rsa_tmp_cb != NULL)) {
+                                rsa = s->cert->rsa_tmp_cb(s,
+                                SSL_C_IS_EXPORT(s->s3->tmp.new_cipher),
+                                SSL_C_EXPORT_PKEYLENGTH(s->s3->tmp.new_cipher));
+                                if (rsa == NULL) {
+                                        al = SSL_AD_HANDSHAKE_FAILURE;
+                                        SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE, SSL_R_ERROR_GENERATING_TMP_RSA_KEY);
                                         goto f_err;
                                 }
                                 RSA_up_ref(rsa);
-                                cert->rsa_tmp=rsa;
-                                }
-                        if (rsa == NULL)
-                                {
-                                al=SSL_AD_HANDSHAKE_FAILURE;
-                                SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE,SSL_R_MISSING_TMP_RSA_KEY);
+                                cert->rsa_tmp = rsa;
+                        }
+                        if (rsa == NULL) {
+                                al = SSL_AD_HANDSHAKE_FAILURE;
+                                SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE, SSL_R_MISSING_TMP_RSA_KEY);
                                 goto f_err;
-                                }
-                        r[0]=rsa->n;
-                        r[1]=rsa->e;
-                        s->s3->tmp.use_rsa_tmp=1;
                         }
-                else
+                        r[0] = rsa->n;
+                        r[1] = rsa->e;
+                        s->s3->tmp.use_rsa_tmp = 1;
+                } else
 #endif
 #ifndef OPENSSL_NO_DH
-                        if (type & SSL_kEDH)
-                        {
-                        dhp=cert->dh_tmp;
+                if (type & SSL_kEDH) {
+                        dhp = cert->dh_tmp;
                         if ((dhp == NULL) && (s->cert->dh_tmp_cb != NULL))
-                                dhp=s->cert->dh_tmp_cb(s,
-                                      SSL_C_IS_EXPORT(s->s3->tmp.new_cipher),
-                                      SSL_C_EXPORT_PKEYLENGTH(s->s3->tmp.new_cipher));
-                        if (dhp == NULL)
-                                {
-                                al=SSL_AD_HANDSHAKE_FAILURE;
-                                SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE,SSL_R_MISSING_TMP_DH_KEY);
+                                dhp = s->cert->dh_tmp_cb(s,
+                        SSL_C_IS_EXPORT(s->s3->tmp.new_cipher),
+                        SSL_C_EXPORT_PKEYLENGTH(s->s3->tmp.new_cipher));
+                        if (dhp == NULL) {
+                                al = SSL_AD_HANDSHAKE_FAILURE;
+                                SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE, SSL_R_MISSING_TMP_DH_KEY);
                                 goto f_err;
-                                }
+                        }
 
-                        if (s->s3->tmp.dh != NULL)
-                                {
+                        if (s->s3->tmp.dh != NULL) {
                                 SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE, ERR_R_INTERNAL_ERROR);
                                 goto err;
-                                }
+                        }
 
-                        if ((dh=DHparams_dup(dhp)) == NULL)
-                                {
-                                SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE,ERR_R_DH_LIB);
+                        if ((dh = DHparams_dup(dhp)) == NULL) {
+                                SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE, ERR_R_DH_LIB);
                                 goto err;
-                                }
+                        }
 
-                        s->s3->tmp.dh=dh;
-                        if ((dhp->pub_key == NULL ||
-                             dhp->priv_key == NULL ||
-                             (s->options & SSL_OP_SINGLE_DH_USE)))
-                                {
-                                if(!DH_generate_key(dh))
-                                    {
-                                    SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE,
-                                           ERR_R_DH_LIB);
-                                    goto err;
-                                    }
+                        s->s3->tmp.dh = dh;
+                        if ((dhp->pub_key == NULL || dhp->priv_key == NULL ||
+                            (s->options & SSL_OP_SINGLE_DH_USE))) {
+                                if (!DH_generate_key(dh)) {
+                                        SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE,
+                                        ERR_R_DH_LIB);
+                                        goto err;
                                 }
-                        else
-                                {
-                                dh->pub_key=BN_dup(dhp->pub_key);
-                                dh->priv_key=BN_dup(dhp->priv_key);
+                        } else {
+                                dh->pub_key = BN_dup(dhp->pub_key);
+                                dh->priv_key = BN_dup(dhp->priv_key);
                                 if ((dh->pub_key == NULL) ||
-                                        (dh->priv_key == NULL))
-                                        {
-                                        SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE,ERR_R_DH_LIB);
+                                        (dh->priv_key == NULL)) {
+                                        SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE, ERR_R_DH_LIB);
                                         goto err;
-                                        }
                                 }
-                        r[0]=dh->p;
-                        r[1]=dh->g;
-                        r[2]=dh->pub_key;
                         }
-                else 
+                        r[0] = dh->p;
+                        r[1] = dh->g;
+                        r[2] = dh->pub_key;
+                } else
 #endif
 #ifndef OPENSSL_NO_ECDH
-                        if (type & SSL_kEECDH)
-                        {
+                if (type & SSL_kEECDH) {
                         const EC_GROUP *group;
 
-                        ecdhp=cert->ecdh_tmp;
-                        if ((ecdhp == NULL) && (s->cert->ecdh_tmp_cb != NULL))
-                                {
-                                ecdhp=s->cert->ecdh_tmp_cb(s,
-                                      SSL_C_IS_EXPORT(s->s3->tmp.new_cipher),
-                                      SSL_C_EXPORT_PKEYLENGTH(s->s3->tmp.new_cipher));
-                                }
-                        if (ecdhp == NULL)
-                                {
-                                al=SSL_AD_HANDSHAKE_FAILURE;
-                                SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE,SSL_R_MISSING_TMP_ECDH_KEY);
+                        ecdhp = cert->ecdh_tmp;
+                        if ((ecdhp == NULL) && (s->cert->ecdh_tmp_cb != NULL)) {
+                                ecdhp = s->cert->ecdh_tmp_cb(
+                                    s, SSL_C_IS_EXPORT(s->s3->tmp.new_cipher),
+                                    SSL_C_EXPORT_PKEYLENGTH(s->s3->tmp.new_cipher));
+                        }
+                        if (ecdhp == NULL) {
+                                al = SSL_AD_HANDSHAKE_FAILURE;
+                                SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE, SSL_R_MISSING_TMP_ECDH_KEY);
                                 goto f_err;
-                                }
+                        }
 
-                        if (s->s3->tmp.ecdh != NULL)
-                                {
+                        if (s->s3->tmp.ecdh != NULL) {
                                 SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE, ERR_R_INTERNAL_ERROR);
                                 goto err;
-                                }
+                        }
 
                         /* Duplicate the ECDH structure. */
-                        if (ecdhp == NULL)
-                                {
-                                SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE,ERR_R_ECDH_LIB);
+                        if (ecdhp == NULL) {
+                                SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE, ERR_R_ECDH_LIB);
                                 goto err;
-                                }
-                        if ((ecdh = EC_KEY_dup(ecdhp)) == NULL)
-                                {
-                                SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE,ERR_R_ECDH_LIB);
+                        }
+                        if ((ecdh = EC_KEY_dup(ecdhp)) == NULL) {
+                                SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE, ERR_R_ECDH_LIB);
                                 goto err;
-                                }
+                        }
 
-                        s->s3->tmp.ecdh=ecdh;
+                        s->s3->tmp.ecdh = ecdh;
                         if ((EC_KEY_get0_public_key(ecdh) == NULL) ||
                             (EC_KEY_get0_private_key(ecdh) == NULL) ||
-                            (s->options & SSL_OP_SINGLE_ECDH_USE))
-                                {
-                                if(!EC_KEY_generate_key(ecdh))
-                                    {
-                                    SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE,ERR_R_ECDH_LIB);
-                                    goto err;
-                                    }
+                            (s->options & SSL_OP_SINGLE_ECDH_USE)) {
+                                if (!EC_KEY_generate_key(ecdh)) {
+                                        SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE, ERR_R_ECDH_LIB);
+                                        goto err;
                                 }
+                        }
 
                         if (((group = EC_KEY_get0_group(ecdh)) == NULL) ||
                             (EC_KEY_get0_public_key(ecdh)  == NULL) ||
-                            (EC_KEY_get0_private_key(ecdh) == NULL))
-                                {
-                                SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE,ERR_R_ECDH_LIB);
+                            (EC_KEY_get0_private_key(ecdh) == NULL)) {
+                                SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE, ERR_R_ECDH_LIB);
                                 goto err;
-                                }
+                        }
 
                         if (SSL_C_IS_EXPORT(s->s3->tmp.new_cipher) &&
-                            (EC_GROUP_get_degree(group) > 163)) 
-                                {
-                                SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE,SSL_R_ECGROUP_TOO_LARGE_FOR_CIPHER);
+                            (EC_GROUP_get_degree(group) > 163)) {
+                                SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE, SSL_R_ECGROUP_TOO_LARGE_FOR_CIPHER);
                                 goto err;
-                                }
+                        }
 
                         /* XXX: For now, we only support ephemeral ECDH
                          * keys over named (not generic) curves. For 
                          * supported named curves, curve_id is non-zero.
                          */
-                        if ((curve_id = 
-                            tls1_ec_nid2curve_id(EC_GROUP_get_curve_name(group)))
-                            == 0)
-                                {
-                                SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE,SSL_R_UNSUPPORTED_ELLIPTIC_CURVE);
+                        if ((curve_id = tls1_ec_nid2curve_id(
+                            EC_GROUP_get_curve_name(group))) == 0) {
+                                SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE, SSL_R_UNSUPPORTED_ELLIPTIC_CURVE);
                                 goto err;
-                                }
+                        }
 
                         /* Encode the public key.
                          * First check the size of encoding and
                          * allocate memory accordingly.
                          */
-                        encodedlen = EC_POINT_point2oct(group, 
-                            EC_KEY_get0_public_key(ecdh),
-                            POINT_CONVERSION_UNCOMPRESSED, 
-                            NULL, 0, NULL);
+                        encodedlen = EC_POINT_point2oct(group,
+                        EC_KEY_get0_public_key(ecdh),
+                        POINT_CONVERSION_UNCOMPRESSED,
+                        NULL, 0, NULL);
+
+                        encodedPoint = (unsigned char *)
+                        OPENSSL_malloc(encodedlen*sizeof(unsigned char));
 
-                        encodedPoint = (unsigned char *) 
-                            OPENSSL_malloc(encodedlen*sizeof(unsigned char)); 
                         bn_ctx = BN_CTX_new();
-                        if ((encodedPoint == NULL) || (bn_ctx == NULL))
-                                {
-                                SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE,ERR_R_MALLOC_FAILURE);
+                        if ((encodedPoint == NULL) || (bn_ctx == NULL)) {
+                                SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE, ERR_R_MALLOC_FAILURE);
                                 goto err;
-                                }
+                        }
 
 
-                        encodedlen = EC_POINT_point2oct(group, 
-                            EC_KEY_get0_public_key(ecdh), 
-                            POINT_CONVERSION_UNCOMPRESSED, 
-                            encodedPoint, encodedlen, bn_ctx);
+                        encodedlen = EC_POINT_point2oct(group,
+                        EC_KEY_get0_public_key(ecdh),
+                        POINT_CONVERSION_UNCOMPRESSED,
+                        encodedPoint, encodedlen, bn_ctx);
 
-                        if (encodedlen == 0) 
-                                {
-                                SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE,ERR_R_ECDH_LIB);
+                        if (encodedlen == 0) {
+                                SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE, ERR_R_ECDH_LIB);
                                 goto err;
-                                }
+                        }
 
-                        BN_CTX_free(bn_ctx);  bn_ctx=NULL;
+                        BN_CTX_free(bn_ctx);
+                        bn_ctx = NULL;
 
                         /* XXX: For now, we only support named (not 
                          * generic) curves in ECDH ephemeral key exchanges.
@@ -1792,98 +1689,80 @@ int ssl3_send_server_key_exchange(SSL *s)
                         /* We'll generate the serverKeyExchange message
                          * explicitly so we can set these to NULLs
                          */
-                        r[0]=NULL;
-                        r[1]=NULL;
-                        r[2]=NULL;
-                        r[3]=NULL;
-                        }
-                else 
+                        r[0] = NULL;
+                        r[1] = NULL;
+                        r[2] = NULL;
+                        r[3] = NULL;
+                } else
 #endif /* !OPENSSL_NO_ECDH */
 #ifndef OPENSSL_NO_PSK
-                        if (type & SSL_kPSK)
-                                {
-                                /* reserve size for record length and PSK identity hint*/
-                                n+=2+strlen(s->ctx->psk_identity_hint);
-                                }
-                        else
+                if (type & SSL_kPSK) {
+                        /* reserve size for record length and PSK identity hint*/
+                        n += 2 + strlen(s->ctx->psk_identity_hint);
+                } else
 #endif /* !OPENSSL_NO_PSK */
 #ifndef OPENSSL_NO_SRP
-                if (type & SSL_kSRP)
-                        {
-                        if ((s->srp_ctx.N == NULL) ||
-                                (s->srp_ctx.g == NULL) ||
-                                (s->srp_ctx.s == NULL) ||
-                                (s->srp_ctx.B == NULL))
-                                {
-                                SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE,SSL_R_MISSING_SRP_PARAM);
+                if (type & SSL_kSRP) {
+                        if ((s->srp_ctx.N == NULL) || (s->srp_ctx.g == NULL) ||
+                            (s->srp_ctx.s == NULL) || (s->srp_ctx.B == NULL)) {
+                                SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE, SSL_R_MISSING_SRP_PARAM);
                                 goto err;
-                                }
-                        r[0]=s->srp_ctx.N;
-                        r[1]=s->srp_ctx.g;
-                        r[2]=s->srp_ctx.s;
-                        r[3]=s->srp_ctx.B;
                         }
-                else 
+                        r[0] = s->srp_ctx.N;
+                        r[1] = s->srp_ctx.g;
+                        r[2] = s->srp_ctx.s;
+                        r[3] = s->srp_ctx.B;
+                } else
 #endif
-                        {
-                        al=SSL_AD_HANDSHAKE_FAILURE;
-                        SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE,SSL_R_UNKNOWN_KEY_EXCHANGE_TYPE);
+                {
+                        al = SSL_AD_HANDSHAKE_FAILURE;
+                        SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE, SSL_R_UNKNOWN_KEY_EXCHANGE_TYPE);
                         goto f_err;
-                        }
-                for (i=0; i < 4 && r[i] != NULL; i++)
-                        {
-                        nr[i]=BN_num_bytes(r[i]);
+                }
+                for (i = 0; i < 4 && r[i] != NULL; i++) {
+                        nr[i] = BN_num_bytes(r[i]);
 #ifndef OPENSSL_NO_SRP
                         if ((i == 2) && (type & SSL_kSRP))
-                                n+=1+nr[i];
+                                n += 1 + nr[i];
                         else
 #endif
-                        n+=2+nr[i];
-                        }
+                        n += 2 + nr[i];
+                }
 
-                if (!(s->s3->tmp.new_cipher->algorithm_auth & SSL_aNULL)
-                        && !(s->s3->tmp.new_cipher->algorithm_mkey & SSL_kPSK))
-                        {
-                        if ((pkey=ssl_get_sign_pkey(s,s->s3->tmp.new_cipher,&md))
-                                == NULL)
-                                {
-                                al=SSL_AD_DECODE_ERROR;
+                if (!(s->s3->tmp.new_cipher->algorithm_auth & SSL_aNULL) &&
+                    !(s->s3->tmp.new_cipher->algorithm_mkey & SSL_kPSK)) {
+                        if ((pkey = ssl_get_sign_pkey(
+                            s, s->s3->tmp.new_cipher, &md)) == NULL) {
+                                al = SSL_AD_DECODE_ERROR;
                                 goto f_err;
-                                }
-                        kn=EVP_PKEY_size(pkey);
-                        }
-                else
-                        {
-                        pkey=NULL;
-                        kn=0;
                         }
+                        kn = EVP_PKEY_size(pkey);
+                } else {
+                        pkey = NULL;
+                        kn = 0;
+                }
 
-                if (!BUF_MEM_grow_clean(buf,n+4+kn))
-                        {
-                        SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE,ERR_LIB_BUF);
+                if (!BUF_MEM_grow_clean(buf, n + 4 + kn)) {
+                        SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE, ERR_LIB_BUF);
                         goto err;
-                        }
-                d=(unsigned char *)s->init_buf->data;
-                p= &(d[4]);
+                }
+                d = (unsigned char *)s->init_buf->data;
+                p = &(d[4]);
 
-                for (i=0; i < 4 && r[i] != NULL; i++)
-                        {
+                for (i = 0; i < 4 && r[i] != NULL; i++) {
 #ifndef OPENSSL_NO_SRP
-                        if ((i == 2) && (type & SSL_kSRP))
-                                {
+                        if ((i == 2) && (type & SSL_kSRP)) {
                                 *p = nr[i];
                                 p++;
-                                }
-                        else
+                        } else
 #endif
-                        s2n(nr[i],p);
-                        BN_bn2bin(r[i],p);
-                        p+=nr[i];
-                        }
+                        s2n(nr[i], p);
+                        BN_bn2bin(r[i], p);
+                        p += nr[i];
+                }
 
 #ifndef OPENSSL_NO_ECDH
-                if (type & SSL_kEECDH) 
-                        {
+                if (type & SSL_kEECDH) {
                         /* XXX: For now, we only support named (not generic) curves.
                          * In this situation, the serverKeyExchange message has:
                          * [1 byte CurveType], [2 byte CurveName]
@@ -1898,236 +1777,220 @@ int ssl3_send_server_key_exchange(SSL *s)
                         p += 1;
                         *p = encodedlen;
                         p += 1;
-                        memcpy((unsigned char*)p, 
-                            (unsigned char *)encodedPoint, 
-                            encodedlen);
+                        memcpy((unsigned char*)p,
+                            (unsigned char *)encodedPoint, encodedlen);
                         OPENSSL_free(encodedPoint);
                         encodedPoint = NULL;
                         p += encodedlen;
-                        }
+                }
 #endif
 
 #ifndef OPENSSL_NO_PSK
-                if (type & SSL_kPSK)
-                        {
+                if (type & SSL_kPSK) {
                         /* copy PSK identity hint */
-                        s2n(strlen(s->ctx->psk_identity_hint), p); 
+                        s2n(strlen(s->ctx->psk_identity_hint), p);
+
                         strncpy((char *)p, s->ctx->psk_identity_hint, strlen(s->ctx->psk_identity_hint));
-                        p+=strlen(s->ctx->psk_identity_hint);
-                        }
+                        p += strlen(s->ctx->psk_identity_hint);
+                }
 #endif
 
                 /* not anonymous */
-                if (pkey != NULL)
-                        {
+                if (pkey != NULL) {
                         /* n is the length of the params, they start at &(d[4])
                          * and p points to the space at the end. */
 #ifndef OPENSSL_NO_RSA
                         if (pkey->type == EVP_PKEY_RSA
-                                        && TLS1_get_version(s) < TLS1_2_VERSION)
-                                {
-                                q=md_buf;
-                                j=0;
-                                for (num=2; num > 0; num--)
-                                        {
+                                && TLS1_get_version(s) < TLS1_2_VERSION) {
+                                q = md_buf;
+                                j = 0;
+                                for (num = 2; num > 0; num--) {
                                         EVP_MD_CTX_set_flags(&md_ctx,
-                                                EVP_MD_CTX_FLAG_NON_FIPS_ALLOW);
-                                        EVP_DigestInit_ex(&md_ctx,(num == 2)
-                                                ?s->ctx->md5:s->ctx->sha1, NULL);
-                                        EVP_DigestUpdate(&md_ctx,&(s->s3->client_random[0]),SSL3_RANDOM_SIZE);
-                                        EVP_DigestUpdate(&md_ctx,&(s->s3->server_random[0]),SSL3_RANDOM_SIZE);
-                                        EVP_DigestUpdate(&md_ctx,&(d[4]),n);
-                                        EVP_DigestFinal_ex(&md_ctx,q,
-                                                (unsigned int *)&i);
-                                        q+=i;
-                                        j+=i;
-                                        }
+                                        EVP_MD_CTX_FLAG_NON_FIPS_ALLOW);
+                                        EVP_DigestInit_ex(&md_ctx,
+                                            (num == 2) ? s->ctx->md5 : s->ctx->sha1, NULL);
+                                        EVP_DigestUpdate(&md_ctx, &(s->s3->client_random[0]), SSL3_RANDOM_SIZE);
+                                        EVP_DigestUpdate(&md_ctx, &(s->s3->server_random[0]), SSL3_RANDOM_SIZE);
+                                        EVP_DigestUpdate(&md_ctx, &(d[4]), n);
+                                        EVP_DigestFinal_ex(&md_ctx, q, (unsigned int *)&i);
+                                        q += i;
+                                        j += i;
+                                }
                                 if (RSA_sign(NID_md5_sha1, md_buf, j,
-                                        &(p[2]), &u, pkey->pkey.rsa) <= 0)
-                                        {
-                                        SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE,ERR_LIB_RSA);
+                                    &(p[2]), &u, pkey->pkey.rsa) <= 0) {
+                                        SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE, ERR_LIB_RSA);
                                         goto err;
-                                        }
-                                s2n(u,p);
-                                n+=u+2;
                                 }
-                        else
+                                s2n(u, p);
+                                n += u + 2;
+                        } else
 #endif
-                        if (md)
-                                {
+                        if (md) {
                                 /* For TLS1.2 and later send signature
                                  * algorithm */
-                                if (TLS1_get_version(s) >= TLS1_2_VERSION)
-                                        {
-                                        if (!tls12_get_sigandhash(p, pkey, md))
-                                                {
+                                if (TLS1_get_version(s) >= TLS1_2_VERSION) {
+                                        if (!tls12_get_sigandhash(p, pkey, md)) {
                                                 /* Should never happen */
-                                                al=SSL_AD_INTERNAL_ERROR;
-                                                SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE,ERR_R_INTERNAL_ERROR);
+                                                al = SSL_AD_INTERNAL_ERROR;
+                                                SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE, ERR_R_INTERNAL_ERROR);
                                                 goto f_err;
-                                                }
-                                        p+=2;
                                         }
+                                        p += 2;
+                                }
 #ifdef SSL_DEBUG
                                 fprintf(stderr, "Using hash %s\n",
-                                                        EVP_MD_name(md));
+                                EVP_MD_name(md));
 #endif
                                 EVP_SignInit_ex(&md_ctx, md, NULL);
-                                EVP_SignUpdate(&md_ctx,&(s->s3->client_random[0]),SSL3_RANDOM_SIZE);
-                                EVP_SignUpdate(&md_ctx,&(s->s3->server_random[0]),SSL3_RANDOM_SIZE);
-                                EVP_SignUpdate(&md_ctx,&(d[4]),n);
-                                if (!EVP_SignFinal(&md_ctx,&(p[2]),
-                                        (unsigned int *)&i,pkey))
-                                        {
-                                        SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE,ERR_LIB_EVP);
+                                EVP_SignUpdate(&md_ctx, &(s->s3->client_random[0]), SSL3_RANDOM_SIZE);
+                                EVP_SignUpdate(&md_ctx, &(s->s3->server_random[0]), SSL3_RANDOM_SIZE);
+                                EVP_SignUpdate(&md_ctx, &(d[4]), n);
+                                if (!EVP_SignFinal(&md_ctx, &(p[2]),
+                                        (unsigned int *)&i, pkey)) {
+                                        SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE, ERR_LIB_EVP);
                                         goto err;
-                                        }
-                                s2n(i,p);
-                                n+=i+2;
-                                if (TLS1_get_version(s) >= TLS1_2_VERSION)
-                                        n+= 2;
                                 }
-                        else
-                                {
+                                s2n(i, p);
+                                n += i + 2;
+                                if (TLS1_get_version(s) >= TLS1_2_VERSION)
+                                        n += 2;
+                        } else {
                                 /* Is this error check actually needed? */
-                                al=SSL_AD_HANDSHAKE_FAILURE;
-                                SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE,SSL_R_UNKNOWN_PKEY_TYPE);
+                                al = SSL_AD_HANDSHAKE_FAILURE;
+                                SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE, SSL_R_UNKNOWN_PKEY_TYPE);
                                 goto f_err;
-                                }
                         }
+                }
 
-                *(d++)=SSL3_MT_SERVER_KEY_EXCHANGE;
-                l2n3(n,d);
+                *(d++) = SSL3_MT_SERVER_KEY_EXCHANGE;
+                l2n3(n, d);
 
                 /* we should now have things packed up, so lets send
                  * it off */
-                s->init_num=n+4;
-                s->init_off=0;
-                }
+                s->init_num = n + 4;
+                s->init_off = 0;
+        }
 
         s->state = SSL3_ST_SW_KEY_EXCH_B;
         EVP_MD_CTX_cleanup(&md_ctx);
-        return(ssl3_do_write(s,SSL3_RT_HANDSHAKE));
+        return (ssl3_do_write(s, SSL3_RT_HANDSHAKE));
 f_err:
-        ssl3_send_alert(s,SSL3_AL_FATAL,al);
+        ssl3_send_alert(s, SSL3_AL_FATAL, al);
 err:
 #ifndef OPENSSL_NO_ECDH
-        if (encodedPoint != NULL) OPENSSL_free(encodedPoint);
+        if (encodedPoint != NULL)
+                OPENSSL_free(encodedPoint);
         BN_CTX_free(bn_ctx);
 #endif
         EVP_MD_CTX_cleanup(&md_ctx);
-        return(-1);
-        }
+        return (-1);
+}
 
-int ssl3_send_certificate_request(SSL *s)
-        {
-        unsigned char *p,*d;
-        int i,j,nl,off,n;
-        STACK_OF(X509_NAME) *sk=NULL;
+int
+ssl3_send_certificate_request(SSL *s)
+{
+        unsigned char *p, *d;
+        int i, j, nl, off, n;
+        STACK_OF(X509_NAME) *sk = NULL;
         X509_NAME *name;
         BUF_MEM *buf;
 
-        if (s->state == SSL3_ST_SW_CERT_REQ_A)
-                {
-                buf=s->init_buf;
+        if (s->state == SSL3_ST_SW_CERT_REQ_A) {
+                buf = s->init_buf;
 
-                d=p=(unsigned char *)&(buf->data[4]);
+                d = p = (unsigned char *)&(buf->data[4]);
 
                 /* get the list of acceptable cert types */
                 p++;
-                n=ssl3_get_req_cert_type(s,p);
-                d[0]=n;
-                p+=n;
+                n = ssl3_get_req_cert_type(s, p);
+                d[0] = n;
+                p += n;
                 n++;
 
-                if (TLS1_get_version(s) >= TLS1_2_VERSION)
-                        {
+                if (TLS1_get_version(s) >= TLS1_2_VERSION) {
                         nl = tls12_get_req_sig_algs(s, p + 2);
                         s2n(nl, p);
                         p += nl + 2;
                         n += nl + 2;
-                        }
-
-                off=n;
-                p+=2;
-                n+=2;
+                }
 
-                sk=SSL_get_client_CA_list(s);
-                nl=0;
-                if (sk != NULL)
-                        {
-                        for (i=0; i<sk_X509_NAME_num(sk); i++)
-                                {
-                                name=sk_X509_NAME_value(sk,i);
-                                j=i2d_X509_NAME(name,NULL);
-                                if (!BUF_MEM_grow_clean(buf,4+n+j+2))
-                                        {
-                                        SSLerr(SSL_F_SSL3_SEND_CERTIFICATE_REQUEST,ERR_R_BUF_LIB);
+                off = n;
+                p += 2;
+                n += 2;
+
+                sk = SSL_get_client_CA_list(s);
+                nl = 0;
+                if (sk != NULL) {
+                        for (i = 0; i < sk_X509_NAME_num(sk); i++) {
+                                name = sk_X509_NAME_value(sk, i);
+                                j = i2d_X509_NAME(name, NULL);
+                                if (!BUF_MEM_grow_clean(buf, 4 + n + j + 2)) {
+                                        SSLerr(SSL_F_SSL3_SEND_CERTIFICATE_REQUEST, ERR_R_BUF_LIB);
                                         goto err;
-                                        }
-                                p=(unsigned char *)&(buf->data[4+n]);
-                                if (!(s->options & SSL_OP_NETSCAPE_CA_DN_BUG))
-                                        {
-                                        s2n(j,p);
-                                        i2d_X509_NAME(name,&p);
-                                        n+=2+j;
-                                        nl+=2+j;
-                                        }
-                                else
-                                        {
-                                        d=p;
-                                        i2d_X509_NAME(name,&p);
-                                        j-=2; s2n(j,d); j+=2;
-                                        n+=j;
-                                        nl+=j;
-                                        }
+                                }
+                                p = (unsigned char *)&(buf->data[4 + n]);
+                                if (!(s->options & SSL_OP_NETSCAPE_CA_DN_BUG)) {
+                                        s2n(j, p);
+                                        i2d_X509_NAME(name, &p);
+                                        n += 2 + j;
+                                        nl += 2 + j;
+                                } else {
+                                        d = p;
+                                        i2d_X509_NAME(name, &p);
+                                        j -= 2;
+                                        s2n(j, d);
+                                        j += 2;
+                                        n += j;
+                                        nl += j;
                                 }
                         }
+                }
                 /* else no CA names */
-                p=(unsigned char *)&(buf->data[4+off]);
-                s2n(nl,p);
+                p = (unsigned char *)&(buf->data[4 + off]);
+                s2n(nl, p);
 
-                d=(unsigned char *)buf->data;
-                *(d++)=SSL3_MT_CERTIFICATE_REQUEST;
-                l2n3(n,d);
+                d = (unsigned char *)buf->data;
+                *(d++) = SSL3_MT_CERTIFICATE_REQUEST;
+                l2n3(n, d);
 
                 /* we should now have things packed up, so lets send
                  * it off */
 
-                s->init_num=n+4;
-                s->init_off=0;
+                s->init_num = n + 4;
+                s->init_off = 0;
 #ifdef NETSCAPE_HANG_BUG
-                p=(unsigned char *)s->init_buf->data + s->init_num;
+                p = (unsigned char *)s->init_buf->data + s->init_num;
 
                 /* do the header */
-                *(p++)=SSL3_MT_SERVER_DONE;
-                *(p++)=0;
-                *(p++)=0;
-                *(p++)=0;
+                *(p++) = SSL3_MT_SERVER_DONE;
+                *(p++) = 0;
+                *(p++) = 0;
+                *(p++) = 0;
                 s->init_num += 4;
 #endif
 
                 s->state = SSL3_ST_SW_CERT_REQ_B;
-                }
+        }
 
         /* SSL3_ST_SW_CERT_REQ_B */
-        return(ssl3_do_write(s,SSL3_RT_HANDSHAKE));
+        return (ssl3_do_write(s, SSL3_RT_HANDSHAKE));
 err:
-        return(-1);
-        }
+        return (-1);
+}
 
-int ssl3_get_client_key_exchange(SSL *s)
-        {
-        int i,al,ok;
+int
+ssl3_get_client_key_exchange(SSL *s)
+{
+        int i, al, ok;
         long n;
         unsigned long alg_k;
         unsigned char *p;
 #ifndef OPENSSL_NO_RSA
-        RSA *rsa=NULL;
-        EVP_PKEY *pkey=NULL;
+        RSA *rsa = NULL;
+        EVP_PKEY *pkey = NULL;
 #endif
 #ifndef OPENSSL_NO_DH
-        BIGNUM *pub=NULL;
+        BIGNUM *pub = NULL;
         DH *dh_srvr;
 #endif
 #ifndef OPENSSL_NO_KRB5
@@ -2138,83 +2001,67 @@ int ssl3_get_client_key_exchange(SSL *s)
         EC_KEY *srvr_ecdh = NULL;
         EVP_PKEY *clnt_pub_pkey = NULL;
         EC_POINT *clnt_ecpoint = NULL;
-        BN_CTX *bn_ctx = NULL; 
-#endif
+        BN_CTX *bn_ctx = NULL;
 
-        n=s->method->ssl_get_message(s,
-                SSL3_ST_SR_KEY_EXCH_A,
-                SSL3_ST_SR_KEY_EXCH_B,
-                SSL3_MT_CLIENT_KEY_EXCHANGE,
-                2048, /* ??? */
-                &ok);
+#endif
 
-        if (!ok) return((int)n);
-        p=(unsigned char *)s->init_msg;
+        n = s->method->ssl_get_message(s, SSL3_ST_SR_KEY_EXCH_A,
+            SSL3_ST_SR_KEY_EXCH_B, SSL3_MT_CLIENT_KEY_EXCHANGE,
+            2048, /* ??? */ &ok);
+        if (!ok)
+                return ((int)n);
+        p = (unsigned char *)s->init_msg;
 
-        alg_k=s->s3->tmp.new_cipher->algorithm_mkey;
+        alg_k = s->s3->tmp.new_cipher->algorithm_mkey;
 
 #ifndef OPENSSL_NO_RSA
-        if (alg_k & SSL_kRSA)
-                {
+        if (alg_k & SSL_kRSA) {
                 /* FIX THIS UP EAY EAY EAY EAY */
-                if (s->s3->tmp.use_rsa_tmp)
-                        {
+                if (s->s3->tmp.use_rsa_tmp) {
                         if ((s->cert != NULL) && (s->cert->rsa_tmp != NULL))
-                                rsa=s->cert->rsa_tmp;
+                                rsa = s->cert->rsa_tmp;
                         /* Don't do a callback because rsa_tmp should
                          * be sent already */
-                        if (rsa == NULL)
-                                {
-                                al=SSL_AD_HANDSHAKE_FAILURE;
-                                SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,SSL_R_MISSING_TMP_RSA_PKEY);
+                        if (rsa == NULL) {
+                                al = SSL_AD_HANDSHAKE_FAILURE;
+                                SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE, SSL_R_MISSING_TMP_RSA_PKEY);
                                 goto f_err;
 
-                                }
                         }
-                else
-                        {
-                        pkey=s->cert->pkeys[SSL_PKEY_RSA_ENC].privatekey;
-                        if (    (pkey == NULL) ||
-                                (pkey->type != EVP_PKEY_RSA) ||
-                                (pkey->pkey.rsa == NULL))
-                                {
-                                al=SSL_AD_HANDSHAKE_FAILURE;
-                                SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,SSL_R_MISSING_RSA_CERTIFICATE);
+                } else {
+                        pkey = s->cert->pkeys[SSL_PKEY_RSA_ENC].privatekey;
+                        if ((pkey == NULL) || (pkey->type != EVP_PKEY_RSA) ||
+                            (pkey->pkey.rsa == NULL)) {
+                                al = SSL_AD_HANDSHAKE_FAILURE;
+                                SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE, SSL_R_MISSING_RSA_CERTIFICATE);
                                 goto f_err;
-                                }
-                        rsa=pkey->pkey.rsa;
                         }
+                        rsa = pkey->pkey.rsa;
+                }
 
                 /* TLS and [incidentally] DTLS{0xFEFF} */
-                if (s->version > SSL3_VERSION && s->version != DTLS1_BAD_VER)
-                        {
-                        n2s(p,i);
-                        if (n != i+2)
-                                {
-                                if (!(s->options & SSL_OP_TLS_D5_BUG))
-                                        {
-                                        SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,SSL_R_TLS_RSA_ENCRYPTED_VALUE_LENGTH_IS_WRONG);
+                if (s->version > SSL3_VERSION && s->version != DTLS1_BAD_VER) {
+                        n2s(p, i);
+                        if (n != i + 2) {
+                                if (!(s->options & SSL_OP_TLS_D5_BUG)) {
+                                        SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE, SSL_R_TLS_RSA_ENCRYPTED_VALUE_LENGTH_IS_WRONG);
                                         goto err;
-                                        }
-                                else
-                                        p-=2;
-                                }
-                        else
-                                n=i;
-                        }
+                                } else
+                                        p -= 2;
+                        } else
+                                n = i;
+                }
 
-                i=RSA_private_decrypt((int)n,p,p,rsa,RSA_PKCS1_PADDING);
+                i = RSA_private_decrypt((int)n, p, p, rsa, RSA_PKCS1_PADDING);
 
                 al = -1;
-                
-                if (i != SSL_MAX_MASTER_KEY_LENGTH)
-                        {
-                        al=SSL_AD_DECODE_ERROR;
+
+                if (i != SSL_MAX_MASTER_KEY_LENGTH) {
+                        al = SSL_AD_DECODE_ERROR;
                         /* SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,SSL_R_BAD_RSA_DECRYPT); */
-                        }
+                }
 
-                if ((al == -1) && !((p[0] == (s->client_version>>8)) && (p[1] == (s->client_version & 0xff))))
-                        {
+                if ((al == -1) && !((p[0] == (s->client_version >> 8)) && (p[1] == (s->client_version & 0xff)))) {
                         /* The premaster secret must contain the same version number as the
                          * ClientHello to detect version rollback attacks (strangely, the
                          * protocol does not offer such protection for DH ciphersuites).
@@ -2223,9 +2070,8 @@ int ssl3_get_client_key_exchange(SSL *s)
                          * protocol version.
                          * If SSL_OP_TLS_ROLLBACK_BUG is set, tolerate such clients. */
                         if (!((s->options & SSL_OP_TLS_ROLLBACK_BUG) &&
-                                (p[0] == (s->version>>8)) && (p[1] == (s->version & 0xff))))
-                                {
-                                al=SSL_AD_DECODE_ERROR;
+                                (p[0] == (s->version >> 8)) && (p[1] == (s->version & 0xff)))) {
+                                al = SSL_AD_DECODE_ERROR;
                                 /* SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,SSL_R_BAD_PROTOCOL_VERSION_NUMBER); */
 
                                 /* The Klima-Pokorny-Rosa extension of Bleichenbacher's attack
@@ -2235,11 +2081,10 @@ int ssl3_get_client_key_exchange(SSL *s)
                                  * made up by the adversary is properly formatted except
                                  * that the version number is wrong.  To avoid such attacks,
                                  * we should treat this just like any other decryption error. */
-                                }
                         }
+                }
 
-                if (al != -1)
-                        {
+                if (al != -1) {
                         /* Some decryption failure -- use random value instead as countermeasure
                          * against Bleichenbacher's attack on PKCS #1 v1.5 RSA padding
                          * (see RFC 2246, section 7.4.7.1). */
@@ -2249,83 +2094,69 @@ int ssl3_get_client_key_exchange(SSL *s)
                         p[1] = s->client_version & 0xff;
                         if (RAND_pseudo_bytes(p+2, i-2) <= 0) /* should be RAND_bytes, but we cannot work around a failure */
                                 goto err;
-                        }
-        
-                s->session->master_key_length=
-                        s->method->ssl3_enc->generate_master_secret(s,
-                                s->session->master_key,
-                                p,i);
-                OPENSSL_cleanse(p,i);
                 }
-        else
+
+                s->session->master_key_length =
+                s->method->ssl3_enc->generate_master_secret(s,
+                s->session->master_key,
+                p, i);
+                OPENSSL_cleanse(p, i);
+        } else
 #endif
 #ifndef OPENSSL_NO_DH
-                if (alg_k & (SSL_kEDH|SSL_kDHr|SSL_kDHd))
-                {
-                n2s(p,i);
-                if (n != i+2)
-                        {
-                        if (!(s->options & SSL_OP_SSLEAY_080_CLIENT_DH_BUG))
-                                {
-                                SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,SSL_R_DH_PUBLIC_VALUE_LENGTH_IS_WRONG);
+        if (alg_k & (SSL_kEDH|SSL_kDHr|SSL_kDHd)) {
+                n2s(p, i);
+                if (n != i + 2) {
+                        if (!(s->options & SSL_OP_SSLEAY_080_CLIENT_DH_BUG)) {
+                                SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE, SSL_R_DH_PUBLIC_VALUE_LENGTH_IS_WRONG);
                                 goto err;
-                                }
-                        else
-                                {
-                                p-=2;
-                                i=(int)n;
-                                }
+                        } else {
+                                p -= 2;
+                                i = (int)n;
                         }
+                }
 
                 if (n == 0L) /* the parameters are in the cert */
-                        {
-                        al=SSL_AD_HANDSHAKE_FAILURE;
-                        SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,SSL_R_UNABLE_TO_DECODE_DH_CERTS);
+                {
+                        al = SSL_AD_HANDSHAKE_FAILURE;
+                        SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE, SSL_R_UNABLE_TO_DECODE_DH_CERTS);
                         goto f_err;
-                        }
-                else
-                        {
-                        if (s->s3->tmp.dh == NULL)
-                                {
-                                al=SSL_AD_HANDSHAKE_FAILURE;
-                                SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,SSL_R_MISSING_TMP_DH_KEY);
+                } else {
+                        if (s->s3->tmp.dh == NULL) {
+                                al = SSL_AD_HANDSHAKE_FAILURE;
+                                SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE, SSL_R_MISSING_TMP_DH_KEY);
                                 goto f_err;
-                                }
-                        else
-                                dh_srvr=s->s3->tmp.dh;
-                        }
+                        } else
+                                dh_srvr = s->s3->tmp.dh;
+                }
 
-                pub=BN_bin2bn(p,i,NULL);
-                if (pub == NULL)
-                        {
-                        SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,SSL_R_BN_LIB);
+                pub = BN_bin2bn(p, i, NULL);
+                if (pub == NULL) {
+                        SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE, SSL_R_BN_LIB);
                         goto err;
-                        }
+                }
 
-                i=DH_compute_key(p,pub,dh_srvr);
+                i = DH_compute_key(p, pub, dh_srvr);
 
-                if (i <= 0)
-                        {
-                        SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,ERR_R_DH_LIB);
+                if (i <= 0) {
+                        SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE, ERR_R_DH_LIB);
                         BN_clear_free(pub);
                         goto err;
-                        }
+                }
 
                 DH_free(s->s3->tmp.dh);
-                s->s3->tmp.dh=NULL;
+                s->s3->tmp.dh = NULL;
 
                 BN_clear_free(pub);
-                pub=NULL;
-                s->session->master_key_length=
-                        s->method->ssl3_enc->generate_master_secret(s,
-                                s->session->master_key,p,i);
-                OPENSSL_cleanse(p,i);
-                }
-        else
+                pub = NULL;
+                s->session->master_key_length =
+                    s->method->ssl3_enc->generate_master_secret(
+                        s, s->session->master_key, p, i);
+                OPENSSL_cleanse(p, i);
+        } else
 #endif
 #ifndef OPENSSL_NO_KRB5
-        if (alg_k & SSL_kKRB5)
-                {
+        if (alg_k & SSL_kKRB5) {
                 krb5_error_code         krb5rc;
                 krb5_data               enc_ticket;
                 krb5_data               authenticator;
@@ -2335,100 +2166,94 @@ int ssl3_get_client_key_exchange(SSL *s)
                 const EVP_CIPHER        *enc = NULL;
                 unsigned char           iv[EVP_MAX_IV_LENGTH];
                 unsigned char           pms[SSL_MAX_MASTER_KEY_LENGTH
-                                               + EVP_MAX_BLOCK_LENGTH];
+                + EVP_MAX_BLOCK_LENGTH];
                 int                  padl, outl;
                 krb5_timestamp          authtime = 0;
                 krb5_ticket_times       ttimes;
 
                 EVP_CIPHER_CTX_init(&ciph_ctx);
 
-                if (!kssl_ctx)  kssl_ctx = kssl_ctx_new();
+                if (!kssl_ctx)
+                        kssl_ctx = kssl_ctx_new();
 
-                n2s(p,i);
+                n2s(p, i);
                 enc_ticket.length = i;
 
-                if (n < (long)(enc_ticket.length + 6))
-                        {
+                if (n < (long)(enc_ticket.length + 6)) {
                         SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,
-                                SSL_R_DATA_LENGTH_TOO_LONG);
+                        SSL_R_DATA_LENGTH_TOO_LONG);
                         goto err;
-                        }
+                }
 
                 enc_ticket.data = (char *)p;
-                p+=enc_ticket.length;
+                p += enc_ticket.length;
 
-                n2s(p,i);
+                n2s(p, i);
                 authenticator.length = i;
 
-                if (n < (long)(enc_ticket.length + authenticator.length + 6))
-                        {
+                if (n < (long)(enc_ticket.length + authenticator.length + 6)) {
                         SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,
-                                SSL_R_DATA_LENGTH_TOO_LONG);
+                        SSL_R_DATA_LENGTH_TOO_LONG);
                         goto err;
-                        }
+                }
 
                 authenticator.data = (char *)p;
-                p+=authenticator.length;
+                p += authenticator.length;
 
-                n2s(p,i);
+                n2s(p, i);
                 enc_pms.length = i;
                 enc_pms.data = (char *)p;
-                p+=enc_pms.length;
+                p += enc_pms.length;
 
                 /* Note that the length is checked again below,
                 ** after decryption
                 */
-                if(enc_pms.length > sizeof pms)
-                        {
+                if (enc_pms.length > sizeof pms) {
                         SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,
-                               SSL_R_DATA_LENGTH_TOO_LONG);
+                        SSL_R_DATA_LENGTH_TOO_LONG);
                         goto err;
-                        }
+                }
 
                 if (n != (long)(enc_ticket.length + authenticator.length +
-                                                enc_pms.length + 6))
-                        {
+                    enc_pms.length + 6)) {
                         SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,
-                                SSL_R_DATA_LENGTH_TOO_LONG);
+                        SSL_R_DATA_LENGTH_TOO_LONG);
                         goto err;
-                        }
+                }
 
                 if ((krb5rc = kssl_sget_tkt(kssl_ctx, &enc_ticket, &ttimes,
-                                        &kssl_err)) != 0)
-                        {
+                    &kssl_err)) != 0) {
 #ifdef KSSL_DEBUG
                         printf("kssl_sget_tkt rtn %d [%d]\n",
-                                krb5rc, kssl_err.reason);
+                        krb5rc, kssl_err.reason);
                         if (kssl_err.text)
                                 printf("kssl_err text= %s\n", kssl_err.text);
 #endif  /* KSSL_DEBUG */
                         SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,
-                                kssl_err.reason);
+                        kssl_err.reason);
                         goto err;
-                        }
+                }
 
                 /*  Note: no authenticator is not considered an error,
                 **  but will return authtime == 0.
                 */
                 if ((krb5rc = kssl_check_authent(kssl_ctx, &authenticator,
-                                        &authtime, &kssl_err)) != 0)
-                        {
+                    &authtime, &kssl_err)) != 0) {
 #ifdef KSSL_DEBUG
                         printf("kssl_check_authent rtn %d [%d]\n",
-                                krb5rc, kssl_err.reason);
+                        krb5rc, kssl_err.reason);
                         if (kssl_err.text)
                                 printf("kssl_err text= %s\n", kssl_err.text);
 #endif  /* KSSL_DEBUG */
                         SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,
-                                kssl_err.reason);
+                        kssl_err.reason);
                         goto err;
-                        }
+                }
 
-                if ((krb5rc = kssl_validate_times(authtime, &ttimes)) != 0)
-                        {
+                if ((krb5rc = kssl_validate_times(authtime, &ttimes)) != 0) {
                         SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE, krb5rc);
                         goto err;
-                        }
+                }
 
 #ifdef KSSL_DEBUG
                 kssl_ctx_show(kssl_ctx);
@@ -2436,44 +2261,38 @@ int ssl3_get_client_key_exchange(SSL *s)
 
                 enc = kssl_map_enc(kssl_ctx->enctype);
                 if (enc == NULL)
-                    goto err;
+                        goto err;
 
                 memset(iv, 0, sizeof iv);       /* per RFC 1510 */
 
-                if (!EVP_DecryptInit_ex(&ciph_ctx,enc,NULL,kssl_ctx->key,iv))
-                        {
+                if (!EVP_DecryptInit_ex(&ciph_ctx, enc, NULL, kssl_ctx->key, iv)) {
                         SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,
-                                SSL_R_DECRYPTION_FAILED);
+                        SSL_R_DECRYPTION_FAILED);
                         goto err;
-                        }
-                if (!EVP_DecryptUpdate(&ciph_ctx, pms,&outl,
-                                        (unsigned char *)enc_pms.data, enc_pms.length))
-                        {
+                }
+                if (!EVP_DecryptUpdate(&ciph_ctx, pms, &outl,
+                    (unsigned char *)enc_pms.data, enc_pms.length)) {
                         SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,
-                                SSL_R_DECRYPTION_FAILED);
+                        SSL_R_DECRYPTION_FAILED);
                         goto err;
-                        }
-                if (outl > SSL_MAX_MASTER_KEY_LENGTH)
-                        {
+                }
+                if (outl > SSL_MAX_MASTER_KEY_LENGTH) {
                         SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,
-                                SSL_R_DATA_LENGTH_TOO_LONG);
+                        SSL_R_DATA_LENGTH_TOO_LONG);
                         goto err;
-                        }
-                if (!EVP_DecryptFinal_ex(&ciph_ctx,&(pms[outl]),&padl))
-                        {
+                }
+                if (!EVP_DecryptFinal_ex(&ciph_ctx, &(pms[outl]), &padl)) {
                         SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,
-                                SSL_R_DECRYPTION_FAILED);
+                        SSL_R_DECRYPTION_FAILED);
                         goto err;
-                        }
+                }
                 outl += padl;
-                if (outl > SSL_MAX_MASTER_KEY_LENGTH)
-                        {
+                if (outl > SSL_MAX_MASTER_KEY_LENGTH) {
                         SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,
-                                SSL_R_DATA_LENGTH_TOO_LONG);
+                        SSL_R_DATA_LENGTH_TOO_LONG);
                         goto err;
-                        }
-                if (!((pms[0] == (s->client_version>>8)) && (pms[1] == (s->client_version & 0xff))))
-                    {
+                }
+                if (!((pms[0] == (s->client_version >> 8)) && (pms[1] == (s->client_version & 0xff)))) {
                     /* The premaster secret must contain the same version number as the
                      * ClientHello to detect version rollback attacks (strangely, the
                      * protocol does not offer such protection for DH ciphersuites).
@@ -2482,29 +2301,26 @@ int ssl3_get_client_key_exchange(SSL *s)
                      * If SSL_OP_TLS_ROLLBACK_BUG is set, tolerate such clients. 
                      * (Perhaps we should have a separate BUG value for the Kerberos cipher)
                      */
-                    if (!(s->options & SSL_OP_TLS_ROLLBACK_BUG))
-                        {
-                        SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,
-                               SSL_AD_DECODE_ERROR);
-                        goto err;
+                        if (!(s->options & SSL_OP_TLS_ROLLBACK_BUG)) {
+                                SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,
+                                SSL_AD_DECODE_ERROR);
+                                goto err;
                         }
-                    }
+                }
 
                 EVP_CIPHER_CTX_cleanup(&ciph_ctx);
 
-                s->session->master_key_length=
-                        s->method->ssl3_enc->generate_master_secret(s,
-                                s->session->master_key, pms, outl);
+                s->session->master_key_length =
+                s->method->ssl3_enc->generate_master_secret(s,
+                s->session->master_key, pms, outl);
 
-                if (kssl_ctx->client_princ)
-                        {
+                if (kssl_ctx->client_princ) {
                         size_t len = strlen(kssl_ctx->client_princ);
-                        if ( len < SSL_MAX_KRB5_PRINCIPAL_LENGTH ) 
-                                {
+                        if (len < SSL_MAX_KRB5_PRINCIPAL_LENGTH ) {
                                 s->session->krb5_client_princ_len = len;
-                                memcpy(s->session->krb5_client_princ,kssl_ctx->client_princ,len);
-                                }
+                                memcpy(s->session->krb5_client_princ, kssl_ctx->client_princ, len);
                         }
+                }
 
 
                 /*  Was doing kssl_ctx_free() here,
@@ -2512,13 +2328,11 @@ int ssl3_get_client_key_exchange(SSL *s)
                 **  kssl_ctx = kssl_ctx_free(kssl_ctx);
                 **  if (s->kssl_ctx)  s->kssl_ctx = NULL;
                 */
-                }
-        else
+        } else
 #endif  /* OPENSSL_NO_KRB5 */
 
 #ifndef OPENSSL_NO_ECDH
-                if (alg_k & (SSL_kEECDH|SSL_kECDHr|SSL_kECDHe))
-                {
+        if (alg_k & (SSL_kEECDH|SSL_kECDHr|SSL_kECDHe)) {
                 int ret = 1;
                 int field_size = 0;
                 const EC_KEY   *tkey;
@@ -2526,60 +2340,51 @@ int ssl3_get_client_key_exchange(SSL *s)
                 const BIGNUM *priv_key;
 
                 /* initialize structures for server's ECDH key pair */
-                if ((srvr_ecdh = EC_KEY_new()) == NULL) 
-                        {
+                if ((srvr_ecdh = EC_KEY_new()) == NULL) {
                         SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,
-                            ERR_R_MALLOC_FAILURE);
+                        ERR_R_MALLOC_FAILURE);
                         goto err;
-                        }
+                }
 
                 /* Let's get server private key and group information */
-                if (alg_k & (SSL_kECDHr|SSL_kECDHe))
-                        { 
+                if (alg_k & (SSL_kECDHr|SSL_kECDHe)) {
                         /* use the certificate */
                         tkey = s->cert->pkeys[SSL_PKEY_ECC].privatekey->pkey.ec;
-                        }
-                else
-                        {
+                } else {
                         /* use the ephermeral values we saved when
                          * generating the ServerKeyExchange msg.
                          */
                         tkey = s->s3->tmp.ecdh;
-                        }
+                }
 
-                group    = EC_KEY_get0_group(tkey);
+                group = EC_KEY_get0_group(tkey);
                 priv_key = EC_KEY_get0_private_key(tkey);
 
                 if (!EC_KEY_set_group(srvr_ecdh, group) ||
-                    !EC_KEY_set_private_key(srvr_ecdh, priv_key))
-                        {
+                        !EC_KEY_set_private_key(srvr_ecdh, priv_key)) {
                         SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,
-                               ERR_R_EC_LIB);
+                        ERR_R_EC_LIB);
                         goto err;
-                        }
+                }
 
                 /* Let's get client's public key */
-                if ((clnt_ecpoint = EC_POINT_new(group)) == NULL)
-                        {
+                if ((clnt_ecpoint = EC_POINT_new(group)) == NULL) {
                         SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,
-                            ERR_R_MALLOC_FAILURE);
+                        ERR_R_MALLOC_FAILURE);
                         goto err;
-                        }
+                }
 
-                if (n == 0L) 
-                        {
+                if (n == 0L) {
                         /* Client Publickey was in Client Certificate */
 
-                         if (alg_k & SSL_kEECDH)
-                                 {
-                                 al=SSL_AD_HANDSHAKE_FAILURE;
-                                 SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,SSL_R_MISSING_TMP_ECDH_KEY);
-                                 goto f_err;
-                                 }
-                        if (((clnt_pub_pkey=X509_get_pubkey(s->session->peer))
-                            == NULL) || 
-                            (clnt_pub_pkey->type != EVP_PKEY_EC))
-                                {
+                        if (alg_k & SSL_kEECDH) {
+                                al = SSL_AD_HANDSHAKE_FAILURE;
+                                SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE, SSL_R_MISSING_TMP_ECDH_KEY);
+                                goto f_err;
+                        }
+                        if (((clnt_pub_pkey = X509_get_pubkey(
+                            s->session->peer)) == NULL) ||
+                            (clnt_pub_pkey->type != EVP_PKEY_EC)) {
                                 /* XXX: For now, we do not support client
                                  * authentication using ECDH certificates
                                  * so this branch (n == 0L) of the code is
@@ -2591,771 +2396,680 @@ int ssl3_get_client_key_exchange(SSL *s)
                                  * the two ECDH shares are for the same
                                  * group.
                                  */
-                                al=SSL_AD_HANDSHAKE_FAILURE;
-                                SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,
-                                    SSL_R_UNABLE_TO_DECODE_ECDH_CERTS);
-                                goto f_err;
-                                }
+                                al = SSL_AD_HANDSHAKE_FAILURE;
+                                SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,
+                                SSL_R_UNABLE_TO_DECODE_ECDH_CERTS);
+                                goto f_err;
+                        }
 
                         if (EC_POINT_copy(clnt_ecpoint,
-                            EC_KEY_get0_public_key(clnt_pub_pkey->pkey.ec)) == 0)
-                                {
+                                EC_KEY_get0_public_key(clnt_pub_pkey->pkey.ec)) == 0) {
                                 SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,
-                                        ERR_R_EC_LIB);
+                                ERR_R_EC_LIB);
                                 goto err;
-                                }
-                        ret = 2; /* Skip certificate verify processing */
                         }
-                else
-                        {
+                        ret = 2; /* Skip certificate verify processing */
+                } else {
                         /* Get client's public key from encoded point
                          * in the ClientKeyExchange message.
                          */
-                        if ((bn_ctx = BN_CTX_new()) == NULL)
-                                {
+                        if ((bn_ctx = BN_CTX_new()) == NULL) {
                                 SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,
-                                    ERR_R_MALLOC_FAILURE);
+                                ERR_R_MALLOC_FAILURE);
                                 goto err;
-                                }
+                        }
 
                         /* Get encoded point length */
-                        i = *p; 
+                        i = *p;
+
                         p += 1;
-                        if (n != 1 + i)
-                                {
+                        if (n != 1 + i) {
                                 SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,
-                                    ERR_R_EC_LIB);
+                                ERR_R_EC_LIB);
                                 goto err;
-                                }
-                        if (EC_POINT_oct2point(group, 
-                            clnt_ecpoint, p, i, bn_ctx) == 0)
-                                {
+                        }
+                        if (EC_POINT_oct2point(group,
+                                clnt_ecpoint, p, i, bn_ctx) == 0) {
                                 SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,
-                                    ERR_R_EC_LIB);
+                                ERR_R_EC_LIB);
                                 goto err;
-                                }
+                        }
                         /* p is pointing to somewhere in the buffer
                          * currently, so set it to the start 
                          */ 
-                        p=(unsigned char *)s->init_buf->data;
-                        }
+                        p = (unsigned char *)s->init_buf->data;
+                }
 
                 /* Compute the shared pre-master secret */
                 field_size = EC_GROUP_get_degree(group);
-                if (field_size <= 0)
-                        {
-                        SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE, 
-                               ERR_R_ECDH_LIB);
+                if (field_size <= 0) {
+                        SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,
+                        ERR_R_ECDH_LIB);
                         goto err;
-                        }
-                i = ECDH_compute_key(p, (field_size+7)/8, clnt_ecpoint, srvr_ecdh, NULL);
-                if (i <= 0)
-                        {
+                }
+                i = ECDH_compute_key(p, (field_size + 7)/8, clnt_ecpoint, srvr_ecdh, NULL);
+                if (i <= 0) {
                         SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,
-                            ERR_R_ECDH_LIB);
+                        ERR_R_ECDH_LIB);
                         goto err;
-                        }
+                }
 
                 EVP_PKEY_free(clnt_pub_pkey);
                 EC_POINT_free(clnt_ecpoint);
                 EC_KEY_free(srvr_ecdh);
                 BN_CTX_free(bn_ctx);
                 EC_KEY_free(s->s3->tmp.ecdh);
-                s->s3->tmp.ecdh = NULL; 
+                s->s3->tmp.ecdh = NULL;
+
 
                 /* Compute the master secret */
                 s->session->master_key_length = s->method->ssl3_enc-> \
                     generate_master_secret(s, s->session->master_key, p, i);
-                
+
                 OPENSSL_cleanse(p, i);
                 return (ret);
-                }
-        else
+        } else
 #endif
 #ifndef OPENSSL_NO_PSK
-                if (alg_k & SSL_kPSK)
-                        {
-                        unsigned char *t = NULL;
-                        unsigned char psk_or_pre_ms[PSK_MAX_PSK_LEN*2+4];
-                        unsigned int pre_ms_len = 0, psk_len = 0;
-                        int psk_err = 1;
-                        char tmp_id[PSK_MAX_IDENTITY_LEN+1];
+        if (alg_k & SSL_kPSK) {
+                unsigned char *t = NULL;
+                unsigned char psk_or_pre_ms[PSK_MAX_PSK_LEN*2 + 4];
+                unsigned int pre_ms_len = 0, psk_len = 0;
+                int psk_err = 1;
+                char tmp_id[PSK_MAX_IDENTITY_LEN + 1];
 
-                        al=SSL_AD_HANDSHAKE_FAILURE;
-
-                        n2s(p,i);
-                        if (n != i+2)
-                                {
-                                SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,
-                                        SSL_R_LENGTH_MISMATCH);
-                                goto psk_err;
-                                }
-                        if (i > PSK_MAX_IDENTITY_LEN)
-                                {
-                                SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,
-                                        SSL_R_DATA_LENGTH_TOO_LONG);
-                                goto psk_err;
-                                }
-                        if (s->psk_server_callback == NULL)
-                                {
-                                SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,
-                                       SSL_R_PSK_NO_SERVER_CB);
-                                goto psk_err;
-                                }
+                al = SSL_AD_HANDSHAKE_FAILURE;
 
-                        /* Create guaranteed NULL-terminated identity
-                         * string for the callback */
-                        memcpy(tmp_id, p, i);
-                        memset(tmp_id+i, 0, PSK_MAX_IDENTITY_LEN+1-i);
-                        psk_len = s->psk_server_callback(s, tmp_id,
-                                psk_or_pre_ms, sizeof(psk_or_pre_ms));
-                        OPENSSL_cleanse(tmp_id, PSK_MAX_IDENTITY_LEN+1);
+                n2s(p, i);
+                if (n != i + 2) {
+                        SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,
+                        SSL_R_LENGTH_MISMATCH);
+                        goto psk_err;
+                }
+                if (i > PSK_MAX_IDENTITY_LEN) {
+                        SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,
+                        SSL_R_DATA_LENGTH_TOO_LONG);
+                        goto psk_err;
+                }
+                if (s->psk_server_callback == NULL) {
+                        SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,
+                        SSL_R_PSK_NO_SERVER_CB);
+                        goto psk_err;
+                }
 
-                        if (psk_len > PSK_MAX_PSK_LEN)
-                                {
-                                SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,
-                                        ERR_R_INTERNAL_ERROR);
-                                goto psk_err;
-                                }
-                        else if (psk_len == 0)
-                                {
-                                /* PSK related to the given identity not found */
-                                SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,
-                                       SSL_R_PSK_IDENTITY_NOT_FOUND);
-                                al=SSL_AD_UNKNOWN_PSK_IDENTITY;
-                                goto psk_err;
-                                }
+                /* Create guaranteed NULL-terminated identity
+                 * string for the callback */
+                memcpy(tmp_id, p, i);
+                memset(tmp_id + i, 0, PSK_MAX_IDENTITY_LEN + 1 - i);
+                psk_len = s->psk_server_callback(s, tmp_id,
+                psk_or_pre_ms, sizeof(psk_or_pre_ms));
+                OPENSSL_cleanse(tmp_id, PSK_MAX_IDENTITY_LEN + 1);
 
-                        /* create PSK pre_master_secret */
-                        pre_ms_len=2+psk_len+2+psk_len;
-                        t = psk_or_pre_ms;
-                        memmove(psk_or_pre_ms+psk_len+4, psk_or_pre_ms, psk_len);
-                        s2n(psk_len, t);
-                        memset(t, 0, psk_len);
-                        t+=psk_len;
-                        s2n(psk_len, t);
-
-                        if (s->session->psk_identity != NULL)
-                                OPENSSL_free(s->session->psk_identity);
-                        s->session->psk_identity = BUF_strdup((char *)p);
-                        if (s->session->psk_identity == NULL)
-                                {
-                                SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,
-                                        ERR_R_MALLOC_FAILURE);
-                                goto psk_err;
-                                }
+                if (psk_len > PSK_MAX_PSK_LEN) {
+                        SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,
+                        ERR_R_INTERNAL_ERROR);
+                        goto psk_err;
+                } else if (psk_len == 0) {
+                        /* PSK related to the given identity not found */
+                        SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,
+                        SSL_R_PSK_IDENTITY_NOT_FOUND);
+                        al = SSL_AD_UNKNOWN_PSK_IDENTITY;
+                        goto psk_err;
+                }
+
+                /* create PSK pre_master_secret */
+                pre_ms_len = 2 + psk_len + 2 + psk_len;
+                t = psk_or_pre_ms;
+                memmove(psk_or_pre_ms + psk_len + 4, psk_or_pre_ms, psk_len);
+                s2n(psk_len, t);
+                memset(t, 0, psk_len);
+                t += psk_len;
+                s2n(psk_len, t);
+
+                if (s->session->psk_identity != NULL)
+                        OPENSSL_free(s->session->psk_identity);
+                s->session->psk_identity = BUF_strdup((char *)p);
+                if (s->session->psk_identity == NULL) {
+                        SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,
+                        ERR_R_MALLOC_FAILURE);
+                        goto psk_err;
+                }
 
-                        if (s->session->psk_identity_hint != NULL)
-                                OPENSSL_free(s->session->psk_identity_hint);
-                        s->session->psk_identity_hint = BUF_strdup(s->ctx->psk_identity_hint);
-                        if (s->ctx->psk_identity_hint != NULL &&
-                                s->session->psk_identity_hint == NULL)
-                                {
-                                SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,
-                                        ERR_R_MALLOC_FAILURE);
-                                goto psk_err;
-                                }
+                if (s->session->psk_identity_hint != NULL)
+                        OPENSSL_free(s->session->psk_identity_hint);
+                s->session->psk_identity_hint = BUF_strdup(s->ctx->psk_identity_hint);
+                if (s->ctx->psk_identity_hint != NULL &&
+                        s->session->psk_identity_hint == NULL) {
+                        SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,
+                        ERR_R_MALLOC_FAILURE);
+                        goto psk_err;
+                }
 
-                        s->session->master_key_length=
-                                s->method->ssl3_enc->generate_master_secret(s,
-                                        s->session->master_key, psk_or_pre_ms, pre_ms_len);
-                        psk_err = 0;
+                s->session->master_key_length =
+                    s->method->ssl3_enc->generate_master_secret(
+                        s, s->session->master_key, psk_or_pre_ms, pre_ms_len);
+                psk_err = 0;
                 psk_err:
-                        OPENSSL_cleanse(psk_or_pre_ms, sizeof(psk_or_pre_ms));
-                        if (psk_err != 0)
-                                goto f_err;
-                        }
-                else
+                OPENSSL_cleanse(psk_or_pre_ms, sizeof(psk_or_pre_ms));
+                if (psk_err != 0)
+                        goto f_err;
+        } else
 #endif
 #ifndef OPENSSL_NO_SRP
-                if (alg_k & SSL_kSRP)
-                        {
-                        int param_len;
-
-                        n2s(p,i);
-                        param_len=i+2;
-                        if (param_len > n)
-                                {
-                                al=SSL_AD_DECODE_ERROR;
-                                SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,SSL_R_BAD_SRP_A_LENGTH);
-                                goto f_err;
-                                }
-                        if (!(s->srp_ctx.A=BN_bin2bn(p,i,NULL)))
-                                {
-                                SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,ERR_R_BN_LIB);
-                                goto err;
-                                }
-                        if (s->session->srp_username != NULL)
-                                OPENSSL_free(s->session->srp_username);
-                        s->session->srp_username = BUF_strdup(s->srp_ctx.login);
-                        if (s->session->srp_username == NULL)
-                                {
-                                SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,
-                                        ERR_R_MALLOC_FAILURE);
-                                goto err;
-                                }
+        if (alg_k & SSL_kSRP) {
+                int param_len;
 
-                        if ((s->session->master_key_length = SRP_generate_server_master_secret(s,s->session->master_key))<0)
-                                {
-                                SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,ERR_R_INTERNAL_ERROR);
-                                goto err;
-                                }
+                n2s(p, i);
+                param_len = i + 2;
+                if (param_len > n) {
+                        al = SSL_AD_DECODE_ERROR;
+                        SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE, SSL_R_BAD_SRP_A_LENGTH);
+                        goto f_err;
+                }
+                if (!(s->srp_ctx.A = BN_bin2bn(p, i, NULL))) {
+                        SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE, ERR_R_BN_LIB);
+                        goto err;
+                }
+                if (s->session->srp_username != NULL)
+                        OPENSSL_free(s->session->srp_username);
+                s->session->srp_username = BUF_strdup(s->srp_ctx.login);
+                if (s->session->srp_username == NULL) {
+                        SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,
+                        ERR_R_MALLOC_FAILURE);
+                        goto err;
+                }
 
-                        p+=i;
-                        }
-                else
+                if ((s->session->master_key_length = SRP_generate_server_master_secret(s, s->session->master_key)) < 0) {
+                        SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE, ERR_R_INTERNAL_ERROR);
+                        goto err;
+                }
+
+                p += i;
+        } else
 #endif  /* OPENSSL_NO_SRP */
-                if (alg_k & SSL_kGOST) 
-                        {
-                        int ret = 0;
-                        EVP_PKEY_CTX *pkey_ctx;
-                        EVP_PKEY *client_pub_pkey = NULL, *pk = NULL;
-                        unsigned char premaster_secret[32], *start;
-                        size_t outlen=32, inlen;
-                        unsigned long alg_a;
-
-                        /* Get our certificate private key*/
-                        alg_a = s->s3->tmp.new_cipher->algorithm_auth;
-                        if (alg_a & SSL_aGOST94)
-                                pk = s->cert->pkeys[SSL_PKEY_GOST94].privatekey;
-                        else if (alg_a & SSL_aGOST01)
-                                pk = s->cert->pkeys[SSL_PKEY_GOST01].privatekey;
-
-                        pkey_ctx = EVP_PKEY_CTX_new(pk,NULL);
-                        EVP_PKEY_decrypt_init(pkey_ctx);
+        if (alg_k & SSL_kGOST) {
+                int ret = 0;
+                EVP_PKEY_CTX *pkey_ctx;
+                EVP_PKEY *client_pub_pkey = NULL, *pk = NULL;
+                unsigned char premaster_secret[32], *start;
+                size_t outlen = 32, inlen;
+                unsigned long alg_a;
+
+                /* Get our certificate private key*/
+                alg_a = s->s3->tmp.new_cipher->algorithm_auth;
+                if (alg_a & SSL_aGOST94)
+                        pk = s->cert->pkeys[SSL_PKEY_GOST94].privatekey;
+                else if (alg_a & SSL_aGOST01)
+                        pk = s->cert->pkeys[SSL_PKEY_GOST01].privatekey;
+
+                pkey_ctx = EVP_PKEY_CTX_new(pk, NULL);
+                EVP_PKEY_decrypt_init(pkey_ctx);
                         /* If client certificate is present and is of the same type, maybe
                          * use it for key exchange.  Don't mind errors from
                          * EVP_PKEY_derive_set_peer, because it is completely valid to use
                          * a client certificate for authorization only. */
-                        client_pub_pkey = X509_get_pubkey(s->session->peer);
-                        if (client_pub_pkey)
-                                {
-                                if (EVP_PKEY_derive_set_peer(pkey_ctx, client_pub_pkey) <= 0)
-                                        ERR_clear_error();
-                                }
-                        /* Decrypt session key */
-                        if ((*p!=( V_ASN1_SEQUENCE| V_ASN1_CONSTRUCTED))) 
-                                {
-                                SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,SSL_R_DECRYPTION_FAILED);
-                                goto gerr;
-                                }
-                        if (p[1] == 0x81)
-                                {
-                                start = p+3;
-                                inlen = p[2];
-                                }
-                        else if (p[1] < 0x80)
-                                {
-                                start = p+2;
-                                inlen = p[1];
-                                }
-                        else
-                                {
-                                SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,SSL_R_DECRYPTION_FAILED);
-                                goto gerr;
-                                }
-                        if (EVP_PKEY_decrypt(pkey_ctx,premaster_secret,&outlen,start,inlen) <=0) 
-
-                                {
-                                SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,SSL_R_DECRYPTION_FAILED);
-                                goto gerr;
-                                }
-                        /* Generate master secret */
-                        s->session->master_key_length=
-                                s->method->ssl3_enc->generate_master_secret(s,
-                                        s->session->master_key,premaster_secret,32);
-                        /* Check if pubkey from client certificate was used */
-                        if (EVP_PKEY_CTX_ctrl(pkey_ctx, -1, -1, EVP_PKEY_CTRL_PEER_KEY, 2, NULL) > 0)
-                                ret = 2;
-                        else
-                                ret = 1;
+                client_pub_pkey = X509_get_pubkey(s->session->peer);
+                if (client_pub_pkey) {
+                        if (EVP_PKEY_derive_set_peer(pkey_ctx, client_pub_pkey) <= 0)
+                                ERR_clear_error();
+                }
+                /* Decrypt session key */
+                if ((*p != ( V_ASN1_SEQUENCE| V_ASN1_CONSTRUCTED))) {
+                        SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE, SSL_R_DECRYPTION_FAILED);
+                        goto gerr;
+                }
+                if (p[1] == 0x81) {
+                        start = p + 3;
+                        inlen = p[2];
+                } else if (p[1] < 0x80) {
+                        start = p + 2;
+                        inlen = p[1];
+                } else {
+                        SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE, SSL_R_DECRYPTION_FAILED);
+                        goto gerr;
+                }
+                if (EVP_PKEY_decrypt(pkey_ctx, premaster_secret, &outlen, start, inlen) <=0)
+
+                {
+                        SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE, SSL_R_DECRYPTION_FAILED);
+                        goto gerr;
+                }
+                /* Generate master secret */
+                s->session->master_key_length =
+                    s->method->ssl3_enc->generate_master_secret(
+                        s, s->session->master_key, premaster_secret, 32);
+                /* Check if pubkey from client certificate was used */
+                if (EVP_PKEY_CTX_ctrl(pkey_ctx, -1, -1, EVP_PKEY_CTRL_PEER_KEY, 2, NULL) > 0)
+                        ret = 2;
+                else
+                        ret = 1;
                 gerr:
-                        EVP_PKEY_free(client_pub_pkey);
-                        EVP_PKEY_CTX_free(pkey_ctx);
-                        if (ret)
-                                return ret;
-                        else
-                                goto err;
-                        }
+                EVP_PKEY_free(client_pub_pkey);
+                EVP_PKEY_CTX_free(pkey_ctx);
+                if (ret)
+                        return ret;
                 else
-                {
-                al=SSL_AD_HANDSHAKE_FAILURE;
+                        goto err;
+        } else {
+                al = SSL_AD_HANDSHAKE_FAILURE;
                 SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,
-                                SSL_R_UNKNOWN_CIPHER_TYPE);
+                SSL_R_UNKNOWN_CIPHER_TYPE);
                 goto f_err;
-                }
+        }
 
-        return(1);
+        return (1);
 f_err:
-        ssl3_send_alert(s,SSL3_AL_FATAL,al);
+        ssl3_send_alert(s, SSL3_AL_FATAL, al);
 #if !defined(OPENSSL_NO_DH) || !defined(OPENSSL_NO_RSA) || !defined(OPENSSL_NO_ECDH) || defined(OPENSSL_NO_SRP)
 err:
 #endif
 #ifndef OPENSSL_NO_ECDH
         EVP_PKEY_free(clnt_pub_pkey);
         EC_POINT_free(clnt_ecpoint);
-        if (srvr_ecdh != NULL) 
+        if (srvr_ecdh != NULL)
                 EC_KEY_free(srvr_ecdh);
         BN_CTX_free(bn_ctx);
 #endif
-        return(-1);
-        }
+        return (-1);
+}
 
-int ssl3_get_cert_verify(SSL *s)
-        {
-        EVP_PKEY *pkey=NULL;
+int
+ssl3_get_cert_verify(SSL *s)
+{
+        EVP_PKEY *pkey = NULL;
         unsigned char *p;
-        int al,ok,ret=0;
+        int al, ok, ret = 0;
         long n;
-        int type=0,i,j;
+        int type = 0, i, j;
         X509 *peer;
         const EVP_MD *md = NULL;
         EVP_MD_CTX mctx;
         EVP_MD_CTX_init(&mctx);
 
-        n=s->method->ssl_get_message(s,
-                SSL3_ST_SR_CERT_VRFY_A,
-                SSL3_ST_SR_CERT_VRFY_B,
-                -1,
-                516, /* Enough for 4096 bit RSA key with TLS v1.2 */
-                &ok);
-
-        if (!ok) return((int)n);
-
-        if (s->session->peer != NULL)
-                {
-                peer=s->session->peer;
-                pkey=X509_get_pubkey(peer);
-                type=X509_certificate_type(peer,pkey);
-                }
-        else
-                {
-                peer=NULL;
-                pkey=NULL;
-                }
+        n = s->method->ssl_get_message(s, SSL3_ST_SR_CERT_VRFY_A,
+            SSL3_ST_SR_CERT_VRFY_B, -1,
+            516, /* Enough for 4096 bit RSA key with TLS v1.2 */ &ok);
+        if (!ok)
+                return ((int)n);
+
+        if (s->session->peer != NULL) {
+                peer = s->session->peer;
+                pkey = X509_get_pubkey(peer);
+                type = X509_certificate_type(peer, pkey);
+        } else {
+                peer = NULL;
+                pkey = NULL;
+        }
 
-        if (s->s3->tmp.message_type != SSL3_MT_CERTIFICATE_VERIFY)
-                {
-                s->s3->tmp.reuse_message=1;
-                if ((peer != NULL) && (type & EVP_PKT_SIGN))
-                        {
-                        al=SSL_AD_UNEXPECTED_MESSAGE;
-                        SSLerr(SSL_F_SSL3_GET_CERT_VERIFY,SSL_R_MISSING_VERIFY_MESSAGE);
+        if (s->s3->tmp.message_type != SSL3_MT_CERTIFICATE_VERIFY) {
+                s->s3->tmp.reuse_message = 1;
+                if ((peer != NULL) && (type & EVP_PKT_SIGN)) {
+                        al = SSL_AD_UNEXPECTED_MESSAGE;
+                        SSLerr(SSL_F_SSL3_GET_CERT_VERIFY, SSL_R_MISSING_VERIFY_MESSAGE);
                         goto f_err;
-                        }
-                ret=1;
-                goto end;
                 }
+                ret = 1;
+                goto end;
+        }
 
-        if (peer == NULL)
-                {
-                SSLerr(SSL_F_SSL3_GET_CERT_VERIFY,SSL_R_NO_CLIENT_CERT_RECEIVED);
-                al=SSL_AD_UNEXPECTED_MESSAGE;
+        if (peer == NULL) {
+                SSLerr(SSL_F_SSL3_GET_CERT_VERIFY, SSL_R_NO_CLIENT_CERT_RECEIVED);
+                al = SSL_AD_UNEXPECTED_MESSAGE;
                 goto f_err;
-                }
+        }
 
-        if (!(type & EVP_PKT_SIGN))
-                {
-                SSLerr(SSL_F_SSL3_GET_CERT_VERIFY,SSL_R_SIGNATURE_FOR_NON_SIGNING_CERTIFICATE);
-                al=SSL_AD_ILLEGAL_PARAMETER;
+        if (!(type & EVP_PKT_SIGN)) {
+                SSLerr(SSL_F_SSL3_GET_CERT_VERIFY, SSL_R_SIGNATURE_FOR_NON_SIGNING_CERTIFICATE);
+                al = SSL_AD_ILLEGAL_PARAMETER;
                 goto f_err;
-                }
+        }
 
-        if (s->s3->change_cipher_spec)
-                {
-                SSLerr(SSL_F_SSL3_GET_CERT_VERIFY,SSL_R_CCS_RECEIVED_EARLY);
-                al=SSL_AD_UNEXPECTED_MESSAGE;
+        if (s->s3->change_cipher_spec) {
+                SSLerr(SSL_F_SSL3_GET_CERT_VERIFY, SSL_R_CCS_RECEIVED_EARLY);
+                al = SSL_AD_UNEXPECTED_MESSAGE;
                 goto f_err;
-                }
+        }
 
         /* we now have a signature that we need to verify */
-        p=(unsigned char *)s->init_msg;
+        p = (unsigned char *)s->init_msg;
         /* Check for broken implementations of GOST ciphersuites */
         /* If key is GOST and n is exactly 64, it is bare
          * signature without length field */
-        if (n==64 && (pkey->type==NID_id_GostR3410_94 ||
-                pkey->type == NID_id_GostR3410_2001) )
-                {
-                i=64;
-                } 
-        else 
-                {       
-                if (TLS1_get_version(s) >= TLS1_2_VERSION)
-                        {
+        if (n == 64 && (pkey->type == NID_id_GostR3410_94 ||
+            pkey->type == NID_id_GostR3410_2001) ) {
+                i = 64;
+        } else {
+                if (TLS1_get_version(s) >= TLS1_2_VERSION) {
                         int sigalg = tls12_get_sigid(pkey);
                         /* Should never happen */
-                        if (sigalg == -1)
-                                {
-                                SSLerr(SSL_F_SSL3_GET_CERT_VERIFY,ERR_R_INTERNAL_ERROR);
-                                al=SSL_AD_INTERNAL_ERROR;
+                        if (sigalg == -1) {
+                                SSLerr(SSL_F_SSL3_GET_CERT_VERIFY, ERR_R_INTERNAL_ERROR);
+                                al = SSL_AD_INTERNAL_ERROR;
                                 goto f_err;
-                                }
+                        }
                         /* Check key type is consistent with signature */
-                        if (sigalg != (int)p[1])
-                                {
-                                SSLerr(SSL_F_SSL3_GET_CERT_VERIFY,SSL_R_WRONG_SIGNATURE_TYPE);
-                                al=SSL_AD_DECODE_ERROR;
+                        if (sigalg != (int)p[1]) {
+                                SSLerr(SSL_F_SSL3_GET_CERT_VERIFY, SSL_R_WRONG_SIGNATURE_TYPE);
+                                al = SSL_AD_DECODE_ERROR;
                                 goto f_err;
-                                }
+                        }
                         md = tls12_get_hash(p[0]);
-                        if (md == NULL)
-                                {
-                                SSLerr(SSL_F_SSL3_GET_CERT_VERIFY,SSL_R_UNKNOWN_DIGEST);
-                                al=SSL_AD_DECODE_ERROR;
+                        if (md == NULL) {
+                                SSLerr(SSL_F_SSL3_GET_CERT_VERIFY, SSL_R_UNKNOWN_DIGEST);
+                                al = SSL_AD_DECODE_ERROR;
                                 goto f_err;
-                                }
+                        }
 #ifdef SSL_DEBUG
-fprintf(stderr, "USING TLSv1.2 HASH %s\n", EVP_MD_name(md));
+                        fprintf(stderr, "USING TLSv1.2 HASH %s\n", EVP_MD_name(md));
 #endif
                         p += 2;
                         n -= 2;
-                        }
-                n2s(p,i);
-                n-=2;
-                if (i > n)
-                        {
-                        SSLerr(SSL_F_SSL3_GET_CERT_VERIFY,SSL_R_LENGTH_MISMATCH);
-                        al=SSL_AD_DECODE_ERROR;
+                }
+                n2s(p, i);
+                n -= 2;
+                if (i > n) {
+                        SSLerr(SSL_F_SSL3_GET_CERT_VERIFY, SSL_R_LENGTH_MISMATCH);
+                        al = SSL_AD_DECODE_ERROR;
                         goto f_err;
-                        }
-        }
-        j=EVP_PKEY_size(pkey);
-        if ((i > j) || (n > j) || (n <= 0))
-                {
-                SSLerr(SSL_F_SSL3_GET_CERT_VERIFY,SSL_R_WRONG_SIGNATURE_SIZE);
-                al=SSL_AD_DECODE_ERROR;
-                goto f_err;
                 }
+        }
+        j = EVP_PKEY_size(pkey);
+        if ((i > j) || (n > j) || (n <= 0)) {
+                SSLerr(SSL_F_SSL3_GET_CERT_VERIFY, SSL_R_WRONG_SIGNATURE_SIZE);
+                al = SSL_AD_DECODE_ERROR;
+                goto f_err;
+        }
 
-        if (TLS1_get_version(s) >= TLS1_2_VERSION)
-                {
+        if (TLS1_get_version(s) >= TLS1_2_VERSION) {
                 long hdatalen = 0;
                 void *hdata;
                 hdatalen = BIO_get_mem_data(s->s3->handshake_buffer, &hdata);
-                if (hdatalen <= 0)
-                        {
+                if (hdatalen <= 0) {
                         SSLerr(SSL_F_SSL3_GET_CERT_VERIFY, ERR_R_INTERNAL_ERROR);
-                        al=SSL_AD_INTERNAL_ERROR;
+                        al = SSL_AD_INTERNAL_ERROR;
                         goto f_err;
-                        }
+                }
 #ifdef SSL_DEBUG
                 fprintf(stderr, "Using TLS 1.2 with client verify alg %s\n",
-                                                        EVP_MD_name(md));
+                EVP_MD_name(md));
 #endif
-                if (!EVP_VerifyInit_ex(&mctx, md, NULL)
-                        || !EVP_VerifyUpdate(&mctx, hdata, hdatalen))
-                        {
+                if (!EVP_VerifyInit_ex(&mctx, md, NULL) ||
+                    !EVP_VerifyUpdate(&mctx, hdata, hdatalen)) {
                         SSLerr(SSL_F_SSL3_GET_CERT_VERIFY, ERR_R_EVP_LIB);
-                        al=SSL_AD_INTERNAL_ERROR;
+                        al = SSL_AD_INTERNAL_ERROR;
                         goto f_err;
-                        }
+                }
 
-                if (EVP_VerifyFinal(&mctx, p , i, pkey) <= 0)
-                        {
-                        al=SSL_AD_DECRYPT_ERROR;
-                        SSLerr(SSL_F_SSL3_GET_CERT_VERIFY,SSL_R_BAD_SIGNATURE);
+                if (EVP_VerifyFinal(&mctx, p , i, pkey) <= 0) {
+                        al = SSL_AD_DECRYPT_ERROR;
+                        SSLerr(SSL_F_SSL3_GET_CERT_VERIFY, SSL_R_BAD_SIGNATURE);
                         goto f_err;
-                        }
                 }
-        else
+        } else
 #ifndef OPENSSL_NO_RSA 
-        if (pkey->type == EVP_PKEY_RSA)
-                {
-                i=RSA_verify(NID_md5_sha1, s->s3->tmp.cert_verify_md,
-                        MD5_DIGEST_LENGTH+SHA_DIGEST_LENGTH, p, i, 
-                                                        pkey->pkey.rsa);
-                if (i < 0)
-                        {
-                        al=SSL_AD_DECRYPT_ERROR;
-                        SSLerr(SSL_F_SSL3_GET_CERT_VERIFY,SSL_R_BAD_RSA_DECRYPT);
+        if (pkey->type == EVP_PKEY_RSA) {
+                i = RSA_verify(NID_md5_sha1, s->s3->tmp.cert_verify_md,
+                MD5_DIGEST_LENGTH + SHA_DIGEST_LENGTH, p, i,
+                pkey->pkey.rsa);
+                if (i < 0) {
+                        al = SSL_AD_DECRYPT_ERROR;
+                        SSLerr(SSL_F_SSL3_GET_CERT_VERIFY, SSL_R_BAD_RSA_DECRYPT);
                         goto f_err;
-                        }
-                if (i == 0)
-                        {
-                        al=SSL_AD_DECRYPT_ERROR;
-                        SSLerr(SSL_F_SSL3_GET_CERT_VERIFY,SSL_R_BAD_RSA_SIGNATURE);
+                }
+                if (i == 0) {
+                        al = SSL_AD_DECRYPT_ERROR;
+                        SSLerr(SSL_F_SSL3_GET_CERT_VERIFY, SSL_R_BAD_RSA_SIGNATURE);
                         goto f_err;
-                        }
                 }
-        else
+        } else
 #endif
 #ifndef OPENSSL_NO_DSA
-                if (pkey->type == EVP_PKEY_DSA)
-                {
-                j=DSA_verify(pkey->save_type,
-                        &(s->s3->tmp.cert_verify_md[MD5_DIGEST_LENGTH]),
-                        SHA_DIGEST_LENGTH,p,i,pkey->pkey.dsa);
-                if (j <= 0)
-                        {
+        if (pkey->type == EVP_PKEY_DSA) {
+                j = DSA_verify(pkey->save_type,
+                &(s->s3->tmp.cert_verify_md[MD5_DIGEST_LENGTH]),
+                SHA_DIGEST_LENGTH, p, i, pkey->pkey.dsa);
+                if (j <= 0) {
                         /* bad signature */
-                        al=SSL_AD_DECRYPT_ERROR;
-                        SSLerr(SSL_F_SSL3_GET_CERT_VERIFY,SSL_R_BAD_DSA_SIGNATURE);
+                        al = SSL_AD_DECRYPT_ERROR;
+                        SSLerr(SSL_F_SSL3_GET_CERT_VERIFY, SSL_R_BAD_DSA_SIGNATURE);
                         goto f_err;
-                        }
                 }
-        else
+        } else
 #endif
 #ifndef OPENSSL_NO_ECDSA
-                if (pkey->type == EVP_PKEY_EC)
-                {
-                j=ECDSA_verify(pkey->save_type,
-                        &(s->s3->tmp.cert_verify_md[MD5_DIGEST_LENGTH]),
-                        SHA_DIGEST_LENGTH,p,i,pkey->pkey.ec);
-                if (j <= 0)
-                        {
+        if (pkey->type == EVP_PKEY_EC) {
+                j = ECDSA_verify(pkey->save_type,
+                    &(s->s3->tmp.cert_verify_md[MD5_DIGEST_LENGTH]),
+                    SHA_DIGEST_LENGTH, p, i, pkey->pkey.ec);
+                if (j <= 0) {
                         /* bad signature */
-                        al=SSL_AD_DECRYPT_ERROR;
+                        al = SSL_AD_DECRYPT_ERROR;
                         SSLerr(SSL_F_SSL3_GET_CERT_VERIFY,
-                            SSL_R_BAD_ECDSA_SIGNATURE);
+                        SSL_R_BAD_ECDSA_SIGNATURE);
                         goto f_err;
-                        }
                 }
-        else
+        } else
 #endif
-        if (pkey->type == NID_id_GostR3410_94 || pkey->type == NID_id_GostR3410_2001)
-                {   unsigned char signature[64];
-                        int idx;
-                        EVP_PKEY_CTX *pctx = EVP_PKEY_CTX_new(pkey,NULL);
-                        EVP_PKEY_verify_init(pctx);
-                        if (i!=64) {
-                                fprintf(stderr,"GOST signature length is %d",i);
-                        }       
-                        for (idx=0;idx<64;idx++) {
-                                signature[63-idx]=p[idx];
-                        }       
-                        j=EVP_PKEY_verify(pctx,signature,64,s->s3->tmp.cert_verify_md,32);
-                        EVP_PKEY_CTX_free(pctx);
-                        if (j<=0) 
-                                {
-                                al=SSL_AD_DECRYPT_ERROR;
-                                SSLerr(SSL_F_SSL3_GET_CERT_VERIFY,
-                                        SSL_R_BAD_ECDSA_SIGNATURE);
-                                goto f_err;
-                                }       
+        if (pkey->type == NID_id_GostR3410_94 || pkey->type == NID_id_GostR3410_2001) {
+                unsigned char signature[64];
+                int idx;
+                EVP_PKEY_CTX *pctx = EVP_PKEY_CTX_new(pkey, NULL);
+                EVP_PKEY_verify_init(pctx);
+                if (i != 64) {
+                        fprintf(stderr, "GOST signature length is %d", i);
+                }
+                for (idx = 0; idx < 64; idx++) {
+                        signature[63 - idx] = p[idx];
+                }
+                j = EVP_PKEY_verify(pctx, signature, 64, s->s3->tmp.cert_verify_md, 32);
+                EVP_PKEY_CTX_free(pctx);
+                if (j <= 0) {
+                        al = SSL_AD_DECRYPT_ERROR;
+                        SSLerr(SSL_F_SSL3_GET_CERT_VERIFY,
+                        SSL_R_BAD_ECDSA_SIGNATURE);
+                        goto f_err;
                 }
-        else    
-                {
-                SSLerr(SSL_F_SSL3_GET_CERT_VERIFY,ERR_R_INTERNAL_ERROR);
-                al=SSL_AD_UNSUPPORTED_CERTIFICATE;
+        } else {
+                SSLerr(SSL_F_SSL3_GET_CERT_VERIFY, ERR_R_INTERNAL_ERROR);
+                al = SSL_AD_UNSUPPORTED_CERTIFICATE;
                 goto f_err;
-                }
+        }
 
 
-        ret=1;
-        if (0)
-                {
+        ret = 1;
+        if (0) {
 f_err:
-                ssl3_send_alert(s,SSL3_AL_FATAL,al);
-                }
+                ssl3_send_alert(s, SSL3_AL_FATAL, al);
+        }
 end:
-        if (s->s3->handshake_buffer)
-                {
+        if (s->s3->handshake_buffer) {
                 BIO_free(s->s3->handshake_buffer);
                 s->s3->handshake_buffer = NULL;
                 s->s3->flags &= ~TLS1_FLAGS_KEEP_HANDSHAKE;
-                }
+        }
         EVP_MD_CTX_cleanup(&mctx);
         EVP_PKEY_free(pkey);
-        return(ret);
-        }
+        return (ret);
+}
 
-int ssl3_get_client_certificate(SSL *s)
-        {
-        int i,ok,al,ret= -1;
-        X509 *x=NULL;
-        unsigned long l,nc,llen,n;
-        const unsigned char *p,*q;
+int
+ssl3_get_client_certificate(SSL *s)
+{
+        int i, ok, al, ret = -1;
+        X509 *x = NULL;
+        unsigned long l, nc, llen, n;
+        const unsigned char *p, *q;
         unsigned char *d;
-        STACK_OF(X509) *sk=NULL;
+        STACK_OF(X509) *sk = NULL;
 
-        n=s->method->ssl_get_message(s,
-                SSL3_ST_SR_CERT_A,
-                SSL3_ST_SR_CERT_B,
-                -1,
-                s->max_cert_list,
-                &ok);
+        n = s->method->ssl_get_message(s,
+        SSL3_ST_SR_CERT_A,
+        SSL3_ST_SR_CERT_B,
+        -1,
+        s->max_cert_list,
+        &ok);
 
-        if (!ok) return((int)n);
+        if (!ok)
+                return ((int)n);
 
-        if      (s->s3->tmp.message_type == SSL3_MT_CLIENT_KEY_EXCHANGE)
-                {
-                if (    (s->verify_mode & SSL_VERIFY_PEER) &&
-                        (s->verify_mode & SSL_VERIFY_FAIL_IF_NO_PEER_CERT))
-                        {
-                        SSLerr(SSL_F_SSL3_GET_CLIENT_CERTIFICATE,SSL_R_PEER_DID_NOT_RETURN_A_CERTIFICATE);
-                        al=SSL_AD_HANDSHAKE_FAILURE;
+        if (s->s3->tmp.message_type == SSL3_MT_CLIENT_KEY_EXCHANGE) {
+                if ((s->verify_mode & SSL_VERIFY_PEER) &&
+                        (s->verify_mode & SSL_VERIFY_FAIL_IF_NO_PEER_CERT)) {
+                        SSLerr(SSL_F_SSL3_GET_CLIENT_CERTIFICATE, SSL_R_PEER_DID_NOT_RETURN_A_CERTIFICATE);
+                        al = SSL_AD_HANDSHAKE_FAILURE;
                         goto f_err;
-                        }
+                }
                 /* If tls asked for a client cert, the client must return a 0 list */
-                if ((s->version > SSL3_VERSION) && s->s3->tmp.cert_request)
-                        {
-                        SSLerr(SSL_F_SSL3_GET_CLIENT_CERTIFICATE,SSL_R_TLS_PEER_DID_NOT_RESPOND_WITH_CERTIFICATE_LIST);
-                        al=SSL_AD_UNEXPECTED_MESSAGE;
+                if ((s->version > SSL3_VERSION) && s->s3->tmp.cert_request) {
+                        SSLerr(SSL_F_SSL3_GET_CLIENT_CERTIFICATE, SSL_R_TLS_PEER_DID_NOT_RESPOND_WITH_CERTIFICATE_LIST);
+                        al = SSL_AD_UNEXPECTED_MESSAGE;
                         goto f_err;
-                        }
-                s->s3->tmp.reuse_message=1;
-                return(1);
                 }
+                s->s3->tmp.reuse_message = 1;
+                return (1);
+        }
 
-        if (s->s3->tmp.message_type != SSL3_MT_CERTIFICATE)
-                {
-                al=SSL_AD_UNEXPECTED_MESSAGE;
-                SSLerr(SSL_F_SSL3_GET_CLIENT_CERTIFICATE,SSL_R_WRONG_MESSAGE_TYPE);
+        if (s->s3->tmp.message_type != SSL3_MT_CERTIFICATE) {
+                al = SSL_AD_UNEXPECTED_MESSAGE;
+                SSLerr(SSL_F_SSL3_GET_CLIENT_CERTIFICATE, SSL_R_WRONG_MESSAGE_TYPE);
                 goto f_err;
-                }
-        p=d=(unsigned char *)s->init_msg;
+        }
+        p = d = (unsigned char *)s->init_msg;
 
-        if ((sk=sk_X509_new_null()) == NULL)
-                {
-                SSLerr(SSL_F_SSL3_GET_CLIENT_CERTIFICATE,ERR_R_MALLOC_FAILURE);
+        if ((sk = sk_X509_new_null()) == NULL) {
+                SSLerr(SSL_F_SSL3_GET_CLIENT_CERTIFICATE, ERR_R_MALLOC_FAILURE);
                 goto err;
-                }
+        }
 
-        n2l3(p,llen);
-        if (llen+3 != n)
-                {
-                al=SSL_AD_DECODE_ERROR;
-                SSLerr(SSL_F_SSL3_GET_CLIENT_CERTIFICATE,SSL_R_LENGTH_MISMATCH);
+        n2l3(p, llen);
+        if (llen + 3 != n) {
+                al = SSL_AD_DECODE_ERROR;
+                SSLerr(SSL_F_SSL3_GET_CLIENT_CERTIFICATE, SSL_R_LENGTH_MISMATCH);
                 goto f_err;
-                }
-        for (nc=0; nc<llen; )
-                {
-                n2l3(p,l);
-                if ((l+nc+3) > llen)
-                        {
-                        al=SSL_AD_DECODE_ERROR;
-                        SSLerr(SSL_F_SSL3_GET_CLIENT_CERTIFICATE,SSL_R_CERT_LENGTH_MISMATCH);
+        }
+        for (nc = 0; nc < llen;) {
+                n2l3(p, l);
+                if ((l + nc + 3) > llen) {
+                        al = SSL_AD_DECODE_ERROR;
+                        SSLerr(SSL_F_SSL3_GET_CLIENT_CERTIFICATE, SSL_R_CERT_LENGTH_MISMATCH);
                         goto f_err;
-                        }
+                }
 
-                q=p;
-                x=d2i_X509(NULL,&p,l);
-                if (x == NULL)
-                        {
-                        SSLerr(SSL_F_SSL3_GET_CLIENT_CERTIFICATE,ERR_R_ASN1_LIB);
+                q = p;
+                x = d2i_X509(NULL, &p, l);
+                if (x == NULL) {
+                        SSLerr(SSL_F_SSL3_GET_CLIENT_CERTIFICATE, ERR_R_ASN1_LIB);
                         goto err;
-                        }
-                if (p != (q+l))
-                        {
-                        al=SSL_AD_DECODE_ERROR;
-                        SSLerr(SSL_F_SSL3_GET_CLIENT_CERTIFICATE,SSL_R_CERT_LENGTH_MISMATCH);
+                }
+                if (p != (q + l)) {
+                        al = SSL_AD_DECODE_ERROR;
+                        SSLerr(SSL_F_SSL3_GET_CLIENT_CERTIFICATE, SSL_R_CERT_LENGTH_MISMATCH);
                         goto f_err;
-                        }
-                if (!sk_X509_push(sk,x))
-                        {
-                        SSLerr(SSL_F_SSL3_GET_CLIENT_CERTIFICATE,ERR_R_MALLOC_FAILURE);
+                }
+                if (!sk_X509_push(sk, x)) {
+                        SSLerr(SSL_F_SSL3_GET_CLIENT_CERTIFICATE, ERR_R_MALLOC_FAILURE);
                         goto err;
-                        }
-                x=NULL;
-                nc+=l+3;
                 }
+                x = NULL;
+                nc += l + 3;
+        }
 
-        if (sk_X509_num(sk) <= 0)
-                {
+        if (sk_X509_num(sk) <= 0) {
                 /* TLS does not mind 0 certs returned */
-                if (s->version == SSL3_VERSION)
-                        {
-                        al=SSL_AD_HANDSHAKE_FAILURE;
-                        SSLerr(SSL_F_SSL3_GET_CLIENT_CERTIFICATE,SSL_R_NO_CERTIFICATES_RETURNED);
+                if (s->version == SSL3_VERSION) {
+                        al = SSL_AD_HANDSHAKE_FAILURE;
+                        SSLerr(SSL_F_SSL3_GET_CLIENT_CERTIFICATE, SSL_R_NO_CERTIFICATES_RETURNED);
                         goto f_err;
-                        }
+                }
                 /* Fail for TLS only if we required a certificate */
                 else if ((s->verify_mode & SSL_VERIFY_PEER) &&
-                         (s->verify_mode & SSL_VERIFY_FAIL_IF_NO_PEER_CERT))
-                        {
-                        SSLerr(SSL_F_SSL3_GET_CLIENT_CERTIFICATE,SSL_R_PEER_DID_NOT_RETURN_A_CERTIFICATE);
-                        al=SSL_AD_HANDSHAKE_FAILURE;
+                    (s->verify_mode & SSL_VERIFY_FAIL_IF_NO_PEER_CERT)) {
+                        SSLerr(SSL_F_SSL3_GET_CLIENT_CERTIFICATE, SSL_R_PEER_DID_NOT_RETURN_A_CERTIFICATE);
+                        al = SSL_AD_HANDSHAKE_FAILURE;
                         goto f_err;
-                        }
+                }
                 /* No client certificate so digest cached records */
-                if (s->s3->handshake_buffer && !ssl3_digest_cached_records(s))
-                        {
-                        al=SSL_AD_INTERNAL_ERROR;
+                if (s->s3->handshake_buffer && !ssl3_digest_cached_records(s)) {
+                        al = SSL_AD_INTERNAL_ERROR;
                         goto f_err;
-                        }
                 }
-        else
-                {
-                i=ssl_verify_cert_chain(s,sk);
-                if (i <= 0)
-                        {
-                        al=ssl_verify_alarm_type(s->verify_result);
-                        SSLerr(SSL_F_SSL3_GET_CLIENT_CERTIFICATE,SSL_R_NO_CERTIFICATE_RETURNED);
+        } else {
+                i = ssl_verify_cert_chain(s, sk);
+                if (i <= 0) {
+                        al = ssl_verify_alarm_type(s->verify_result);
+                        SSLerr(SSL_F_SSL3_GET_CLIENT_CERTIFICATE, SSL_R_NO_CERTIFICATE_RETURNED);
                         goto f_err;
-                        }
                 }
+        }
 
         if (s->session->peer != NULL) /* This should not be needed */
                 X509_free(s->session->peer);
-        s->session->peer=sk_X509_shift(sk);
+        s->session->peer = sk_X509_shift(sk);
         s->session->verify_result = s->verify_result;
 
         /* With the current implementation, sess_cert will always be NULL
          * when we arrive here. */
-        if (s->session->sess_cert == NULL)
-                {
+        if (s->session->sess_cert == NULL) {
                 s->session->sess_cert = ssl_sess_cert_new();
-                if (s->session->sess_cert == NULL)
-                        {
+                if (s->session->sess_cert == NULL) {
                         SSLerr(SSL_F_SSL3_GET_CLIENT_CERTIFICATE, ERR_R_MALLOC_FAILURE);
                         goto err;
-                        }
                 }
+        }
         if (s->session->sess_cert->cert_chain != NULL)
                 sk_X509_pop_free(s->session->sess_cert->cert_chain, X509_free);
-        s->session->sess_cert->cert_chain=sk;
+        s->session->sess_cert->cert_chain = sk;
         /* Inconsistency alert: cert_chain does *not* include the
          * peer's own certificate, while we do include it in s3_clnt.c */
 
-        sk=NULL;
+        sk = NULL;
 
-        ret=1;
-        if (0)
-                {
+        ret = 1;
+        if (0) {
 f_err:
-                ssl3_send_alert(s,SSL3_AL_FATAL,al);
-                }
-err:
-        if (x != NULL) X509_free(x);
-        if (sk != NULL) sk_X509_pop_free(sk,X509_free);
-        return(ret);
+                ssl3_send_alert(s, SSL3_AL_FATAL, al);
         }
+err:
+        if (x != NULL)
+                X509_free(x);
+        if (sk != NULL)
+                sk_X509_pop_free(sk, X509_free);
+        return (ret);
+}
 
-int ssl3_send_server_certificate(SSL *s)
-        {
+int
+ssl3_send_server_certificate(SSL *s)
+{
         unsigned long l;
         X509 *x;
 
-        if (s->state == SSL3_ST_SW_CERT_A)
-                {
-                x=ssl_get_server_send_cert(s);
-                if (x == NULL)
-                        {
+        if (s->state == SSL3_ST_SW_CERT_A) {
+                x = ssl_get_server_send_cert(s);
+                if (x == NULL) {
                         /* VRS: allow null cert if auth == KRB5 */
                         if ((s->s3->tmp.new_cipher->algorithm_auth != SSL_aKRB5) ||
-                            (s->s3->tmp.new_cipher->algorithm_mkey & SSL_kKRB5))
-                                {
-                                SSLerr(SSL_F_SSL3_SEND_SERVER_CERTIFICATE,ERR_R_INTERNAL_ERROR);
-                                return(0);
-                                }
+                                (s->s3->tmp.new_cipher->algorithm_mkey & SSL_kKRB5)) {
+                                SSLerr(SSL_F_SSL3_SEND_SERVER_CERTIFICATE, ERR_R_INTERNAL_ERROR);
+                                return (0);
                         }
-
-                l=ssl3_output_cert_chain(s,x);
-                s->state=SSL3_ST_SW_CERT_B;
-                s->init_num=(int)l;
-                s->init_off=0;
                 }
 
-        /* SSL3_ST_SW_CERT_B */
-        return(ssl3_do_write(s,SSL3_RT_HANDSHAKE));
+                l = ssl3_output_cert_chain(s, x);
+                s->state = SSL3_ST_SW_CERT_B;
+                s->init_num = (int)l;
+                s->init_off = 0;
         }
 
+        /* SSL3_ST_SW_CERT_B */
+        return (ssl3_do_write(s, SSL3_RT_HANDSHAKE));
+}
+
 #ifndef OPENSSL_NO_TLSEXT
 /* send a new session ticket (not necessarily for a new session) */
-int ssl3_send_newsession_ticket(SSL *s)
-        {
-        if (s->state == SSL3_ST_SW_SESSION_TICKET_A)
-                {
+int
+ssl3_send_newsession_ticket(SSL *s)
+{
+        if (s->state == SSL3_ST_SW_SESSION_TICKET_A) {
                 unsigned char *p, *senc, *macstart;
                 const unsigned char *const_p;
                 int len, slen_full, slen;
@@ -3383,19 +3097,18 @@ int ssl3_send_newsession_ticket(SSL *s)
                 /* create a fresh copy (not shared with other threads) to clean up */
                 const_p = senc;
                 sess = d2i_SSL_SESSION(NULL, &const_p, slen_full);
-                if (sess == NULL)
-                        {
+                if (sess == NULL) {
                         OPENSSL_free(senc);
                         return -1;
-                        }
+                }
                 sess->session_id_length = 0; /* ID is irrelevant for the ticket */
 
                 slen = i2d_SSL_SESSION(sess, NULL);
                 if (slen > slen_full) /* shouldn't ever happen */
-                        {
+                {
                         OPENSSL_free(senc);
                         return -1;
-                        }
+                }
                 p = senc;
                 i2d_SSL_SESSION(sess, &p);
                 SSL_SESSION_free(sess);
@@ -3409,12 +3122,12 @@ int ssl3_send_newsession_ticket(SSL *s)
                  */
                 if (!BUF_MEM_grow(s->init_buf,
                         26 + EVP_MAX_IV_LENGTH + EVP_MAX_BLOCK_LENGTH +
-                        EVP_MAX_MD_SIZE + slen))
-                        return -1;
+                EVP_MAX_MD_SIZE + slen))
+                return -1;
 
-                p=(unsigned char *)s->init_buf->data;
+                p = (unsigned char *)s->init_buf->data;
                 /* do the header */
-                *(p++)=SSL3_MT_NEWSESSION_TICKET;
+                *(p++) = SSL3_MT_NEWSESSION_TICKET;
                 /* Skip message length for now */
                 p += 3;
                 EVP_CIPHER_CTX_init(&ctx);
@@ -3423,24 +3136,20 @@ int ssl3_send_newsession_ticket(SSL *s)
                  * it does all the work otherwise use generated values
                  * from parent ctx.
                  */
-                if (tctx->tlsext_ticket_key_cb)
-                        {
+                if (tctx->tlsext_ticket_key_cb) {
                         if (tctx->tlsext_ticket_key_cb(s, key_name, iv, &ctx,
-                                                         &hctx, 1) < 0)
-                                {
+                            &hctx, 1) < 0) {
                                 OPENSSL_free(senc);
                                 return -1;
-                                }
                         }
-                else
-                        {
+                } else {
                         RAND_pseudo_bytes(iv, 16);
                         EVP_EncryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL,
-                                        tctx->tlsext_tick_aes_key, iv);
+                            tctx->tlsext_tick_aes_key, iv);
                         HMAC_Init_ex(&hctx, tctx->tlsext_tick_hmac_key, 16,
-                                        tlsext_tick_md(), NULL);
+                            tlsext_tick_md(), NULL);
                         memcpy(key_name, tctx->tlsext_tick_key_name, 16);
-                        }
+                }
 
                 /* Ticket lifetime hint (advisory only):
                  * We leave this unspecified for resumed session (for simplicity),
@@ -3472,26 +3181,27 @@ int ssl3_send_newsession_ticket(SSL *s)
                 /* Now write out lengths: p points to end of data written */
                 /* Total length */
                 len = p - (unsigned char *)s->init_buf->data;
-                p=(unsigned char *)s->init_buf->data + 1;
+                p = (unsigned char *)s->init_buf->data + 1;
                 l2n3(len - 4, p); /* Message length */
                 p += 4;
-                s2n(len - 10, p);  /* Ticket length */
+                s2n(len - 10, p);
+                /* Ticket length */
 
                 /* number of bytes to write */
-                s->init_num= len;
-                s->state=SSL3_ST_SW_SESSION_TICKET_B;
-                s->init_off=0;
+                s->init_num = len;
+                s->state = SSL3_ST_SW_SESSION_TICKET_B;
+                s->init_off = 0;
                 OPENSSL_free(senc);
-                }
+        }
 
         /* SSL3_ST_SW_SESSION_TICKET_B */
-        return(ssl3_do_write(s,SSL3_RT_HANDSHAKE));
-        }
+        return (ssl3_do_write(s, SSL3_RT_HANDSHAKE));
+}
 
-int ssl3_send_cert_status(SSL *s)
-        {
-        if (s->state == SSL3_ST_SW_CERT_STATUS_A)
-                {
+int
+ssl3_send_cert_status(SSL *s)
+{
+        if (s->state == SSL3_ST_SW_CERT_STATUS_A) {
                 unsigned char *p;
                 /* Grow buffer if need be: the length calculation is as
                  * follows 1 (message type) + 3 (message length) +
@@ -3501,33 +3211,34 @@ int ssl3_send_cert_status(SSL *s)
                 if (!BUF_MEM_grow(s->init_buf, 8 + s->tlsext_ocsp_resplen))
                         return -1;
 
-                p=(unsigned char *)s->init_buf->data;
+                p = (unsigned char *)s->init_buf->data;
 
                 /* do the header */
-                *(p++)=SSL3_MT_CERTIFICATE_STATUS;
+                *(p++) = SSL3_MT_CERTIFICATE_STATUS;
                 /* message length */
                 l2n3(s->tlsext_ocsp_resplen + 4, p);
                 /* status type */
-                *(p++)= s->tlsext_status_type;
+                *(p++) = s->tlsext_status_type;
                 /* length of OCSP response */
                 l2n3(s->tlsext_ocsp_resplen, p);
                 /* actual response */
                 memcpy(p, s->tlsext_ocsp_resp, s->tlsext_ocsp_resplen);
                 /* number of bytes to write */
                 s->init_num = 8 + s->tlsext_ocsp_resplen;
-                s->state=SSL3_ST_SW_CERT_STATUS_B;
+                s->state = SSL3_ST_SW_CERT_STATUS_B;
                 s->init_off = 0;
-                }
+        }
 
         /* SSL3_ST_SW_CERT_STATUS_B */
-        return(ssl3_do_write(s,SSL3_RT_HANDSHAKE));
-        }
+        return (ssl3_do_write(s, SSL3_RT_HANDSHAKE));
+}
 
 # ifndef OPENSSL_NO_NEXTPROTONEG
 /* ssl3_get_next_proto reads a Next Protocol Negotiation handshake message. It
  * sets the next_proto member in s if found */
-int ssl3_get_next_proto(SSL *s)
-        {
+int
+ssl3_get_next_proto(SSL *s)
+{
         int ok;
         int proto_len, padding_len;
         long n;
@@ -3535,35 +3246,30 @@ int ssl3_get_next_proto(SSL *s)
 
         /* Clients cannot send a NextProtocol message if we didn't see the
          * extension in their ClientHello */
-        if (!s->s3->next_proto_neg_seen)
-                {
-                SSLerr(SSL_F_SSL3_GET_NEXT_PROTO,SSL_R_GOT_NEXT_PROTO_WITHOUT_EXTENSION);
+        if (!s->s3->next_proto_neg_seen) {
+                SSLerr(SSL_F_SSL3_GET_NEXT_PROTO, SSL_R_GOT_NEXT_PROTO_WITHOUT_EXTENSION);
                 return -1;
-                }
-
-        n=s->method->ssl_get_message(s,
-                SSL3_ST_SR_NEXT_PROTO_A,
-                SSL3_ST_SR_NEXT_PROTO_B,
-                SSL3_MT_NEXT_PROTO,
-                514,  /* See the payload format below */
-                &ok);
+        }
 
+        n = s->method->ssl_get_message(s, SSL3_ST_SR_NEXT_PROTO_A,
+            SSL3_ST_SR_NEXT_PROTO_B, SSL3_MT_NEXT_PROTO,
+            514,  /* See the payload format below */ &ok);
         if (!ok)
-                return((int)n);
+                return ((int)n);
 
         /* s->state doesn't reflect whether ChangeCipherSpec has been received
          * in this handshake, but s->s3->change_cipher_spec does (will be reset
          * by ssl3_get_finished). */
-        if (!s->s3->change_cipher_spec)
-                {
-                SSLerr(SSL_F_SSL3_GET_NEXT_PROTO,SSL_R_GOT_NEXT_PROTO_BEFORE_A_CCS);
+        if (!s->s3->change_cipher_spec) {
+                SSLerr(SSL_F_SSL3_GET_NEXT_PROTO, SSL_R_GOT_NEXT_PROTO_BEFORE_A_CCS);
                 return -1;
-                }
+        }
 
         if (n < 2)
-                return 0;  /* The body must be > 1 bytes long */
+                return 0;
+        /* The body must be > 1 bytes long */
 
-        p=(unsigned char *)s->init_msg;
+        p = (unsigned char *)s->init_msg;
 
         /* The payload looks like:
          *   uint8 proto_len;
@@ -3579,15 +3285,14 @@ int ssl3_get_next_proto(SSL *s)
                 return 0;
 
         s->next_proto_negotiated = OPENSSL_malloc(proto_len);
-        if (!s->next_proto_negotiated)
-                {
-                SSLerr(SSL_F_SSL3_GET_NEXT_PROTO,ERR_R_MALLOC_FAILURE);
+        if (!s->next_proto_negotiated) {
+                SSLerr(SSL_F_SSL3_GET_NEXT_PROTO, ERR_R_MALLOC_FAILURE);
                 return 0;
-                }
+        }
         memcpy(s->next_proto_negotiated, p + 1, proto_len);
         s->next_proto_negotiated_len = proto_len;
 
         return 1;
-        }
+}
 # endif
 #endif