changed crypto library with pyca/cryptography

https://github.com/pyca/cryptography

gpapi/googleplay.py

@@ -1,14 +1,15 @@
 #!/usr/bin/python
 
+from base64 import b64decode, urlsafe_b64encode
+from datetime import datetime
 
-from Crypto.Util import asn1
-from Crypto.PublicKey import RSA
-from Crypto.Hash import SHA
-from Crypto.Cipher import PKCS1_OAEP
+from cryptography.hazmat.primitives.asymmetric.utils import encode_dss_signature
+from cryptography.hazmat.backends import default_backend
+from cryptography.hazmat.primitives import hashes
+from cryptography.hazmat.primitives.serialization import load_der_public_key
+from cryptography.hazmat.primitives.asymmetric import padding
 
 import requests
-from base64 import b64decode, urlsafe_b64encode
-from datetime import datetime
 
 from . import googleplay_pb2, config, utils
 
@@ -76,25 +77,45 @@ def set_timezone(self, timezone):
         self.deviceBuilder.set_timezone(timezone)
 
     def encrypt_password(self, login, passwd):
-        """Encrypt the password using the google publickey, using
-        the RSA encryption algorithm"""
-
+        """Encrypt credentials using the google publickey, with the
+        RSA algorithm"""
+
+        # structure of the binary key:
+        #
+        # *-------------------------------------------------------*
+        # | modulus_length | modulus | exponent_length | exponent |
+        # *-------------------------------------------------------*
+        #
+        # modulus_length and exponent_length are uint32
         binaryKey = b64decode(config.GOOGLE_PUBKEY)
+        # modulus
         i = utils.readInt(binaryKey, 0)
         modulus = utils.toBigInt(binaryKey[4:][0:i])
+        # exponent
         j = utils.readInt(binaryKey, i + 4)
         exponent = utils.toBigInt(binaryKey[i + 8:][0:j])
 
-        seq = asn1.DerSequence()
-        seq.append(modulus)
-        seq.append(exponent)
-
-        publicKey = RSA.importKey(seq.encode())
-        cipher = PKCS1_OAEP.new(publicKey)
-        combined = login.encode() + b'\x00' + passwd.encode()
-        encrypted = cipher.encrypt(combined)
-        h = b'\x00' + SHA.new(binaryKey).digest()[0:4]
-        return urlsafe_b64encode(h + encrypted)
+        # calculate SHA1 of the pub key
+        digest = hashes.Hash(hashes.SHA1(), backend=default_backend())
+        digest.update(binaryKey)
+        h = b'\x00' + digest.finalize()[0:4]
+
+        # generate a public key
+        der_data = encode_dss_signature(modulus, exponent)
+        publicKey = load_der_public_key(der_data, backend=default_backend())
+
+        # encrypt email and password using pubkey
+        to_be_encrypted = login.encode() + b'\x00' + passwd.encode()
+        ciphertext = publicKey.encrypt(
+            to_be_encrypted,
+            padding.OAEP(
+                mgf=padding.MGF1(algorithm=hashes.SHA1()),
+                algorithm=hashes.SHA1(),
+                label=None
+            )
+        )
+
+        return urlsafe_b64encode(h + ciphertext)
 
     def setAuthSubToken(self, authSubToken):
         self.authSubToken = authSubToken

setup.py

@@ -9,6 +9,6 @@
       license='GPL3',
       packages=['gpapi'],
       package_data={'gpapi': ['device.properties']},
-      install_requires=['pycryptodome',
+      install_requires=['cryptography>=2.2',
                         'protobuf>=3.5.2',
                         'requests'])