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.

1 files changed, 180 insertions, 184 deletions

diff --git a/src/lib/libssl/d1_lib.c b/src/lib/libssl/d1_lib.c
index 750f83e04a..3da7c36545 100644
--- a/src/lib/libssl/d1_lib.c
+++ b/src/lib/libssl/d1_lib.c
@@ -70,8 +70,8 @@ static void get_current_time(struct timeval *t);
 const char dtls1_version_str[]="DTLSv1" OPENSSL_VERSION_PTEXT;
 int dtls1_listen(SSL *s, struct sockaddr *client);
 
-SSL3_ENC_METHOD DTLSv1_enc_data={
-    dtls1_enc,
+SSL3_ENC_METHOD DTLSv1_enc_data = {
+        dtls1_enc,
         tls1_mac,
         tls1_setup_key_block,
         tls1_generate_master_secret,
@@ -79,137 +79,139 @@ SSL3_ENC_METHOD DTLSv1_enc_data={
         tls1_final_finish_mac,
         TLS1_FINISH_MAC_LENGTH,
         tls1_cert_verify_mac,
-        TLS_MD_CLIENT_FINISH_CONST,TLS_MD_CLIENT_FINISH_CONST_SIZE,
-        TLS_MD_SERVER_FINISH_CONST,TLS_MD_SERVER_FINISH_CONST_SIZE,
+        TLS_MD_CLIENT_FINISH_CONST, TLS_MD_CLIENT_FINISH_CONST_SIZE,
+        TLS_MD_SERVER_FINISH_CONST, TLS_MD_SERVER_FINISH_CONST_SIZE,
         tls1_alert_code,
         tls1_export_keying_material,
-        };
+};
 
-long dtls1_default_timeout(void)
-        {
+long
+dtls1_default_timeout(void)
+{
         /* 2 hours, the 24 hours mentioned in the DTLSv1 spec
          * is way too long for http, the cache would over fill */
-        return(60*60*2);
-        }
+        return (60*60*2);
+}
 
-int dtls1_new(SSL *s)
-        {
+int
+dtls1_new(SSL *s)
+{
         DTLS1_STATE *d1;
 
-        if (!ssl3_new(s)) return(0);
-        if ((d1=OPENSSL_malloc(sizeof *d1)) == NULL) return (0);
-        memset(d1,0, sizeof *d1);
+        if (!ssl3_new(s))
+                return (0);
+        if ((d1 = OPENSSL_malloc(sizeof *d1)) == NULL) return (0);
+                memset(d1, 0, sizeof *d1);
 
         /* d1->handshake_epoch=0; */
 
-        d1->unprocessed_rcds.q=pqueue_new();
-        d1->processed_rcds.q=pqueue_new();
+        d1->unprocessed_rcds.q = pqueue_new();
+        d1->processed_rcds.q = pqueue_new();
         d1->buffered_messages = pqueue_new();
-        d1->sent_messages=pqueue_new();
-        d1->buffered_app_data.q=pqueue_new();
+        d1->sent_messages = pqueue_new();
+        d1->buffered_app_data.q = pqueue_new();
 
-        if ( s->server)
-                {
+        if (s->server) {
                 d1->cookie_len = sizeof(s->d1->cookie);
-                }
+        }
 
-        if( ! d1->unprocessed_rcds.q || ! d1->processed_rcds.q 
-        || ! d1->buffered_messages || ! d1->sent_messages || ! d1->buffered_app_data.q)
-                {
-        if ( d1->unprocessed_rcds.q) pqueue_free(d1->unprocessed_rcds.q);
-        if ( d1->processed_rcds.q) pqueue_free(d1->processed_rcds.q);
-        if ( d1->buffered_messages) pqueue_free(d1->buffered_messages);
-                if ( d1->sent_messages) pqueue_free(d1->sent_messages);
-                if ( d1->buffered_app_data.q) pqueue_free(d1->buffered_app_data.q);
+        if (!d1->unprocessed_rcds.q || !d1->processed_rcds.q ||
+            !d1->buffered_messages || !d1->sent_messages ||
+            !d1->buffered_app_data.q) {
+                if (d1->unprocessed_rcds.q)
+                        pqueue_free(d1->unprocessed_rcds.q);
+                if (d1->processed_rcds.q)
+                        pqueue_free(d1->processed_rcds.q);
+                if (d1->buffered_messages)
+                        pqueue_free(d1->buffered_messages);
+                if (d1->sent_messages)
+                        pqueue_free(d1->sent_messages);
+                if (d1->buffered_app_data.q)
+                        pqueue_free(d1->buffered_app_data.q);
                 OPENSSL_free(d1);
                 return (0);
-                }
+        }
 
-        s->d1=d1;
+        s->d1 = d1;
         s->method->ssl_clear(s);
-        return(1);
-        }
+        return (1);
+}
 
-static void dtls1_clear_queues(SSL *s)
-        {
-    pitem *item = NULL;
-    hm_fragment *frag = NULL;
+static void
+dtls1_clear_queues(SSL *s)
+{
+        pitem *item = NULL;
+        hm_fragment *frag = NULL;
         DTLS1_RECORD_DATA *rdata;
 
-    while( (item = pqueue_pop(s->d1->unprocessed_rcds.q)) != NULL)
-        {
+        while ((item = pqueue_pop(s->d1->unprocessed_rcds.q)) != NULL) {
                 rdata = (DTLS1_RECORD_DATA *) item->data;
-                if (rdata->rbuf.buf)
-                        {
+                if (rdata->rbuf.buf) {
                         OPENSSL_free(rdata->rbuf.buf);
-                        }
-        OPENSSL_free(item->data);
-        pitem_free(item);
-        }
+                }
+                OPENSSL_free(item->data);
+                pitem_free(item);
+        }
 
-    while( (item = pqueue_pop(s->d1->processed_rcds.q)) != NULL)
-        {
+        while ((item = pqueue_pop(s->d1->processed_rcds.q)) != NULL) {
                 rdata = (DTLS1_RECORD_DATA *) item->data;
-                if (rdata->rbuf.buf)
-                        {
+                if (rdata->rbuf.buf) {
                         OPENSSL_free(rdata->rbuf.buf);
-                        }
-        OPENSSL_free(item->data);
-        pitem_free(item);
-        }
-
-    while( (item = pqueue_pop(s->d1->buffered_messages)) != NULL)
-        {
-        frag = (hm_fragment *)item->data;
-        OPENSSL_free(frag->fragment);
-        OPENSSL_free(frag);
-        pitem_free(item);
-        }
-
-    while ( (item = pqueue_pop(s->d1->sent_messages)) != NULL)
-        {
-        frag = (hm_fragment *)item->data;
-        OPENSSL_free(frag->fragment);
-        OPENSSL_free(frag);
-        pitem_free(item);
-        }
-
-        while ( (item = pqueue_pop(s->d1->buffered_app_data.q)) != NULL)
-                {
+                }
+                OPENSSL_free(item->data);
+                pitem_free(item);
+        }
+
+        while ((item = pqueue_pop(s->d1->buffered_messages)) != NULL) {
                 frag = (hm_fragment *)item->data;
                 OPENSSL_free(frag->fragment);
                 OPENSSL_free(frag);
                 pitem_free(item);
-                }
         }
 
-void dtls1_free(SSL *s)
-        {
+        while ((item = pqueue_pop(s->d1->sent_messages)) != NULL) {
+                frag = (hm_fragment *)item->data;
+                OPENSSL_free(frag->fragment);
+                OPENSSL_free(frag);
+                pitem_free(item);
+        }
+
+        while ((item = pqueue_pop(s->d1->buffered_app_data.q)) != NULL) {
+                frag = (hm_fragment *)item->data;
+                OPENSSL_free(frag->fragment);
+                OPENSSL_free(frag);
+                pitem_free(item);
+        }
+}
+
+void
+dtls1_free(SSL *s)
+{
         ssl3_free(s);
 
         dtls1_clear_queues(s);
 
-    pqueue_free(s->d1->unprocessed_rcds.q);
-    pqueue_free(s->d1->processed_rcds.q);
-    pqueue_free(s->d1->buffered_messages);
+        pqueue_free(s->d1->unprocessed_rcds.q);
+        pqueue_free(s->d1->processed_rcds.q);
+        pqueue_free(s->d1->buffered_messages);
         pqueue_free(s->d1->sent_messages);
         pqueue_free(s->d1->buffered_app_data.q);
 
         OPENSSL_free(s->d1);
         s->d1 = NULL;
-        }
+}
 
-void dtls1_clear(SSL *s)
-        {
-    pqueue unprocessed_rcds;
-    pqueue processed_rcds;
-    pqueue buffered_messages;
+void
+dtls1_clear(SSL *s)
+{
+        pqueue unprocessed_rcds;
+        pqueue processed_rcds;
+        pqueue buffered_messages;
         pqueue sent_messages;
         pqueue buffered_app_data;
         unsigned int mtu;
 
-        if (s->d1)
-                {
+        if (s->d1) {
                 unprocessed_rcds = s->d1->unprocessed_rcds.q;
                 processed_rcds = s->d1->processed_rcds.q;
                 buffered_messages = s->d1->buffered_messages;
@@ -221,41 +223,38 @@ void dtls1_clear(SSL *s)
 
                 memset(s->d1, 0, sizeof(*(s->d1)));
 
-                if (s->server)
-                        {
+                if (s->server) {
                         s->d1->cookie_len = sizeof(s->d1->cookie);
-                        }
+                }
 
-                if (SSL_get_options(s) & SSL_OP_NO_QUERY_MTU)
-                        {
+                if (SSL_get_options(s) & SSL_OP_NO_QUERY_MTU) {
                         s->d1->mtu = mtu;
-                        }
+                }
 
                 s->d1->unprocessed_rcds.q = unprocessed_rcds;
                 s->d1->processed_rcds.q = processed_rcds;
                 s->d1->buffered_messages = buffered_messages;
                 s->d1->sent_messages = sent_messages;
                 s->d1->buffered_app_data.q = buffered_app_data;
-                }
+        }
 
         ssl3_clear(s);
         if (s->options & SSL_OP_CISCO_ANYCONNECT)
-                s->version=DTLS1_BAD_VER;
+                s->version = DTLS1_BAD_VER;
         else
-                s->version=DTLS1_VERSION;
-        }
+                s->version = DTLS1_VERSION;
+}
 
-long dtls1_ctrl(SSL *s, int cmd, long larg, void *parg)
-        {
-        int ret=0;
+long
+dtls1_ctrl(SSL *s, int cmd, long larg, void *parg)
+{
+        int ret = 0;
 
-        switch (cmd)
-                {
+        switch (cmd) {
         case DTLS_CTRL_GET_TIMEOUT:
-                if (dtls1_get_timeout(s, (struct timeval*) parg) != NULL)
-                        {
+                if (dtls1_get_timeout(s, (struct timeval*) parg) != NULL) {
                         ret = 1;
-                        }
+                }
                 break;
         case DTLS_CTRL_HANDLE_TIMEOUT:
                 ret = dtls1_handle_timeout(s);
@@ -267,9 +266,9 @@ long dtls1_ctrl(SSL *s, int cmd, long larg, void *parg)
         default:
                 ret = ssl3_ctrl(s, cmd, larg, parg);
                 break;
-                }
-        return(ret);
         }
+        return (ret);
+}
 
 /*
  * As it's impossible to use stream ciphers in "datagram" mode, this
@@ -278,53 +277,51 @@ long dtls1_ctrl(SSL *s, int cmd, long larg, void *parg)
  * to explicitly list their SSL_* codes. Currently RC4 is the only one
  * available, but if new ones emerge, they will have to be added...
  */
-const SSL_CIPHER *dtls1_get_cipher(unsigned int u)
-        {
+const SSL_CIPHER
+*dtls1_get_cipher(unsigned int u)
+{
         const SSL_CIPHER *ciph = ssl3_get_cipher(u);
 
-        if (ciph != NULL)
-                {
+        if (ciph != NULL) {
                 if (ciph->algorithm_enc == SSL_RC4)
                         return NULL;
-                }
+        }
 
         return ciph;
-        }
+}
 
-void dtls1_start_timer(SSL *s)
-        {
+void
+dtls1_start_timer(SSL *s)
+{
 #ifndef OPENSSL_NO_SCTP
         /* Disable timer for SCTP */
-        if (BIO_dgram_is_sctp(SSL_get_wbio(s)))
-                {
+        if (BIO_dgram_is_sctp(SSL_get_wbio(s))) {
                 memset(&(s->d1->next_timeout), 0, sizeof(struct timeval));
                 return;
-                }
+        }
 #endif
 
         /* If timer is not set, initialize duration with 1 second */
-        if (s->d1->next_timeout.tv_sec == 0 && s->d1->next_timeout.tv_usec == 0)
-                {
+        if (s->d1->next_timeout.tv_sec == 0 && s->d1->next_timeout.tv_usec == 0) {
                 s->d1->timeout_duration = 1;
-                }
-        
+        }
+
         /* Set timeout to current time */
         get_current_time(&(s->d1->next_timeout));
 
         /* Add duration to current time */
         s->d1->next_timeout.tv_sec += s->d1->timeout_duration;
         BIO_ctrl(SSL_get_rbio(s), BIO_CTRL_DGRAM_SET_NEXT_TIMEOUT, 0, &(s->d1->next_timeout));
-        }
+}
 
-struct timeval* dtls1_get_timeout(SSL *s, struct timeval* timeleft)
-        {
+struct timeval*
+dtls1_get_timeout(SSL *s, struct timeval* timeleft) {
         struct timeval timenow;
 
         /* If no timeout is set, just return NULL */
-        if (s->d1->next_timeout.tv_sec == 0 && s->d1->next_timeout.tv_usec == 0)
-                {
+        if (s->d1->next_timeout.tv_sec == 0 && s->d1->next_timeout.tv_usec == 0) {
                 return NULL;
-                }
+        }
 
         /* Get current time */
         get_current_time(&timenow);
@@ -332,65 +329,63 @@ struct timeval* dtls1_get_timeout(SSL *s, struct timeval* timeleft)
         /* If timer already expired, set remaining time to 0 */
         if (s->d1->next_timeout.tv_sec < timenow.tv_sec ||
                 (s->d1->next_timeout.tv_sec == timenow.tv_sec &&
-                 s->d1->next_timeout.tv_usec <= timenow.tv_usec))
-                {
+        s->d1->next_timeout.tv_usec <= timenow.tv_usec)) {
                 memset(timeleft, 0, sizeof(struct timeval));
                 return timeleft;
-                }
+        }
 
         /* Calculate time left until timer expires */
         memcpy(timeleft, &(s->d1->next_timeout), sizeof(struct timeval));
         timeleft->tv_sec -= timenow.tv_sec;
         timeleft->tv_usec -= timenow.tv_usec;
-        if (timeleft->tv_usec < 0)
-                {
+        if (timeleft->tv_usec < 0) {
                 timeleft->tv_sec--;
                 timeleft->tv_usec += 1000000;
-                }
+        }
 
         /* If remaining time is less than 15 ms, set it to 0
          * to prevent issues because of small devergences with
          * socket timeouts.
          */
-        if (timeleft->tv_sec == 0 && timeleft->tv_usec < 15000)
-                {
+        if (timeleft->tv_sec == 0 && timeleft->tv_usec < 15000) {
                 memset(timeleft, 0, sizeof(struct timeval));
-                }
-        
+        }
+
 
         return timeleft;
-        }
+}
 
-int dtls1_is_timer_expired(SSL *s)
-        {
+int
+dtls1_is_timer_expired(SSL *s)
+{
         struct timeval timeleft;
 
         /* Get time left until timeout, return false if no timer running */
-        if (dtls1_get_timeout(s, &timeleft) == NULL)
-                {
+        if (dtls1_get_timeout(s, &timeleft) == NULL) {
                 return 0;
-                }
+        }
 
         /* Return false if timer is not expired yet */
-        if (timeleft.tv_sec > 0 || timeleft.tv_usec > 0)
-                {
+        if (timeleft.tv_sec > 0 || timeleft.tv_usec > 0) {
                 return 0;
-                }
+        }
 
-        /* Timer expired, so return true */     
+        /* Timer expired, so return true */
         return 1;
-        }
+}
 
-void dtls1_double_timeout(SSL *s)
-        {
+void
+dtls1_double_timeout(SSL *s)
+{
         s->d1->timeout_duration *= 2;
         if (s->d1->timeout_duration > 60)
                 s->d1->timeout_duration = 60;
         dtls1_start_timer(s);
-        }
+}
 
-void dtls1_stop_timer(SSL *s)
-        {
+void
+dtls1_stop_timer(SSL *s)
+{
         /* Reset everything */
         memset(&(s->d1->timeout), 0, sizeof(struct dtls1_timeout_st));
         memset(&(s->d1->next_timeout), 0, sizeof(struct timeval));
@@ -398,35 +393,35 @@ void dtls1_stop_timer(SSL *s)
         BIO_ctrl(SSL_get_rbio(s), BIO_CTRL_DGRAM_SET_NEXT_TIMEOUT, 0, &(s->d1->next_timeout));
         /* Clear retransmission buffer */
         dtls1_clear_record_buffer(s);
-        }
+}
 
-int dtls1_check_timeout_num(SSL *s)
-        {
+int
+dtls1_check_timeout_num(SSL *s)
+{
         s->d1->timeout.num_alerts++;
 
         /* Reduce MTU after 2 unsuccessful retransmissions */
-        if (s->d1->timeout.num_alerts > 2)
-                {
-                s->d1->mtu = BIO_ctrl(SSL_get_wbio(s), BIO_CTRL_DGRAM_GET_FALLBACK_MTU, 0, NULL);               
-                }
+        if (s->d1->timeout.num_alerts > 2) {
+                s->d1->mtu = BIO_ctrl(SSL_get_wbio(s), BIO_CTRL_DGRAM_GET_FALLBACK_MTU, 0, NULL);
 
-        if (s->d1->timeout.num_alerts > DTLS1_TMO_ALERT_COUNT)
-                {
+        }
+
+        if (s->d1->timeout.num_alerts > DTLS1_TMO_ALERT_COUNT) {
                 /* fail the connection, enough alerts have been sent */
-                SSLerr(SSL_F_DTLS1_CHECK_TIMEOUT_NUM,SSL_R_READ_TIMEOUT_EXPIRED);
+                SSLerr(SSL_F_DTLS1_CHECK_TIMEOUT_NUM, SSL_R_READ_TIMEOUT_EXPIRED);
                 return -1;
-                }
+        }
 
         return 0;
-        }
+}
 
-int dtls1_handle_timeout(SSL *s)
-        {
+int
+dtls1_handle_timeout(SSL *s)
+{
         /* if no timer is expired, don't do anything */
-        if (!dtls1_is_timer_expired(s))
-                {
+        if (!dtls1_is_timer_expired(s)) {
                 return 0;
-                }
+        }
 
         dtls1_double_timeout(s);
 
@@ -434,38 +429,39 @@ int dtls1_handle_timeout(SSL *s)
                 return -1;
 
         s->d1->timeout.read_timeouts++;
-        if (s->d1->timeout.read_timeouts > DTLS1_TMO_READ_COUNT)
-                {
+        if (s->d1->timeout.read_timeouts > DTLS1_TMO_READ_COUNT) {
                 s->d1->timeout.read_timeouts = 1;
-                }
+        }
 
 #ifndef OPENSSL_NO_HEARTBEATS
-        if (s->tlsext_hb_pending)
-                {
+        if (s->tlsext_hb_pending) {
                 s->tlsext_hb_pending = 0;
                 return dtls1_heartbeat(s);
-                }
+        }
 #endif
 
         dtls1_start_timer(s);
         return dtls1_retransmit_buffered_messages(s);
-        }
+}
 
-static void get_current_time(struct timeval *t)
+static void
+get_current_time(struct timeval *t)
 {
         gettimeofday(t, NULL);
 }
 
-int dtls1_listen(SSL *s, struct sockaddr *client)
-        {
+int
+dtls1_listen(SSL *s, struct sockaddr *client)
+{
         int ret;
 
         SSL_set_options(s, SSL_OP_COOKIE_EXCHANGE);
         s->d1->listen = 1;
 
         ret = SSL_accept(s);
-        if (ret <= 0) return ret;
-        
-        (void) BIO_dgram_get_peer(SSL_get_rbio(s), client);
+        if (ret <= 0)
+                return ret;
+
+        (void)BIO_dgram_get_peer(SSL_get_rbio(s), client);
         return 1;
-        }
+}