Fix RSA keyfile open mode (rb) for python3 (google#141)

joeleong · Dec 11, 2018 · 3338e6b · 3338e6b
1 parent d9b94b2
commit 3338e6b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/adb/sign_m2crypto.py b/adb/sign_m2crypto.py
@@ -21,7 +21,7 @@ class M2CryptoSigner(adb_protocol.AuthSigner):
     """AuthSigner using M2Crypto."""
 
     def __init__(self, rsa_key_path):
-        with open(rsa_key_path + '.pub') as rsa_pub_file:
+        with open(rsa_key_path + '.pub', 'rb') as rsa_pub_file:
             self.public_key = rsa_pub_file.read()
 
         self.rsa_key = RSA.load_key(rsa_key_path)

diff --git a/adb/sign_pythonrsa.py b/adb/sign_pythonrsa.py
@@ -60,9 +60,9 @@ class PythonRSASigner(object):
 
     @classmethod
     def FromRSAKeyPath(cls, rsa_key_path):
-        with open(rsa_key_path + '.pub') as f:
+        with open(rsa_key_path + '.pub', 'rb') as f:
             pub = f.read()
-        with open(rsa_key_path) as f:
+        with open(rsa_key_path, 'rb') as f:
             priv = f.read()
         return cls(pub, priv)