Update from 1.0.0 stable branch.
authorDr. Stephen Henson <steve@openssl.org>
Sat, 16 May 2009 11:15:42 +0000 (11:15 +0000)
committerDr. Stephen Henson <steve@openssl.org>
Sat, 16 May 2009 11:15:42 +0000 (11:15 +0000)
crypto/bio/bss_dgram.c
ssl/d1_lib.c
ssl/ssl_locl.h

index 1e46668..3d08102 100644 (file)
@@ -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();
                                }
                                BIO_set_retry_read(b);
                                data->_errno = get_last_socket_error();
                                }
+#if 0
                        memset(&(data->hstimeout), 0, sizeof(struct timeval));
                        memset(&(data->hstimeout), 0, sizeof(struct timeval));
+#endif
                        }
                }
        return(ret);
                        }
                }
        return(ret);
index 62b7702..6450c1d 100644 (file)
@@ -58,6 +58,7 @@
  */
 
 #include <stdio.h>
  */
 
 #include <stdio.h>
+#define USE_SOCKETS
 #include <openssl/objects.h>
 #include "ssl_locl.h"
 
 #include <openssl/objects.h>
 #include "ssl_locl.h"
 
index c2e74f1..2b362a4 100644 (file)
@@ -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);
 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 */
 
 
 /* some client-only functions */