36 lines
1.4 KiB
Diff
36 lines
1.4 KiB
Diff
|
From 9de053ef02db8cb63e14edc64ac22ec2d3d7bbc9 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Florence Blanc-Renaud <flo@redhat.com>
|
||
|
|
Date: Mon, 17 Jun 2024 17:01:33 +0200
|
||
|
|
Subject: [PATCH] ipa-otptoken-import: open the key file in binary mode
|
||
|
|
|
||
|
|
ipa-otptoken-import provides an option (-k KEYFILE) to import
|
||
|
|
an encrypted PSKC file but this option does not work with python3
|
||
|
|
in RHEL8 and above, because the key should be passed in binary
|
||
|
|
format to the cryptography functions instead of string format.
|
||
|
|
|
||
|
|
Open the keyfile in binary mode to pass the expected format.
|
||
|
|
|
||
|
|
Fixes: https://pagure.io/freeipa/issue/9609
|
||
|
|
Signed-off-by: Florence Blanc-Renaud <flo@redhat.com>
|
||
|
|
Reviewed-By: Rob Crittenden <rcritten@redhat.com>
|
||
|
|
---
|
||
|
|
ipaserver/install/ipa_otptoken_import.py | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/ipaserver/install/ipa_otptoken_import.py b/ipaserver/install/ipa_otptoken_import.py
|
||
|
|
index dbaeacdf6885d3238f2d0294e24a5adad5a5c38d..d3f3d3cfa84e4a4bf57383e0ba543f4543e25c92 100644
|
||
|
|
--- a/ipaserver/install/ipa_otptoken_import.py
|
||
|
|
+++ b/ipaserver/install/ipa_otptoken_import.py
|
||
|
|
@@ -539,7 +539,7 @@ class OTPTokenImport(admintool.AdminTool):
|
||
|
|
|
||
|
|
# Load the keyfile.
|
||
|
|
keyfile = self.safe_options.keyfile
|
||
|
|
- with open(keyfile) as f:
|
||
|
|
+ with open(keyfile, "rb") as f:
|
||
|
|
self.doc.setKey(f.read())
|
||
|
|
|
||
|
|
def run(self):
|
||
|
|
--
|
||
|
|
2.45.2
|
||
|
|
|