From ddec278512b285d0786666208b7c75c86d1b2216 Mon Sep 17 00:00:00 2001 From: Vladislav Grishenko Date: Thu, 25 Oct 2018 03:36:20 +0500 Subject: sstp: improve openssl 1.1.x compatibility --- accel-pppd/ctrl/sstp/sstp.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/accel-pppd/ctrl/sstp/sstp.c b/accel-pppd/ctrl/sstp/sstp.c index e60d2cb0..6f660d9d 100644 --- a/accel-pppd/ctrl/sstp/sstp.c +++ b/accel-pppd/ctrl/sstp/sstp.c @@ -2358,7 +2358,11 @@ static void ssl_load_config(struct sstp_serv_t *serv, const char *servername) opt = conf_get_opt("sstp", "accept"); if (opt && strhas(opt, "ssl", ',')) { legacy_ssl: +#if OPENSSL_VERSION_NUMBER >= 0x10100000L + ssl_ctx = SSL_CTX_new(TLS_server_method()); +#else ssl_ctx = SSL_CTX_new(SSLv23_server_method()); +#endif if (!ssl_ctx) { log_error("sstp: SSL_CTX error: %s\n", ERR_error_string(ERR_get_error(), NULL)); goto error; @@ -2372,7 +2376,7 @@ static void ssl_load_config(struct sstp_serv_t *serv, const char *servername) SSL_OP_SINGLE_DH_USE | #endif #ifndef OPENSSL_NO_ECDH - SSL_OP_SINGLE_ECDH_USE | + SSL_OP_SINGLE_ECDH_USE | #endif SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3 | -- cgit v1.2.3