diff options
| author | Doug Hogan <doug@cvs.openbsd.org> | 2015-07-19 06:31:33 +0000 |
|---|---|---|
| committer | Doug Hogan <doug@cvs.openbsd.org> | 2015-07-19 06:31:33 +0000 |
| commit | ce86bdc6a6421923bc7b5ba6012f4b4b116d7abe (patch) | |
| tree | f0c6f1d9bd9496f0f4282ce82c05b18cf516b583 /lib/libssl/ssl_locl.h | |
| parent | 194eff3909dfacb16867c0b1644b69fec7bcd60b (diff) | |
Add TLS_method, TLS_client_method and TLS_server_method.
Use these instead of SSLv23_*method when you want to make sure TLS is
used.
By default, we disable SSLv3 but it's still possible for the user to
re-enable it. TLS_*method does not allow SSLv3.
Both BoringSSL and (next version of) OpenSSL have these methods.
However, they have changed the implementation significantly. We will
as well, but not right now.
Riding the libssl major bump.
ok miod@ bcook@
Diffstat (limited to 'lib/libssl/ssl_locl.h')
| -rw-r--r-- | lib/libssl/ssl_locl.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/libssl/ssl_locl.h b/lib/libssl/ssl_locl.h index ba8fc799645..1c78770dfa5 100644 --- a/lib/libssl/ssl_locl.h +++ b/lib/libssl/ssl_locl.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl_locl.h,v 1.97 2015/07/18 23:00:23 doug Exp $ */ +/* $OpenBSD: ssl_locl.h,v 1.98 2015/07/19 06:31:32 doug Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -757,6 +757,8 @@ int ssl23_accept(SSL *s); int ssl23_connect(SSL *s); int ssl23_read_bytes(SSL *s, int n); int ssl23_write_bytes(SSL *s); +int tls_accept(SSL *s); +int tls_connect(SSL *s); int tls1_new(SSL *s); void tls1_free(SSL *s); |