update FAQ

[openssl.git] / ssl / d1_lib.c

diff --git a/ssl/d1_lib.c b/ssl/d1_lib.c
index 0e7f5331db94be2405a52c5216e9eb69ec21c99b..2b066e01651e396715c1730ac4561db9148c362c 100644 (file)
--- a/ssl/d1_lib.c
+++ b/ssl/d1_lib.c
@@ -62,16 +62,18 @@
 #include <openssl/objects.h>
 #include "ssl_locl.h"
 
 #include <openssl/objects.h>
 #include "ssl_locl.h"
 

-#if defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_VMS)
+#if defined(OPENSSL_SYS_VMS)

 #include <sys/timeb.h>
 #endif
 
 static void get_current_time(struct timeval *t);
 #include <sys/timeb.h>
 #endif
 
 static void get_current_time(struct timeval *t);

+static void dtls1_set_handshake_header(SSL *s, int type, unsigned long len);
+static int dtls1_handshake_write(SSL *s);

 const char dtls1_version_str[]="DTLSv1" OPENSSL_VERSION_PTEXT;
 int dtls1_listen(SSL *s, struct sockaddr *client);
 
 SSL3_ENC_METHOD DTLSv1_enc_data={
 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,
+       tls1_enc,

        tls1_mac,
        tls1_setup_key_block,
        tls1_generate_master_secret,
        tls1_mac,
        tls1_setup_key_block,
        tls1_generate_master_secret,


@@ -82,6 +84,31 @@ SSL3_ENC_METHOD DTLSv1_enc_data={
        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,
        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,
+       SSL_ENC_FLAG_DTLS|SSL_ENC_FLAG_EXPLICIT_IV,
+       DTLS1_HM_HEADER_LENGTH,
+       dtls1_set_handshake_header,
+       dtls1_handshake_write   
+       };
+
+SSL3_ENC_METHOD DTLSv1_2_enc_data={
+       tls1_enc,
+       tls1_mac,
+       tls1_setup_key_block,
+       tls1_generate_master_secret,
+       tls1_change_cipher_state,
+       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,
+       tls1_alert_code,
+       tls1_export_keying_material,
+       SSL_ENC_FLAG_DTLS|SSL_ENC_FLAG_EXPLICIT_IV|SSL_ENC_FLAG_SIGALGS
+               |SSL_ENC_FLAG_SHA256_PRF|SSL_ENC_FLAG_TLS1_2_CIPHERS,
+       DTLS1_HM_HEADER_LENGTH,
+       dtls1_set_handshake_header,
+       dtls1_handshake_write   

        };
 
 long dtls1_default_timeout(void)
        };
 
 long dtls1_default_timeout(void)


@@ -129,26 +156,33 @@ int dtls1_new(SSL *s)
        return(1);
        }
 
        return(1);
        }
 

-void dtls1_free(SSL *s)
+static void dtls1_clear_queues(SSL *s)

        {
     pitem *item = NULL;
     hm_fragment *frag = NULL;
        {
     pitem *item = NULL;
     hm_fragment *frag = NULL;

-
-       ssl3_free(s);
+       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)
+                       {
+                       OPENSSL_free(rdata->rbuf.buf);
+                       }

         OPENSSL_free(item->data);
         pitem_free(item);
         }
         OPENSSL_free(item->data);
         pitem_free(item);
         }

-    pqueue_free(s->d1->unprocessed_rcds.q);

 
     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)
+                       {
+                       OPENSSL_free(rdata->rbuf.buf);
+                       }

         OPENSSL_free(item->data);
         pitem_free(item);
         }
         OPENSSL_free(item->data);
         pitem_free(item);
         }

-    pqueue_free(s->d1->processed_rcds.q);

 
     while( (item = pqueue_pop(s->d1->buffered_messages)) != NULL)
         {
 
     while( (item = pqueue_pop(s->d1->buffered_messages)) != NULL)
         {


@@ -157,7 +191,6 @@ void dtls1_free(SSL *s)
         OPENSSL_free(frag);
         pitem_free(item);
         }
         OPENSSL_free(frag);
         pitem_free(item);
         }

-    pqueue_free(s->d1->buffered_messages);

 
     while ( (item = pqueue_pop(s->d1->sent_messages)) != NULL)
         {
 
     while ( (item = pqueue_pop(s->d1->sent_messages)) != NULL)
         {


@@ -166,7 +199,6 @@ void dtls1_free(SSL *s)
         OPENSSL_free(frag);
         pitem_free(item);
         }
         OPENSSL_free(frag);
         pitem_free(item);
         }

-       pqueue_free(s->d1->sent_messages);

 
        while ( (item = pqueue_pop(s->d1->buffered_app_data.q)) != NULL)
                {
 
        while ( (item = pqueue_pop(s->d1->buffered_app_data.q)) != NULL)
                {


@@ -175,18 +207,70 @@ void dtls1_free(SSL *s)
                OPENSSL_free(frag);
                pitem_free(item);
                }
                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);
 
        OPENSSL_free(s->d1);
        pqueue_free(s->d1->buffered_app_data.q);
 
        OPENSSL_free(s->d1);

+       s->d1 = NULL;

        }
 
 void dtls1_clear(SSL *s)
        {
        }
 
 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;
        ssl3_clear(s);
        if (s->options & SSL_OP_CISCO_ANYCONNECT)
                s->version=DTLS1_BAD_VER;

+       else if (s->method->version == DTLS_ANY_VERSION)
+               s->version=DTLS1_2_VERSION;

        else
        else

