You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
49 lines
1.3 KiB
49 lines
1.3 KiB
From 8212b89f1a04023b431d2fc9bc12aca02394698f Mon Sep 17 00:00:00 2001
|
|
From: Bruno Silvestre <bruno.silvestre@gmail.com>
|
|
Date: Fri, 29 Jun 2018 14:02:39 -0300
|
|
Subject: [PATCH 1/3] Using 'const SSL_METHOD*'
|
|
|
|
This change was introduced in OpenSSL 1.0.0.
|
|
Start droping 0.9.8 code.
|
|
---
|
|
src/context.c | 10 ++--------
|
|
1 file changed, 2 insertions(+), 8 deletions(-)
|
|
|
|
diff --git a/src/context.c b/src/context.c
|
|
index a2b5ae5..b9e8cda 100644
|
|
--- a/src/context.c
|
|
+++ b/src/context.c
|
|
@@ -29,12 +29,6 @@
|
|
#include "ec.h"
|
|
#endif
|
|
|
|
-#if (OPENSSL_VERSION_NUMBER >= 0x1000000fL)
|
|
-typedef const SSL_METHOD LSEC_SSL_METHOD;
|
|
-#else
|
|
-typedef SSL_METHOD LSEC_SSL_METHOD;
|
|
-#endif
|
|
-
|
|
/*--------------------------- Auxiliary Functions ----------------------------*/
|
|
|
|
/**
|
|
@@ -68,7 +62,7 @@ static int set_option_flag(const char *opt, unsigned long *flag)
|
|
/**
|
|
* Find the protocol.
|
|
*/
|
|
-static LSEC_SSL_METHOD* str2method(const char *method)
|
|
+static const SSL_METHOD* str2method(const char *method)
|
|
{
|
|
if (!strcmp(method, "any")) return SSLv23_method();
|
|
if (!strcmp(method, "sslv23")) return SSLv23_method(); // deprecated
|
|
@@ -287,7 +281,7 @@ static int create(lua_State *L)
|
|
{
|
|
p_context ctx;
|
|
const char *str_method;
|
|
- LSEC_SSL_METHOD *method;
|
|
+ const SSL_METHOD *method;
|
|
|
|
str_method = luaL_checkstring(L, 1);
|
|
method = str2method(str_method);
|
|
--
|
|
2.19.1
|
|
|