|
|
@ -187,7 +187,7 @@ be_tls_init(bool isServerStart) |
|
|
|
SSL_CTX_set_options(context, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3); |
|
|
|
SSL_CTX_set_options(context, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3); |
|
|
|
|
|
|
|
|
|
|
|
/* disallow SSL session tickets */ |
|
|
|
/* disallow SSL session tickets */ |
|
|
|
#ifdef SSL_OP_NO_TICKET /* added in openssl 0.9.8f */ |
|
|
|
#ifdef SSL_OP_NO_TICKET /* added in OpenSSL 0.9.8f */ |
|
|
|
SSL_CTX_set_options(context, SSL_OP_NO_TICKET); |
|
|
|
SSL_CTX_set_options(context, SSL_OP_NO_TICKET); |
|
|
|
#endif |
|
|
|
#endif |
|
|
|
|
|
|
|
|
|
|
@ -638,7 +638,7 @@ be_tls_write(Port *port, void *ptr, size_t len, int *waitfor) |
|
|
|
* Private substitute BIO: this does the sending and receiving using send() and |
|
|
|
* Private substitute BIO: this does the sending and receiving using send() and |
|
|
|
* recv() instead. This is so that we can enable and disable interrupts |
|
|
|
* recv() instead. This is so that we can enable and disable interrupts |
|
|
|
* just while calling recv(). We cannot have interrupts occurring while |
|
|
|
* just while calling recv(). We cannot have interrupts occurring while |
|
|
|
* the bulk of openssl runs, because it uses malloc() and possibly other |
|
|
|
* the bulk of OpenSSL runs, because it uses malloc() and possibly other |
|
|
|
* non-reentrant libc facilities. We also need to call send() and recv() |
|
|
|
* non-reentrant libc facilities. We also need to call send() and recv() |
|
|
|
* directly so it gets passed through the socket/signals layer on Win32. |
|
|
|
* directly so it gets passed through the socket/signals layer on Win32. |
|
|
|
* |
|
|
|
* |
|
|
@ -736,7 +736,7 @@ my_BIO_s_socket(void) |
|
|
|
return my_bio_methods; |
|
|
|
return my_bio_methods; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
/* This should exactly match openssl's SSL_set_fd except for using my BIO */ |
|
|
|
/* This should exactly match OpenSSL's SSL_set_fd except for using my BIO */ |
|
|
|
static int |
|
|
|
static int |
|
|
|
my_SSL_set_fd(Port *port, int fd) |
|
|
|
my_SSL_set_fd(Port *port, int fd) |
|
|
|
{ |
|
|
|
{ |
|
|
|