summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Ahern <william@25thandClement.com>2015-12-17 16:08:32 +0800
committerWilliam Ahern <william@25thandClement.com>2015-12-17 16:08:32 +0800
commitb18972627b8501f170d389b317f6339b98eb0b79 (patch)
tree4f97056b74101114ea9be75c6d48e4909a881dab
parent0420baf6eb0106b146dd33d016cf8521cf017bed (diff)
parent0c212adc7ee1f2ec2edb9111b4e4d3072839eeac (diff)
downloadluaossl-b18972627b8501f170d389b317f6339b98eb0b79.tar.gz
luaossl-b18972627b8501f170d389b317f6339b98eb0b79.tar.bz2
luaossl-b18972627b8501f170d389b317f6339b98eb0b79.zip
Merge branch 'daurnimator-no-ssl3'
-rw-r--r--src/openssl.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/openssl.c b/src/openssl.c
index cb7470a..a5e1a52 100644
--- a/src/openssl.c
+++ b/src/openssl.c
@@ -5443,9 +5443,11 @@ static int sx_new(lua_State *L) {
5443 method = (srv)? &SSLv2_server_method : &SSLv2_client_method; 5443 method = (srv)? &SSLv2_server_method : &SSLv2_client_method;
5444 break; 5444 break;
5445#endif 5445#endif
5446#ifndef OPENSSL_NO_SSL3
5446 case 3: /* SSLv3 */ 5447 case 3: /* SSLv3 */
5447 method = (srv)? &SSLv3_server_method : &SSLv3_client_method; 5448 method = (srv)? &SSLv3_server_method : &SSLv3_client_method;
5448 break; 5449 break;
5450#endif
5449 case 4: /* SSLv23 */ 5451 case 4: /* SSLv23 */
5450 method = (srv)? &SSLv23_server_method : &SSLv23_client_method; 5452 method = (srv)? &SSLv23_server_method : &SSLv23_client_method;
5451 break; 5453 break;