Swiftdiff options
| author | Tobias Markmann <tobias.markmann@isode.com> | 2019-09-17 08:28:22 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tobias.markmann@isode.com> | 2019-09-17 08:28:22 (GMT) |
| commit | f15902a76e0f3ff0151fb34dcfae2db75a2f5fb7 (patch) | |
| tree | 310fa04594575bfaff1eafe36227acf27aec0fe1 | |
| parent | 181ac4a83ba4a82be683fb0a6f08393d3c91320c (diff) | |
| download | swift-f15902a76e0f3ff0151fb34dcfae2db75a2f5fb7.zip swift-f15902a76e0f3ff0151fb34dcfae2db75a2f5fb7.tar.bz2 | |
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
| -rw-r--r-- | Swiften/TLS/OpenSSL/OpenSSLContext.cpp | 6 | ||||
| -rw-r--r-- | Swiften/TLS/TLSOptions.h | 8 |
2 files changed, 7 insertions, 7 deletions
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) | |||
| 335 | TLSOptions::VerifyMode verify_mode = *options.verifyMode; | 335 | TLSOptions::VerifyMode verify_mode = *options.verifyMode; |
| 336 | int mode; | 336 | int mode; |
| 337 | switch (verify_mode) { | 337 | switch (verify_mode) { |
| 338 | case TLSOptions::VerifyMode::NONE: | 338 | case TLSOptions::VerifyMode::None: |
| 339 | mode = SSL_VERIFY_NONE; | 339 | mode = SSL_VERIFY_NONE; |
| 340 | break; | 340 | break; |
| 341 | case TLSOptions::VerifyMode::REQUIRED: | 341 | case TLSOptions::VerifyMode::Required: |
| 342 | mode = SSL_VERIFY_PEER | SSL_VERIFY_FAIL_IF_NO_PEER_CERT | SSL_VERIFY_CLIENT_ONCE; | 342 | mode = SSL_VERIFY_PEER | SSL_VERIFY_FAIL_IF_NO_PEER_CERT | SSL_VERIFY_CLIENT_ONCE; |
| 343 | break; | 343 | break; |
| 344 | case TLSOptions::VerifyMode::OPTIONAL: | 344 | case TLSOptions::VerifyMode::Optional: |
| 345 | mode = SSL_VERIFY_PEER | SSL_VERIFY_CLIENT_ONCE; | 345 | mode = SSL_VERIFY_PEER | SSL_VERIFY_CLIENT_ONCE; |
| 346 | break; | 346 | break; |
| 347 | } | 347 | } |
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 { | |||
| 51 | boost::optional<int> verifyDepth; | 51 | boost::optional<int> verifyDepth; |
| 52 | 52 | ||
| 53 | enum class VerifyMode { | 53 | enum class VerifyMode { |
| 54 | NONE, | 54 | None, |
| 55 | REQUIRED, | 55 | Required, |
| 56 | OPTIONAL | 56 | Optional |
| 57 | } ; | 57 | }; |
| 58 | boost::optional<VerifyMode> verifyMode; | 58 | boost::optional<VerifyMode> verifyMode; |
| 59 | 59 | ||
| 60 | /** | 60 | /** |