also allow the older gmpy

since on older distros like CentOS 6 there is python-gmpy but not
python-gmpy2, support gmpy too

Author: tomato42

.travis.yml

@@ -6,7 +6,7 @@ language: python
 cache: pip
 addons:
   apt_packages:
-      # needed for gmpy2
+      # needed for gmpy and gmpy2
       - libgmp-dev
       - libmpfr-dev
       - libmpc-dev
@@ -24,7 +24,9 @@ matrix:
       - python: 2.7
         env: TOX_ENV=py27_old_six
       - python: 2.7
-        env: TOX_ENV=gmppy27
+        env: TOX_ENV=gmpypy27
+      - python: 2.7
+        env: TOX_ENV=gmpy2py27
       - python: 3.3
         env: TOX_ENV=py33
       - python: 3.4
@@ -42,7 +44,11 @@ matrix:
         dist: xenial
         sudo: true
       - python: 3.8
-        env: TOX_ENV=gmppy38
+        env: TOX_ENV=gmpypy38
+        dist: xenial
+        sudo: true
+      - python: 3.8
+        env: TOX_ENV=gmpy2py38
         dist: xenial
         sudo: true
       - python: nightly
@@ -87,12 +93,15 @@ install:
       else
         travis_retry pip install -r build-requirements.txt;
       fi
-  - if [[ $TOX_ENV =~ gmp ]]; then travis_retry pip install gmpy2; fi
+  - if [[ $TOX_ENV =~ gmpy2 ]]; then travis_retry pip install gmpy2; fi
+  - if [[ $TOX_ENV =~ gmpyp ]]; then travis_retry pip install gmpy; fi
   - if [[ $INSTRUMENTAL ]]; then travis_retry pip install instrumental; fi
   - pip list
 script:
   - if [[ $TOX_ENV ]]; then tox -e $TOX_ENV; fi
-  - if [[ $TOX_ENV =~ gmp ]]; then tox -e speedgmp2; else tox -e speed; fi
+  - if [[ $TOX_ENV =~ gmpy2 ]]; then tox -e speedgmpy2; fi
+  - if [[ $TOX_ENV =~ gmpyp ]]; then tox -e speedgmpy; fi
+  - if ! [[ $TOX_ENV =~ gmpy ]]; then tox -e speed; fi
   - |
       if [[ $INSTRUMENTAL && $TRAVIS_PULL_REQUEST != "false" ]]; then
         git checkout $PR_FIRST^

README.md

@@ -34,9 +34,10 @@ This library uses only Python and the 'six' package. It is compatible with
 Python 2.6, 2.7 and 3.3+. It also supports execution on the alternative
 implementations like pypy and pypy3.
 
-If `gmpy2` is installed, it will be used for faster arithmetic.
-`gmpy2` can be installed after this library is installed, `python-ecdsa` will
-detect presence of `gmpy2` on start-up and use it automatically.
+If `gmpy2` or `gmpy` is installed, they will be used for faster arithmetic.
+Either of them can be installed after this library is installed,
+`python-ecdsa` will detect their presence on start-up and use them
+automatically.
 
 To run the OpenSSL compatibility tests, the 'openssl' tool must be in your
 `PATH`. This release has been tested successfully against OpenSSL 0.9.8o,
@@ -58,6 +59,11 @@ it's possible to specify installation together with `gmpy2`:
 pip install ecdsa[gmpy2]
 ```
 
+or (slower, legacy option):
+```
+pip install ecdsa[gmpy]
+```
+
 ## Speed
 
 The following table shows how long this library takes to generate keypairs
@@ -87,7 +93,7 @@ On an Intel Core i7 4790K @ 4.0GHz I'm getting the following performance:
  BRAINPOOLP384r1:     96   0.00112s    892.44   0.00119s    841.48   0.00229s    436.71
  BRAINPOOLP512r1:    128   0.00214s    467.05   0.00226s    441.64   0.00422s    237.13
 ```
-To test performance with `gmpy2` loaded, use `tox -e speedgmp2`.
+To test performance with `gmpy2` loaded, use `tox -e speedgmpy2`.
 On the same machine I'm getting the following performance with `gmpy2`:
 ```
                   siglen    keygen   keygen/s      sign     sign/s    verify   verify/s
@@ -106,6 +112,8 @@ On the same machine I'm getting the following performance with `gmpy2`:
  BRAINPOOLP512r1:    128   0.00062s   1618.30   0.00063s   1577.42   0.00125s    799.29
 ```
 
+(there's also `gmpy` version, execute it using `tox -e speedgmpy`)
+
 For comparison, a highly optimised implementation (including curve-specific
 assembly for some curves), like the one in OpenSSL, provides following
 performance numbers on the same machine.

setup.py

@@ -43,5 +43,6 @@
       install_requires=['six>=1.9.0'],
       extras_require={
             'gmpy2': 'gmpy2',
+            'gmpy': 'gmpy',
           },
       )