-               s->version=DTLS1_VERSION;
+               s->version=s->method->version;

        }
 
 long dtls1_ctrl(SSL *s, int cmd, long larg, void *parg)
        }
 
 long dtls1_ctrl(SSL *s, int cmd, long larg, void *parg)


@@ -237,6 +321,15 @@ const SSL_CIPHER *dtls1_get_cipher(unsigned int u)
 
 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)))
+               {
+               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 timer is not set, initialize duration with 1 second */
        if (s->d1->next_timeout.tv_sec == 0 && s->d1->next_timeout.tv_usec == 0)
                {


@@ -327,6 +420,7 @@ void dtls1_double_timeout(SSL *s)
 void dtls1_stop_timer(SSL *s)
        {
        /* Reset everything */
 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));
        s->d1->timeout_duration = 1;
        BIO_ctrl(SSL_get_rbio(s), BIO_CTRL_DGRAM_SET_NEXT_TIMEOUT, 0, &(s->d1->next_timeout));
        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));


@@ -334,10 +428,28 @@ void dtls1_stop_timer(SSL *s)
        dtls1_clear_record_buffer(s);
        }
 
        dtls1_clear_record_buffer(s);
        }
 

-int dtls1_handle_timeout(SSL *s)
+int dtls1_check_timeout_num(SSL *s)

        {
        {

-       DTLS1_STATE *state;
+       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 > DTLS1_TMO_ALERT_COUNT)
+               {
+               /* fail the connection, enough alerts have been sent */
+               SSLerr(SSL_F_DTLS1_CHECK_TIMEOUT_NUM,SSL_R_READ_TIMEOUT_EXPIRED);
+               return -1;
+               }
+
+       return 0;
+       }
+
+int dtls1_handle_timeout(SSL *s)
+       {

        /* if no timer is expired, don't do anything */
        if (!dtls1_is_timer_expired(s))
                {
        /* if no timer is expired, don't do anything */
        if (!dtls1_is_timer_expired(s))
                {


@@ -345,20 +457,23 @@ int dtls1_handle_timeout(SSL *s)
                }
 
        dtls1_double_timeout(s);
                }
 
        dtls1_double_timeout(s);

-       state = s->d1;
-       state->timeout.num_alerts++;
-       if ( state->timeout.num_alerts > DTLS1_TMO_ALERT_COUNT)
+
+       if (dtls1_check_timeout_num(s) < 0)
+               return -1;
+
+       s->d1->timeout.read_timeouts++;
+       if (s->d1->timeout.read_timeouts > DTLS1_TMO_READ_COUNT)

                {
                {

-               /* fail the connection, enough alerts have been sent */
-               SSLerr(SSL_F_DTLS1_HANDLE_TIMEOUT,SSL_R_READ_TIMEOUT_EXPIRED);
-               return 0;
+               s->d1->timeout.read_timeouts = 1;

                }
 
                }
 

-       state->timeout.read_timeouts++;
-       if ( state->timeout.read_timeouts > DTLS1_TMO_READ_COUNT)
+#ifndef OPENSSL_NO_HEARTBEATS
+       if (s->tlsext_hb_pending)

                {
                {

-               state->timeout.read_timeouts = 1;
+               s->tlsext_hb_pending = 0;
+               return dtls1_heartbeat(s);

                }
                }

+#endif

 
        dtls1_start_timer(s);
        return dtls1_retransmit_buffered_messages(s);
 
        dtls1_start_timer(s);
        return dtls1_retransmit_buffered_messages(s);


@@ -366,11 +481,15 @@ int dtls1_handle_timeout(SSL *s)
 
 static void get_current_time(struct timeval *t)
 {
 
 static void get_current_time(struct timeval *t)
 {

-#ifdef OPENSSL_SYS_WIN32
-       struct _timeb tb;
-       _ftime(&tb);
-       t->tv_sec = (long)tb.time;
-       t->tv_usec = (long)tb.millitm * 1000;
+#if defined(_WIN32)
+       SYSTEMTIME st;
+       union { unsigned __int64 ul; FILETIME ft; } now;
+
+       GetSystemTime(&st);
+       SystemTimeToFileTime(&st,&now.ft);
+       now.ul -= 116444736000000000UI64;       /* re-bias to 1/1/1970 */
+       t->tv_sec  = (long)(now.ul/10000000);
+       t->tv_usec = ((int)(now.ul%10000000))/10;

 #elif defined(OPENSSL_SYS_VMS)
        struct timeb tb;
        ftime(&tb);
 #elif defined(OPENSSL_SYS_VMS)
        struct timeb tb;
        ftime(&tb);


@@ -394,3 +513,18 @@ int dtls1_listen(SSL *s, struct sockaddr *client)
        (void) BIO_dgram_get_peer(SSL_get_rbio(s), client);
        return 1;
        }
        (void) BIO_dgram_get_peer(SSL_get_rbio(s), client);
        return 1;
        }

+
+static void dtls1_set_handshake_header(SSL *s, int htype, unsigned long len)
+       {
+       unsigned char *p = (unsigned char *)s->init_buf->data;
+       dtls1_set_message_header(s, p, htype, len, 0, len);
+       s->init_num = (int)len + DTLS1_HM_HEADER_LENGTH;
+       s->init_off = 0;
+       /* Buffer the message to handle re-xmits */
+       dtls1_buffer_message(s, 0);
+       }
+
+static int dtls1_handshake_write(SSL *s)
+       {
+       return dtls1_do_write(s, SSL3_RT_HANDSHAKE);
+       }