Skip to content
This repository was archived by the owner on Dec 20, 2023. It is now read-only.

Commit 5c64141

Browse files
committed
Mark legacy CASE delegate methods as override
1 parent 079b2cf commit 5c64141

File tree

1 file changed

+14
-8
lines changed

1 file changed

+14
-8
lines changed

src/device-manager/WeaveDeviceManager.h

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -637,23 +637,29 @@ class NL_DLL_EXPORT WeaveDeviceManager : private Security::CASE::WeaveCASEAuthDe
637637
Security::WeaveCertificateSet & certSet, WEAVE_ERROR & validRes) __OVERRIDE;
638638
void EndValidation(const Security::CASE::BeginSessionContext & msgCtx, Security::ValidationContext & validCtx,
639639
Security::WeaveCertificateSet & certSet) __OVERRIDE;
640+
WEAVE_ERROR GetNodePrivateKey(bool isInitiator, const uint8_t *& weavePrivKey, uint16_t& weavePrivKeyLen);
641+
WEAVE_ERROR ReleaseNodePrivateKey(const uint8_t *weavePrivKey);
642+
WEAVE_ERROR BeginCertValidation(bool isInitiator, Security::WeaveCertificateSet& certSet,
643+
Security::ValidationContext& validContext);
644+
WEAVE_ERROR HandleCertValidationResult(bool isInitiator, WEAVE_ERROR& validRes, Security::WeaveCertificateData *peerCert,
645+
uint64_t peerNodeId, Security::WeaveCertificateSet& certSet, Security::ValidationContext& validContext);
646+
WEAVE_ERROR EndCertValidation(Security::WeaveCertificateSet& certSet, Security::ValidationContext& validContext);
640647

641648
#else // !WEAVE_CONFIG_LEGACY_CASE_AUTH_DELEGATE
642649

643650
// ===== Methods that implement the legacy WeaveCASEAuthDelegate interface
644651

645652
WEAVE_ERROR GetNodeCertInfo(bool isInitiator, uint8_t *buf, uint16_t bufSize, uint16_t& certInfoLen) __OVERRIDE;
646653
WEAVE_ERROR GetNodePayload(bool isInitiator, uint8_t *buf, uint16_t bufSize, uint16_t& payloadLen) __OVERRIDE;
647-
648-
#endif // WEAVE_CONFIG_LEGACY_CASE_AUTH_DELEGATE
649-
650-
WEAVE_ERROR GetNodePrivateKey(bool isInitiator, const uint8_t *& weavePrivKey, uint16_t& weavePrivKeyLen);
651-
WEAVE_ERROR ReleaseNodePrivateKey(const uint8_t *weavePrivKey);
654+
WEAVE_ERROR GetNodePrivateKey(bool isInitiator, const uint8_t *& weavePrivKey, uint16_t& weavePrivKeyLen) __OVERRIDE;
655+
WEAVE_ERROR ReleaseNodePrivateKey(const uint8_t *weavePrivKey) __OVERRIDE;
652656
WEAVE_ERROR BeginCertValidation(bool isInitiator, Security::WeaveCertificateSet& certSet,
653-
Security::ValidationContext& validContext);
657+
Security::ValidationContext& validContext) __OVERRIDE;
654658
WEAVE_ERROR HandleCertValidationResult(bool isInitiator, WEAVE_ERROR& validRes, Security::WeaveCertificateData *peerCert,
655-
uint64_t peerNodeId, Security::WeaveCertificateSet& certSet, Security::ValidationContext& validContext);
656-
WEAVE_ERROR EndCertValidation(Security::WeaveCertificateSet& certSet, Security::ValidationContext& validContext);
659+
uint64_t peerNodeId, Security::WeaveCertificateSet& certSet, Security::ValidationContext& validContext) __OVERRIDE;
660+
WEAVE_ERROR EndCertValidation(Security::WeaveCertificateSet& certSet, Security::ValidationContext& validContext) __OVERRIDE;
661+
662+
#endif // WEAVE_CONFIG_LEGACY_CASE_AUTH_DELEGATE
657663

658664
// Locale
659665
static void WriteLocaleRequest(nl::Weave::TLV::TLVWriter &aWriter, void *ctx);

0 commit comments

Comments
 (0)