src/ecdsa/ellipticcurve.py

@@ -37,9 +37,14 @@
 
 try:
     from gmpy2 import mpz
-    GMPY2=True
+    GMPY=True
 except ImportError:
-    GMPY2=False
+    try:
+        from gmpy import mpz
+        GMPY=True
+    except ImportError:
+        GMPY=False
+
 
 from six import python_2_unicode_compatible
 from . import numbertheory
@@ -49,7 +54,7 @@
 class CurveFp(object):
   """Elliptic Curve over the field of integers modulo a prime."""
 
-  if GMPY2:
+  if GMPY:
       def __init__(self, p, a, b, h=None):
         """
         The curve of points satisfying y^2 = x^3 + a*x + b (mod p).
@@ -137,7 +142,7 @@ def __init__(self, curve, x, y, z, order=None, generator=False):
         cause to precompute multiplication table for it
       """
       self.__curve = curve
-      if GMPY2:
+      if GMPY:
           self.__x = mpz(x)
           self.__y = mpz(y)
           self.__z = mpz(z)
@@ -573,7 +578,7 @@ class Point(object):
   def __init__(self, curve, x, y, order=None):
     """curve, x, y, order; order (optional) is the order of this point."""
     self.__curve = curve
-    if GMPY2:
+    if GMPY:
         self.__x = x and mpz(x)
         self.__y = y and mpz(y)
         self.__order = order and mpz(order)

src/ecdsa/numbertheory.py

@@ -20,8 +20,14 @@
 try:
     from gmpy2 import powmod
     GMPY2=True
+    GMPY=False
 except ImportError:
     GMPY2=False
+    try:
+        from gmpy import mpz
+        GMPY=True
+    except ImportError:
+        GMPY=False
 
 import math
 import warnings
@@ -212,6 +218,25 @@ def inverse_mod(a, m):
         if a == 0:
             return 0
         return powmod(a, -1, m)
+elif GMPY:
+    def inverse_mod(a, m):
+        """Inverse of a mod m."""
+        # while libgmp likely does support inverses modulo, it is accessible
+        # only using the native `pow()` function, and `pow()` sanity checks
+        # the parameters before passing them on to underlying implementation
+        # on Python2
+        if a == 0:
+            return 0
+        a = mpz(a)
+        m = mpz(m)
+
+        lm, hm = mpz(1), mpz(0)
+        low, high = a % m, m
+        while low > 1:
+            r = high // low
+            lm, low, hm, high = hm - lm * r, high - low * r, lm, low
+
+        return lm % m
 else:
     def inverse_mod(a, m):
         """Inverse of a mod m."""

tox.ini

@@ -1,6 +1,6 @@
 
 [tox]
-envlist = py26, py27, py33, py34, py35, py36, py37, py38, py, pypy, pypy3, gmppy27, gmppy38
+envlist = py26, py27, py33, py34, py35, py36, py37, py38, py, pypy, pypy3, gmpy2py27, gmpy2py38, gmpypy27, gmpypy38
 
 [testenv]
 deps =
@@ -12,9 +12,10 @@ deps =
      py{26}: hypothesis<3
      py{26,27,34,35,36,37,38,py,py3}: pytest
      py{27,34,35,36,37,38,py,py3}: hypothesis
-     gmppy{27,38}: gmpy2
-     gmppy{27,38}: pytest
-     gmppy{27,38}: hypothesis
+     gmpy2py{27,38}: gmpy2
+     gmpypy{27,38}: gmpy
+     gmpy{2py27,2py38,py27,py38}: pytest
+     gmpy{2py27,2py38,py27,py38}: hypothesis
 # six==1.9.0 comes from setup.py install_requires
      py27_old_six: six==1.9.0
      py27_old_six: pytest
@@ -28,10 +29,16 @@ commands = coverage run --branch -m pytest {posargs:src/ecdsa}
 [testenv:py27_old_six]
 basepython = python2.7
 
-[testenv:gmppy27]
+[testenv:gmpypy27]
 basepython=python2.7
 
-[testenv:gmppy38]
+[testenv:gmpypy38]
+basepython=python3.8
+
+[testenv:gmpy2py27]
+basepython=python2.7
+
+[testenv:gmpy2py38]
 basepython=python3.8
 
 [testenv:coverage]
@@ -41,7 +48,11 @@ commands = coverage run --branch -m pytest --hypothesis-show-statistics {posargs
 [testenv:speed]
 commands = {envpython} speed.py
 
-[testenv:speedgmp2]
+[testenv:speedgmpy]
+deps = gmpy
+commands = {envpython} speed.py
+
+[testenv:speedgmpy2]
 deps = gmpy2
 commands = {envpython} speed.py