Update from 1.0.0 stable branch.

This commit is contained in:
Dr. Stephen Henson 2009-05-16 11:15:42 +00:00
parent d3d4f9f5e9
commit 9289f21b7d
3 changed files with 7 additions and 0 deletions

View file

@ -289,7 +289,9 @@ static int dgram_read(BIO *b, char *out, int outl)
BIO_set_retry_read(b); BIO_set_retry_read(b);
data->_errno = get_last_socket_error(); 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);

View file

@ -58,6 +58,7 @@
*/ */
#include <stdio.h> #include <stdio.h>
#define USE_SOCKETS
#include <openssl/objects.h> #include <openssl/objects.h>
#include "ssl_locl.h" #include "ssl_locl.h"

View file

@ -944,6 +944,10 @@ void dtls1_reset_seq_numbers(SSL *s, int rw);
long dtls1_default_timeout(void); long dtls1_default_timeout(void);
struct timeval* dtls1_get_timeout(SSL *s, struct timeval* timeleft); struct timeval* dtls1_get_timeout(SSL *s, struct timeval* timeleft);
const SSL_CIPHER *dtls1_get_cipher(unsigned int u); 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 */