summaryrefslogtreecommitdiffstats
path: root/ssl/ssl_locl.h
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2010-06-27 14:22:11 +0000
committerDr. Stephen Henson <steve@openssl.org>2010-06-27 14:22:11 +0000
commitb4b15f68c01c4bf4557db5ff6180623411540b52 (patch)
treedc8969be13937ea8b79125e68494497474c2b1ab /ssl/ssl_locl.h
parent1eb1cf452b1263373ff3f7c91b9419adca8c3ba8 (diff)
Backport TLS v1.1 support from HEAD, ssl/ changes
Diffstat (limited to 'ssl/ssl_locl.h')
-rw-r--r--ssl/ssl_locl.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/ssl/ssl_locl.h b/ssl/ssl_locl.h
index 4c78393f3f..41f0f77597 100644
--- a/ssl/ssl_locl.h
+++ b/ssl/ssl_locl.h
@@ -591,11 +591,12 @@ extern SSL3_ENC_METHOD TLSv1_enc_data;
extern SSL3_ENC_METHOD SSLv3_enc_data;
extern SSL3_ENC_METHOD DTLSv1_enc_data;
-#define IMPLEMENT_tls1_meth_func(func_name, s_accept, s_connect, s_get_meth) \
+#define IMPLEMENT_tls_meth_func(version, func_name, s_accept, s_connect, \
+ s_get_meth) \
const SSL_METHOD *func_name(void) \
{ \
static const SSL_METHOD func_name##_data= { \
- TLS1_VERSION, \
+ version, \
tls1_new, \
tls1_clear, \
tls1_free, \
@@ -669,7 +670,7 @@ const SSL_METHOD *func_name(void) \
const SSL_METHOD *func_name(void) \
{ \
static const SSL_METHOD func_name##_data= { \
- TLS1_VERSION, \
+ TLS1_1_VERSION, \
tls1_new, \
tls1_clear, \
tls1_free, \