Merge pull request #59 from openweave/bug/szewczyk/header-cleanup

Bug/szewczyk/header cleanup

Author: robszewczyk

src/device-manager/WeaveDeviceManager.h

@@ -637,23 +637,29 @@ class NL_DLL_EXPORT WeaveDeviceManager : private Security::CASE::WeaveCASEAuthDe
             Security::WeaveCertificateSet & certSet, WEAVE_ERROR & validRes) __OVERRIDE;
     void EndValidation(const Security::CASE::BeginSessionContext & msgCtx, Security::ValidationContext & validCtx,
             Security::WeaveCertificateSet & certSet) __OVERRIDE;
+    WEAVE_ERROR GetNodePrivateKey(bool isInitiator, const uint8_t *& weavePrivKey, uint16_t& weavePrivKeyLen);
+    WEAVE_ERROR ReleaseNodePrivateKey(const uint8_t *weavePrivKey);
+    WEAVE_ERROR BeginCertValidation(bool isInitiator, Security::WeaveCertificateSet& certSet,
+            Security::ValidationContext& validContext);
+    WEAVE_ERROR HandleCertValidationResult(bool isInitiator, WEAVE_ERROR& validRes, Security::WeaveCertificateData *peerCert,
+            uint64_t peerNodeId, Security::WeaveCertificateSet& certSet, Security::ValidationContext& validContext);
+    WEAVE_ERROR EndCertValidation(Security::WeaveCertificateSet& certSet, Security::ValidationContext& validContext);
 
 #else // !WEAVE_CONFIG_LEGACY_CASE_AUTH_DELEGATE
 
     // ===== Methods that implement the legacy WeaveCASEAuthDelegate interface
 
     WEAVE_ERROR GetNodeCertInfo(bool isInitiator, uint8_t *buf, uint16_t bufSize, uint16_t& certInfoLen) __OVERRIDE;
     WEAVE_ERROR GetNodePayload(bool isInitiator, uint8_t *buf, uint16_t bufSize, uint16_t& payloadLen) __OVERRIDE;
-
-#endif // WEAVE_CONFIG_LEGACY_CASE_AUTH_DELEGATE
-
-    WEAVE_ERROR GetNodePrivateKey(bool isInitiator, const uint8_t *& weavePrivKey, uint16_t& weavePrivKeyLen);
-    WEAVE_ERROR ReleaseNodePrivateKey(const uint8_t *weavePrivKey);
+    WEAVE_ERROR GetNodePrivateKey(bool isInitiator, const uint8_t *& weavePrivKey, uint16_t& weavePrivKeyLen) __OVERRIDE;
+    WEAVE_ERROR ReleaseNodePrivateKey(const uint8_t *weavePrivKey) __OVERRIDE;
     WEAVE_ERROR BeginCertValidation(bool isInitiator, Security::WeaveCertificateSet& certSet,
-            Security::ValidationContext& validContext);
+            Security::ValidationContext& validContext) __OVERRIDE;
     WEAVE_ERROR HandleCertValidationResult(bool isInitiator, WEAVE_ERROR& validRes, Security::WeaveCertificateData *peerCert,
-            uint64_t peerNodeId, Security::WeaveCertificateSet& certSet, Security::ValidationContext& validContext);
-    WEAVE_ERROR EndCertValidation(Security::WeaveCertificateSet& certSet, Security::ValidationContext& validContext);
+            uint64_t peerNodeId, Security::WeaveCertificateSet& certSet, Security::ValidationContext& validContext) __OVERRIDE;
+    WEAVE_ERROR EndCertValidation(Security::WeaveCertificateSet& certSet, Security::ValidationContext& validContext) __OVERRIDE;
+
+#endif // WEAVE_CONFIG_LEGACY_CASE_AUTH_DELEGATE
 
     // Locale
     static void WriteLocaleRequest(nl::Weave::TLV::TLVWriter &aWriter, void *ctx);

src/lib/profiles/security/WeaveCert.h

@@ -26,6 +26,8 @@
 #ifndef WEAVECERT_H_
 #define WEAVECERT_H_
 
+#include <string.h>
+
 #include <Weave/Support/NLDLLUtil.h>
 #include <Weave/Core/WeaveTLV.h>
 #include <Weave/Support/ASN1.h>

src/lib/profiles/security/WeaveSig.h

@@ -93,11 +93,7 @@ class WeaveSignatureGenerator : public WeaveSignatureGeneratorBase
 
     WEAVE_ERROR GenerateSignature(const uint8_t * msgHash, uint8_t msgHashLen, TLVWriter & writer, uint64_t tag) __OVERRIDE;
 
-#if __cplusplus >= 201103L
     using WeaveSignatureGeneratorBase::GenerateSignature;
-#else
-    WeaveSignatureGeneratorBase::GenerateSignature;
-#endif
 
 private:
     virtual WEAVE_ERROR GenerateSignatureData(const uint8_t * msgHash, uint8_t msgHashLen, TLVWriter & writer) __OVERRIDE;