summaryrefslogtreecommitdiff
path: root/src/lib/libssl/ssl_locl.h
diff options
context:
space:
mode:
authordoug <>2015-07-19 06:31:32 +0000
committerdoug <>2015-07-19 06:31:32 +0000
commit915e1bd09b87e5d7402cab53ddc89bd039968fd4 (patch)
treee880527a1af6d90c596c3aef10956ea51a3d268e /src/lib/libssl/ssl_locl.h
parentb3d9b986084188c42954e6d52677fe5f9b37f0e7 (diff)
downloadopenbsd-915e1bd09b87e5d7402cab53ddc89bd039968fd4.tar.gz
openbsd-915e1bd09b87e5d7402cab53ddc89bd039968fd4.tar.bz2
openbsd-915e1bd09b87e5d7402cab53ddc89bd039968fd4.zip
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 'src/lib/libssl/ssl_locl.h')
-rw-r--r--src/lib/libssl/ssl_locl.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/lib/libssl/ssl_locl.h b/src/lib/libssl/ssl_locl.h
index ba8fc79964..1c78770dfa 100644
--- a/src/lib/libssl/ssl_locl.h
+++ b/src/lib/libssl/ssl_locl.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssl_locl.h,v 1.97 2015/07/18 23:00:23 doug Exp $ */ 1/* $OpenBSD: ssl_locl.h,v 1.98 2015/07/19 06:31:32 doug Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -757,6 +757,8 @@ int ssl23_accept(SSL *s);
757int ssl23_connect(SSL *s); 757int ssl23_connect(SSL *s);
758int ssl23_read_bytes(SSL *s, int n); 758int ssl23_read_bytes(SSL *s, int n);
759int ssl23_write_bytes(SSL *s); 759int ssl23_write_bytes(SSL *s);
760int tls_accept(SSL *s);
761int tls_connect(SSL *s);
760 762
761int tls1_new(SSL *s); 763int tls1_new(SSL *s);
762void tls1_free(SSL *s); 764void tls1_free(SSL *s);