Merge pull request #495 from openweave/bug/emargolis/fix-generate-weave-node-id-func

Jay Logue · web-flow · commit 72d3dd8d5bde · 2020-02-18T12:19:03.000-08:00
Fixed GenerateWeaveNodeId Function Implementation.
diff --git a/src/lib/core/WeaveMessageLayer.cpp b/src/lib/core/WeaveMessageLayer.cpp
@@ -1,6 +1,6 @@
 /*
  *
- *    Copyright (c) 2019 Google LLC.
+ *    Copyright (c) 2019-2020 Google LLC.
  *    Copyright (c) 2013-2017 Nest Labs, Inc.
  *    All rights reserved.
  *
@@ -2610,6 +2610,8 @@ NL_DLL_EXPORT WEAVE_ERROR GenerateWeaveNodeId(uint64_t & nodeId)
     {
         err = nl::Weave::Platform::Security::GetSecureRandomData(reinterpret_cast<uint8_t*>(&id), sizeof(id));
         SuccessOrExit(err);
+
+        id &= ~kEUI64_UL_Local;
     }
 
     nodeId = id | kEUI64_UL_Local;

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`/*`
`2`	`2`	`*`
`3`		`- * Copyright (c) 2019 Google LLC.`
	`3`	`+ * Copyright (c) 2019-2020 Google LLC.`
`4`	`4`	`* Copyright (c) 2013-2017 Nest Labs, Inc.`
`5`	`5`	`* All rights reserved.`
`6`	`6`	`*`
`@@ -2610,6 +2610,8 @@ NL_DLL_EXPORT WEAVE_ERROR GenerateWeaveNodeId(uint64_t & nodeId)`
`2610`	`2610`	`{`
`2611`	`2611`	`err = nl::Weave::Platform::Security::GetSecureRandomData(reinterpret_cast<uint8_t*>(&id), sizeof(id));`
`2612`	`2612`	`SuccessOrExit(err);`
	`2613`	`+`
	`2614`	`+ id &= ~kEUI64_UL_Local;`
`2613`	`2615`	`}`
`2614`	`2616`
`2615`	`2617`	`nodeId = id \| kEUI64_UL_Local;`