Merge pull request #155 from bif-g/master

replace M2Crypto with py-cryptography

Author: alusco

README.md

@@ -46,11 +46,11 @@ A [presentation was made at PyCon 2016][pycon_preso], and here's some demo code:
 import os.path as op
 
 from adb import adb_commands
-from adb import sign_m2crypto
+from adb import sign_cryptography
 
 
 # KitKat+ devices require authentication
-signer = sign_m2crypto.M2CryptoSigner(
+signer = sign_cryptography.CryptographySigner(
     op.expanduser('~/.android/adbkey'))
 # Connect to the device
 device = adb_commands.AdbCommands()
@@ -83,7 +83,7 @@ for i in xrange(10):
   * libusb1 (1.0.16+)
   * python-libusb1 (1.2.0+)
   * `adb.zip`: one of:
-    * python-m2crypto (0.21.1+)
+    * py-cryptography
     * python-rsa (3.2+)
   * `fastboot.zip` (optional):
     * python-progressbar (2.3+)

adb/adb_commands.py

@@ -40,9 +40,9 @@
 
 try:
     # Imported locally to keep compatibility with previous code.
-    from adb.sign_m2crypto import M2CryptoSigner
+    from adb.sign_cryptography import CryptographySigner
 except ImportError:
-    # Ignore this error when M2Crypto is not installed, there are other options.
+    # Ignore this error when cryptography is not installed, there are other options.
     pass
 
 

adb/adb_debug.py

@@ -27,9 +27,9 @@
 from adb import common_cli
 
 try:
-    from adb import sign_m2crypto
+    from adb import sign_cryptography
 
-    rsa_signer = sign_m2crypto.M2CryptoSigner
+    rsa_signer = sign_cryptography.CryptographySigner
 except ImportError:
     try:
         from adb import sign_pythonrsa
@@ -187,7 +187,7 @@ def main():
         if os.path.isfile(default):
             args.rsa_key_path = [default]
     if args.rsa_key_path and not rsa_signer:
-        parser.error('Please install either M2Crypto, python-rsa, or PycryptoDome')
+        parser.error('Please install either cryptography, python-rsa, or PycryptoDome')
 
     # Hacks so that the generated doc is nicer.
     if args.command_name == 'devices':

adb/sign_m2crypto.py renamed to adb/sign_cryptography.py

@@ -12,22 +12,26 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from M2Crypto import RSA
-
 from adb import adb_protocol
 
+from cryptography.hazmat.backends import default_backend
+from cryptography.hazmat.primitives import hashes
+from cryptography.hazmat.primitives import serialization
+from cryptography.hazmat.primitives.asymmetric import padding
+from cryptography.hazmat.primitives.asymmetric import utils
+
 
-class M2CryptoSigner(adb_protocol.AuthSigner):
-    """AuthSigner using M2Crypto."""
+class CryptographySigner(adb_protocol.AuthSigner):
+    """AuthSigner using cryptography.io."""
 
     def __init__(self, rsa_key_path):
         with open(rsa_key_path + '.pub') as rsa_pub_file:
             self.public_key = rsa_pub_file.read()
 
-        self.rsa_key = RSA.load_key(rsa_key_path)
+        with open(rsa_key_path) as rsa_prv_file:
+            self.rsa_key = serialization.load_pem_private_key(
+                    rsa_prv_file.read(), None, default_backend())
 
     def Sign(self, data):
-        return self.rsa_key.sign(data, 'sha1')
-
-    def GetPublicKey(self):
-        return self.public_key
+        return self.rsa_key.sign(
+            data, padding.PKCS1v15(), utils.Prehashed(hashes.SHA1()))

make_tools.py

@@ -43,7 +43,7 @@ def main():
     z.write('adb/common.py')
     z.write('adb/common_cli.py')
     z.write('adb/filesync_protocol.py')
-    z.write('adb/sign_m2crypto.py')
+    z.write('adb/sign_cryptography.py')
     z.write('adb/sign_pythonrsa.py')
     z.write('adb/usb_exceptions.py')
   with zipfile.ZipFile('fastboot.zip', 'w', zipfile.ZIP_DEFLATED) as z:

setup.py

@@ -15,7 +15,7 @@
 from setuptools import setup
 
 # Figure out if the system already has a supported Crypto library
-rsa_signer_library = 'M2Crypto>=0.21.1,<=0.26.4'
+rsa_signer_library = 'cryptography'
 try:
   import rsa