From f15902a76e0f3ff0151fb34dcfae2db75a2f5fb7 Mon Sep 17 00:00:00 2001 From: Tobias Markmann Date: Tue, 17 Sep 2019 10:28:22 +0200 Subject: Fix casing of enums to avoid conflict on Windows Test-Information: Tested on Windows with OpenSSL that this fixes the compilation issue. Change-Id: I01887c8eb758a6c1c208244cdae32aa9c0a99565 diff --git a/Swiften/TLS/OpenSSL/OpenSSLContext.cpp b/Swiften/TLS/OpenSSL/OpenSSLContext.cpp index e585766..5c80976 100644 --- a/Swiften/TLS/OpenSSL/OpenSSLContext.cpp +++ b/Swiften/TLS/OpenSSL/OpenSSLContext.cpp @@ -335,13 +335,13 @@ bool OpenSSLContext::configure(const TLSOptions &options) TLSOptions::VerifyMode verify_mode = *options.verifyMode; int mode; switch (verify_mode) { - case TLSOptions::VerifyMode::NONE: + case TLSOptions::VerifyMode::None: mode = SSL_VERIFY_NONE; break; - case TLSOptions::VerifyMode::REQUIRED: + case TLSOptions::VerifyMode::Required: mode = SSL_VERIFY_PEER | SSL_VERIFY_FAIL_IF_NO_PEER_CERT | SSL_VERIFY_CLIENT_ONCE; break; - case TLSOptions::VerifyMode::OPTIONAL: + case TLSOptions::VerifyMode::Optional: mode = SSL_VERIFY_PEER | SSL_VERIFY_CLIENT_ONCE; break; } diff --git a/Swiften/TLS/TLSOptions.h b/Swiften/TLS/TLSOptions.h index 7a38aa2..56648a3 100644 --- a/Swiften/TLS/TLSOptions.h +++ b/Swiften/TLS/TLSOptions.h @@ -51,10 +51,10 @@ namespace Swift { boost::optional verifyDepth; enum class VerifyMode { - NONE, - REQUIRED, - OPTIONAL - } ; + None, + Required, + Optional + }; boost::optional verifyMode; /** -- cgit v0.10.2-6-g49f6