Commit 9289f21b authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Update from 1.0.0 stable branch.

parent d3d4f9f5

crypto/bio/bss_dgram.c

+2 −0
Original line number Diff line number Diff line
@@ -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);

ssl/d1_lib.c

+1 −0
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ 
 */



#include <stdio.h>

#define USE_SOCKETS

#include <openssl/objects.h>

#include "ssl_locl.h"

ssl/ssl_locl.h

+4 −0
Original line number Diff line number Diff line
@@ -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 */