add support for gmpy2

use gmpy2 if possible as it's faster than gmpy (and still developed)

Author: tomato42

.travis.yml

@@ -17,6 +17,9 @@ addons:
     - swig
     # needed for GMPY
     - libgmp-dev
+    # needed for GMPY2
+    - libmpfr-dev
+    - libmpc-dev
 before_cache:
   - rm -f $HOME/.cache/pip/log/debug.log
 
@@ -95,19 +98,33 @@ jobs:
       sudo: true
       env: GMPY=true
     - python: 2.7
-      env: M2CRYPTO=true PYCRYPTO=true GMPY=true
+      env: GMPY2=true
     - python: 3.5
-      env: M2CRYPTO=true PYCRYPTO=true GMPY=true
+      env: GMPY2=true
     - python: 3.6
-      env: M2CRYPTO=true PYCRYPTO=true GMPY=true
+      env: GMPY2=true
     - python: 3.7
       dist: xenial
       sudo: true
-      env: M2CRYPTO=true PYCRYPTO=true GMPY=true CC_COV=true
+      env: GMPY2=true
     - python: 3.8
       dist: xenial
       sudo: true
-      env: M2CRYPTO=true GMPY=true
+      env: GMPY2=true
+    - python: 2.7
+      env: M2CRYPTO=true PYCRYPTO=true GMPY=true GMPY2=true
+    - python: 3.5
+      env: M2CRYPTO=true PYCRYPTO=true GMPY=true GMPY2=true
+    - python: 3.6
+      env: M2CRYPTO=true PYCRYPTO=true GMPY=true GMPY2=true
+    - python: 3.7
+      dist: xenial
+      sudo: true
+      env: M2CRYPTO=true PYCRYPTO=true GMPY=true GMPY2=true CC_COV=true
+    - python: 3.8
+      dist: xenial
+      sudo: true
+      env: M2CRYPTO=true GMPY=true GMPY2=true
 
 before_install:
   - |
@@ -138,6 +155,7 @@ install:
   - if [[ $PYCRYPTO == 'true' ]]; then travis_retry pip install pycrypto; fi
   - if [[ $PYCRYPTODOME == 'true' ]]; then travis_retry pip install pycryptodome; fi
   - if [[ $GMPY == 'true' ]]; then travis_retry pip install gmpy; fi
+  - if [[ $GMPY2 == 'true' ]]; then travis_retry pip install gmpy2; fi
   - travis_retry pip install -r requirements.txt
   - if [[ $CC_COV == 'true' ]]; then ./cc-test-reporter before-build; fi
 

scripts/speed.py

@@ -1,9 +1,10 @@
 import timeit
 
-from tlslite.utils.cryptomath import gmpyLoaded
+from tlslite.utils.cryptomath import gmpyLoaded, GMPY2_LOADED
 
 print("Acceleration backends loaded:")
 print("gmpy: {0}".format(gmpyLoaded))
+print("gmpy2: {0}".format(GMPY2_LOADED))
 print("")
 
 def do(setup_statements, statement):

scripts/tls.py

@@ -71,7 +71,11 @@ def printUsage(s=None):
         print("  GMPY        : Loaded")
     else:
         print("  GMPY        : Not Loaded")
-    
+    if GMPY2_LOADED:
+        print("  GMPY2       : Loaded")
+    else:
+        print("  GMPY2       : Not Loaded")
+
     print("")
     print("""Commands:
 

tlslite/api.py

@@ -25,7 +25,7 @@
                                       MultiPathTLSXMLRPCServer
 
 from .utils.cryptomath import m2cryptoLoaded, gmpyLoaded, \
-                             pycryptoLoaded, prngName
+                             pycryptoLoaded, prngName, GMPY2_LOADED
 from .utils.keyfactory import generateRSAKey, parsePEMKey, \
                              parseAsPublicKey, parsePrivateKey
 from .utils.tackwrapper import tackpyLoaded

tlslite/utils/cryptomath.py

@@ -54,10 +54,27 @@
 #Try to load GMPY
 try:
     import gmpy
+    gmpy.mpz
     gmpyLoaded = True
 except ImportError:
     gmpyLoaded = False
 
+
+# Try to load GMPY2
+try:
+    from gmpy2 import powmod
+    GMPY2_LOADED = True
+except ImportError:
+    GMPY2_LOADED = False
+
+
+# Use the faster mpz
+if GMPY2_LOADED:
+    from gmpy2 import mpz
+elif gmpyLoaded:
+    from gmpy import mpz
+
+
 #Try to load pycrypto
 # pylint: disable=invalid-name
 try:
@@ -292,25 +309,35 @@ def gcd(a,b):
 def lcm(a, b):
     return (a * b) // gcd(a, b)
 
-#Returns inverse of a mod b, zero if none
-#Uses Extended Euclidean Algorithm
-def invMod(a, b):
-    c, d = a, b
-    uc, ud = 1, 0
-    while c != 0:
-        q = d // c
-        c, d = d-(q*c), c
-        uc, ud = ud - (q * uc), uc
-    if d == 1:
-        return ud % b
-    return 0
-
-
-if gmpyLoaded:
+# pylint: disable=invalid-name
+# disable pylint check as the (a, b) are part of the API
+if GMPY2_LOADED:
+    def invMod(a, b):
+        """Return inverse of a mod b, zero if none."""
+        if a == 0:
+            return 0
+        return powmod(a, -1, b)
+else:
+    # Use Extended Euclidean Algorithm
+    def invMod(a, b):
+        """Return inverse of a mod b, zero if none."""
+        c, d = a, b
+        uc, ud = 1, 0
+        while c != 0:
+            q = d // c
+            c, d = d-(q*c), c
+            uc, ud = ud - (q * uc), uc
+        if d == 1:
+            return ud % b
+        return 0
+# pylint: enable=invalid-name
+
+
+if gmpyLoaded or GMPY2_LOADED:
     def powMod(base, power, modulus):
-        base = gmpy.mpz(base)
-        power = gmpy.mpz(power)
-        modulus = gmpy.mpz(modulus)
+        base = mpz(base)
+        power = mpz(power)
+        modulus = mpz(modulus)
         result = pow(base, power, modulus)
         return compatLong(result)
 else:

tlslite/utils/python_rsakey.py

@@ -7,7 +7,9 @@
 from .rsakey import *
 from .pem import *
 from .deprecations import deprecated_params
-if gmpyLoaded:
+if GMPY2_LOADED:
+    from gmpy2 import mpz
+elif gmpyLoaded:
     from gmpy import mpz
 
 class Python_RSAKey(RSAKey):
@@ -18,7 +20,7 @@ def __init__(self, n=0, e=0, d=0, p=0, q=0, dP=0, dQ=0, qInv=0,
         see also generate() and parsePEM()."""
         if (n and not e) or (e and not n):
             raise AssertionError()
-        if gmpyLoaded:
+        if gmpyLoaded or GMPY2_LOADED:
             n = mpz(n)
             e = mpz(e)
             d = mpz(d)
@@ -114,12 +116,12 @@ def generate(bits, key_type="rsa"):
         key = Python_RSAKey()
         p = getRandomPrime(bits//2, False)
         q = getRandomPrime(bits//2, False)
-        if gmpyLoaded:
+        if gmpyLoaded or GMPY2_LOADED:
             p = mpz(p)
             q = mpz(q)
         t = lcm(p-1, q-1)
         key.n = p * q
-        if gmpyLoaded:
+        if gmpyLoaded or GMPY2_LOADED:
             key.e = mpz(65537)
         else:
             key.e = 65537