Update from 1.0.0 stable branch.

diff --git a/crypto/bio/bss_dgram.c b/crypto/bio/bss_dgram.c
index 1e4666822ffe3cf5709bf11644d42eeb59e17734..3d08102ea37ce2ff026bf720bd6f970c0e2c3fd1 100644 (file)
--- a/crypto/bio/bss_dgram.c
+++ b/crypto/bio/bss_dgram.c
@@ -289,7 +289,9 @@ static int dgram_read(BIO *b, char *out, int outl)
                                BIO_set_retry_read(b);
                                data->_errno = get_last_socket_error();
                                }
+#if 0
                        memset(&(data->hstimeout), 0, sizeof(struct timeval));
+#endif
                        }
                }
        return(ret);

diff --git a/ssl/d1_lib.c b/ssl/d1_lib.c
index 62b7702a3820b1162d31c61dc549641e046e83dc..6450c1de850b2d3e63b7b1dac2e902c43b9f7153 100644 (file)
--- a/ssl/d1_lib.c
+++ b/ssl/d1_lib.c
@@ -58,6 +58,7 @@
  */
 
 #include <stdio.h>
+#define USE_SOCKETS
 #include <openssl/objects.h>
 #include "ssl_locl.h"
 

diff --git a/ssl/ssl_locl.h b/ssl/ssl_locl.h
index c2e74f18bca0c8e0d0040be37f5793096d581664..2b362a48ea1cd602f09c51619a6e1eb3187fa84e 100644 (file)
--- a/ssl/ssl_locl.h
+++ b/ssl/ssl_locl.h
@@ -944,6 +944,10 @@ void dtls1_reset_seq_numbers(SSL *s, int rw);
 long dtls1_default_timeout(void);
 struct timeval* dtls1_get_timeout(SSL *s, struct timeval* timeleft);
 const SSL_CIPHER *dtls1_get_cipher(unsigned int u);
+void dtls1_start_timer(SSL *s);
+void dtls1_stop_timer(SSL *s);
+int dtls1_is_timer_expired(SSL *s);
+void dtls1_double_timeout(SSL *s);
 
 
 /* some client-only functions */