From: Dr. Stephen Henson <steve@openssl.org>
Date: Sat, 16 May 2009 11:15:42 +0000 (+0000)
Subject: Update from 1.0.0 stable branch.
X-Git-Tag: OpenSSL-fips-2_0-rc1~1663
X-Git-Url: https://git.openssl.org/?p=openssl.git;a=commitdiff_plain;h=9289f21b7d2985087c826188bd2efc92cbd9cb85;hp=d3d4f9f5e9c592c661604d0f5995e6ac2f8507e9

Update from 1.0.0 stable branch.
---

diff --git a/crypto/bio/bss_dgram.c b/crypto/bio/bss_dgram.c
index 1e4666822f..3d08102ea3 100644
--- 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 62b7702a38..6450c1de85 100644
--- 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 c2e74f18bc..2b362a48ea 100644
--- 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 */