From 38cda517b27b6464494a9688d56b9ba4a0d94d48 Mon Sep 17 00:00:00 2001
From: atraczyk <andreastraczyk@gmail.com>
Date: Mon, 15 Aug 2016 16:46:50 -0400
Subject: [PATCH] security: comply with Microsoft's compiler standards

Syntax patching in an effort to comply with
Microsoft's compiler standards.
This patch applies to source files in the security path.

Change-Id: Ifd52c510896837a21006cba89ed4a8683eaa43dd
Tuleap: #902
---
 src/client/configurationmanager.cpp | 4 ++--
 src/security/tls_session.cpp        | 2 +-
 src/security/tls_session.h          | 8 ++++++--
 src/security/tlsvalidator.cpp       | 4 ++++
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/client/configurationmanager.cpp b/src/client/configurationmanager.cpp
index 2a07e6ba34..9ad425f251 100644
--- a/src/client/configurationmanager.cpp
+++ b/src/client/configurationmanager.cpp
@@ -42,8 +42,8 @@
 #include "client/ring_signal.h"
 #include "upnp/upnp_context.h"
 
-#ifdef WIN32_NATIVE
-#include "windirent.h"
+#ifdef WIN32_NATIVE
+#include "windirent.h"
 #else
 #include <dirent.h>
 #endif
diff --git a/src/security/tls_session.cpp b/src/security/tls_session.cpp
index 75976f0bf9..b754217f46 100644
--- a/src/security/tls_session.cpp
+++ b/src/security/tls_session.cpp
@@ -388,7 +388,7 @@ TlsSession::getCurrentCipherSuiteId(std::array<uint8_t, 2>& cs_id) const
         const char* const suite = gnutls_cipher_suite_info(i, cs_id.data(), &kx, &cipher, &mac,
                                                            nullptr);
         if (!suite)
-          break;
+            break;
         if (cipher == s_cipher && kx == s_kx && mac == s_mac)
             return suite;
     }
diff --git a/src/security/tls_session.h b/src/security/tls_session.h
index b895690f3a..4be2233336 100644
--- a/src/security/tls_session.h
+++ b/src/security/tls_session.h
@@ -46,8 +46,8 @@ class IceSocket;
 } // namespace ring
 
 namespace dht { namespace crypto {
-class Certificate;
-class PrivateKey;
+struct Certificate;
+struct PrivateKey;
 }} // namespace dht::crypto
 
 namespace ring { namespace tls {
@@ -65,6 +65,10 @@ public:
     DhParams() = default;
     DhParams(DhParams&&) = default;
 
+    DhParams& operator =(const DhParams&){
+        return *this;
+    }
+
     /** Take ownership of gnutls_dh_params */
     explicit DhParams(gnutls_dh_params_t p) : params_(p, gnutls_dh_params_deinit) {};
 
diff --git a/src/security/tlsvalidator.cpp b/src/security/tlsvalidator.cpp
index 3175c544a8..0ba65ad341 100644
--- a/src/security/tlsvalidator.cpp
+++ b/src/security/tlsvalidator.cpp
@@ -60,6 +60,10 @@
 #include <unistd.h>
 #include <fcntl.h>
 
+#ifdef WIN32_NATIVE
+#include "windirent.h"
+#endif
+
 namespace ring { namespace tls {
 
 //Map the internal ring Enum class of the exported names
-- 
GitLab