From c32a07be3e102f089b5197588bec348348373e0c Mon Sep 17 00:00:00 2001 From: awlane Date: Tue, 19 Apr 2022 14:53:41 -0500 Subject: [PATCH] Fix broken checks for presence of dummy keychain due to type mismatch Refs #5200 Change-Id: I848c979c414cb802fe09359efda96c7dd29aa73d --- minindn/minindn.py | 2 +- minindn/wifi/minindnwifi.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/minindn/minindn.py b/minindn/minindn.py index c2fed3e..c710d52 100644 --- a/minindn/minindn.py +++ b/minindn/minindn.py @@ -105,7 +105,7 @@ class Minindn(object): process = Popen(['ndnsec-get-default', '-k'], stdout=PIPE, stderr=PIPE) output, error = process.communicate() if process.returncode == 0: - Minindn.ndnSecurityDisabled = '/dummy/KEY/-%9C%28r%B8%AA%3B%60' in output + Minindn.ndnSecurityDisabled = '/dummy/KEY/-%9C%28r%B8%AA%3B%60' in output.decode("utf-8") info('Dummy key chain patch is installed in ndn-cxx. Security will be disabled.\n') else: debug(error) diff --git a/minindn/wifi/minindnwifi.py b/minindn/wifi/minindnwifi.py index d09d3b8..c403fc4 100644 --- a/minindn/wifi/minindnwifi.py +++ b/minindn/wifi/minindnwifi.py @@ -81,7 +81,7 @@ class MinindnWifi(Minindn): process = Popen(['ndnsec-get-default', '-k'], stdout=PIPE, stderr=PIPE) output, error = process.communicate() if process.returncode == 0: - Minindn.ndnSecurityDisabled = '/dummy/KEY/-%9C%28r%B8%AA%3B%60' in output + Minindn.ndnSecurityDisabled = '/dummy/KEY/-%9C%28r%B8%AA%3B%60' in output.decode("utf-8") info('Dummy key chain patch is installed in ndn-cxx. Security will be disabled.\n') else: debug(error)