Remove DH generator size constraint (#3364)

* Remove DH generator size constraint * Check that g > 1
pyca · Jul 17, 2017 · cc12bea · cc12bea
1 parent a217358
commit cc12bea
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/cryptography/hazmat/primitives/asymmetric/dh.py b/src/cryptography/hazmat/primitives/asymmetric/dh.py
@@ -87,8 +87,8 @@ def __init__(self, p, g, q=None):
         if q is not None and not isinstance(q, six.integer_types):
             raise TypeError("q must be integer or None")
 
-        if q is None and g not in (2, 5):
-            raise ValueError("DH generator must be 2 or 5")
+        if g < 2:
+            raise ValueError("DH generator must be 2 or greater")
 
         self._p = p
         self._g = g

diff --git a/tests/hazmat/primitives/test_dh.py b/tests/hazmat/primitives/test_dh.py
@@ -53,7 +53,7 @@ def test_dh_parameternumbers():
 
     with pytest.raises(ValueError):
         dh.DHParameterNumbers(
-            65537, 7
+            65537, 1
         )
 
     params = dh.DHParameterNumbers(