From a0e014e94b5f1c9429babb0ce8c6ece15d1b14ff Mon Sep 17 00:00:00 2001
From: kpine <keith.pine@gmail.com>
Date: Wed, 29 Sep 2021 20:47:58 -0700
Subject: [PATCH] Allow S2 keys in OZW format for migration from networkKey
 (#399)

---
 src/bin/server.ts | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/bin/server.ts b/src/bin/server.ts
index 27bc49656..9f79631df 100644
--- a/src/bin/server.ts
+++ b/src/bin/server.ts
@@ -5,14 +5,11 @@ import { ZwavejsServer } from "../lib/server";
 import { createMockDriver } from "../mock";
 import { parseArgs } from "../util/parse-args";
 
-const normalizeKey = (
-  key: Buffer | string,
-  keyName: string,
-  supportOZWFormat: boolean = false
-): Buffer => {
+const normalizeKey = (key: Buffer | string, keyName: string): Buffer => {
   if (Buffer.isBuffer(key)) return key;
   if (key.length === 32) return Buffer.from(key, "hex");
-  if (supportOZWFormat && key.includes("0x"))
+  // Convert from OpenZWave format
+  if (key.includes("0x"))
     return Buffer.from(key.replace(/0x/g, "").replace(/, /g, ""), "hex");
   throw new Error(`Invalid key format for ${keyName} option`);
 };
@@ -86,8 +83,7 @@ interface Args {
         if (!options.securityKeys) options.securityKeys = {};
         options.securityKeys.S0_Legacy = normalizeKey(
           options.networkKey,
-          "networkKey",
-          true
+          "networkKey"
         );
         console.warn(
           "The `networkKey` option is deprecated in favor of `securityKeys` option. To eliminate " +