Upgrade chrome's OpenSSL to same version Android ships with.

openssl/ssl/d1_lib.c

 /* ssl/d1_lib.c */
 /* 
  * DTLS implementation written by Nagendra Modadugu
  * (nagendra@cs.stanford.edu) for the OpenSSL project 2005.  
  */
 /* ====================================================================
  * Copyright (c) 1999-2005 The OpenSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ skipping 73 matching lines @@
         tls1_alert_code,
         };
 
 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);
         }
 
-IMPLEMENT_dtls1_meth_func(dtlsv1_base_method,
-                        ssl_undefined_function,
-                        ssl_undefined_function,
-                        ssl_bad_method)
-
 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);
 
         /* d1->handshake_epoch=0; */
-#if defined(OPENSSL_SYS_VMS) || defined(VMS_TEST)
-        d1->bitmap.length=64;
-#else
-        d1->bitmap.length=sizeof(d1->bitmap.map) * 8;
-#endif
-        pq_64bit_init(&(d1->bitmap.map));
-        pq_64bit_init(&(d1->bitmap.max_seq_num));
-        
-        d1->next_bitmap.length = d1->bitmap.length;
-        pq_64bit_init(&(d1->next_bitmap.map));
-        pq_64bit_init(&(d1->next_bitmap.max_seq_num));
 
         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();
 
         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);
                 OPENSSL_free(d1);
                 return (0);
                 }
 
         s->d1=d1;
         s->method->ssl_clear(s);
         return(1);
         }
 
-void dtls1_free(SSL *s)
+static void dtls1_clear_queues(SSL *s)
         {
     pitem *item = NULL;
     hm_fragment *frag = NULL;
-
-        ssl3_free(s);
+        DTLS1_RECORD_DATA *rdata;
 
     while( (item = pqueue_pop(s->d1->unprocessed_rcds.q)) != NULL)
         {
+                rdata = (DTLS1_RECORD_DATA *) item->data;
+                if (rdata->rbuf.buf)
+                        {
+                        OPENSSL_free(rdata->rbuf.buf);
+                        }
         OPENSSL_free(item->data);
         pitem_free(item);
         }
-    pqueue_free(s->d1->unprocessed_rcds.q);
 
     while( (item = pqueue_pop(s->d1->processed_rcds.q)) != NULL)
         {
+                rdata = (DTLS1_RECORD_DATA *) item->data;
+                if (rdata->rbuf.buf)
+                        {
+                        OPENSSL_free(rdata->rbuf.buf);
+                        }
         OPENSSL_free(item->data);
         pitem_free(item);
         }
-    pqueue_free(s->d1->processed_rcds.q);
 
     while( (item = pqueue_pop(s->d1->buffered_messages)) != NULL)
         {
         frag = (hm_fragment *)item->data;
         OPENSSL_free(frag->fragment);
         OPENSSL_free(frag);
         pitem_free(item);
         }
-    pqueue_free(s->d1->buffered_messages);
 
     while ( (item = pqueue_pop(s->d1->sent_messages)) != NULL)
         {
         frag = (hm_fragment *)item->data;
         OPENSSL_free(frag->fragment);
         OPENSSL_free(frag);
         pitem_free(item);
         }
-        pqueue_free(s->d1->sent_messages);
 
         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->sent_messages);
         pqueue_free(s->d1->buffered_app_data.q);
-        
-        pq_64bit_free(&(s->d1->bitmap.map));
-        pq_64bit_free(&(s->d1->bitmap.max_seq_num));
-
-        pq_64bit_free(&(s->d1->next_bitmap.map));
-        pq_64bit_free(&(s->d1->next_bitmap.max_seq_num));
 
         OPENSSL_free(s->d1);
         }
 
 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)
+                {
+                unprocessed_rcds = s->d1->unprocessed_rcds.q;
+                processed_rcds = s->d1->processed_rcds.q;
+                buffered_messages = s->d1->buffered_messages;
+                sent_messages = s->d1->sent_messages;
+                buffered_app_data = s->d1->buffered_app_data.q;
+                mtu = s->d1->mtu;
+
+                dtls1_clear_queues(s);
+
+                memset(s->d1, 0, sizeof(*(s->d1)));
+
+                if (s->server)
+                        {
+                        s->d1->cookie_len = sizeof(s->d1->cookie);
+                        }
+
+                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;
         else
                 s->version=DTLS1_VERSION;
         }
 
 long dtls1_ctrl(SSL *s, int cmd, long larg, void *parg)
         {
         int ret=0;
@@ skipping 20 matching lines @@
         return(ret);
         }
 
 /*
  * As it's impossible to use stream ciphers in "datagram" mode, this
  * simple filter is designed to disengage them in DTLS. Unfortunately
  * there is no universal way to identify stream SSL_CIPHER, so we have
  * to explicitly list their SSL_* codes. Currently RC4 is the only one
  * available, but if new ones emerge, they will have to be added...
  */
-SSL_CIPHER *dtls1_get_cipher(unsigned int u)
+const SSL_CIPHER *dtls1_get_cipher(unsigned int u)
         {
-        SSL_CIPHER *ciph = ssl3_get_cipher(u);
+        const SSL_CIPHER *ciph = ssl3_get_cipher(u);
 
         if (ciph != NULL)
                 {
-                if ((ciph->algorithms&SSL_ENC_MASK) == SSL_RC4)
+                if (ciph->algorithm_enc == SSL_RC4)
                         return NULL;
                 }
 
         return ciph;
         }
 
 void dtls1_start_timer(SSL *s)
         {
         /* 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)
@@ skipping 81 matching lines @@
                 s->d1->timeout_duration = 60;
         dtls1_start_timer(s);
         }
 
 void dtls1_stop_timer(SSL *s)
         {
         /* Reset everything */
         memset(&(s->d1->next_timeout), 0, sizeof(struct timeval));
         s->d1->timeout_duration = 1;
         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_handle_timeout(SSL *s)
         {
         DTLS1_STATE *state;
 
         /* if no timer is expired, don't do anything */
         if (!dtls1_is_timer_expired(s))
                 {
                 return 0;
                 }
 
         dtls1_double_timeout(s);
         state = s->d1;
         state->timeout.num_alerts++;
         if ( state->timeout.num_alerts > DTLS1_TMO_ALERT_COUNT)
                 {
                 /* fail the connection, enough alerts have been sent */
                 SSLerr(SSL_F_DTLS1_HANDLE_TIMEOUT,SSL_R_READ_TIMEOUT_EXPIRED);
-                return 0;
+                return -1;
                 }
 
         state->timeout.read_timeouts++;
         if ( state->timeout.read_timeouts > DTLS1_TMO_READ_COUNT)
                 {
                 state->timeout.read_timeouts = 1;
                 }
 
         dtls1_start_timer(s);
         return dtls1_retransmit_buffered_messages(s);
@@ skipping 22 matching lines @@
 
         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);
         return 1;
         }