aboutsummaryrefslogtreecommitdiffstats
path: root/cryptography
diff options
context:
space:
mode:
authorMohammed Attia <skeuomorf@gmail.com>2014-04-01 14:23:27 +0200
committerMohammed Attia <skeuomorf@gmail.com>2014-04-03 06:23:10 +0200
commit9ac7c1d9032816e161b64f8e283bffac99b85c2e (patch)
tree7c8dea0dff322a6f328888965c6e0bcf54a17267 /cryptography
parentdacefbad29787833676adb04cdc91ff5bfc7b8f4 (diff)
downloadcryptography-9ac7c1d9032816e161b64f8e283bffac99b85c2e.tar.gz
cryptography-9ac7c1d9032816e161b64f8e283bffac99b85c2e.tar.bz2
cryptography-9ac7c1d9032816e161b64f8e283bffac99b85c2e.zip
Add tests for DSA parameters and key generation
Diffstat (limited to 'cryptography')
-rw-r--r--cryptography/hazmat/backends/openssl/backend.py6
-rw-r--r--cryptography/hazmat/primitives/asymmetric/dsa.py4
2 files changed, 5 insertions, 5 deletions
diff --git a/cryptography/hazmat/backends/openssl/backend.py b/cryptography/hazmat/backends/openssl/backend.py
index 3e6b1b5b..f161bd4e 100644
--- a/cryptography/hazmat/backends/openssl/backend.py
+++ b/cryptography/hazmat/backends/openssl/backend.py
@@ -431,15 +431,15 @@ class Backend(object):
ctx = self._ffi.gc(ctx, self._lib.DSA_free)
res = self._lib.DSA_generate_parameters_ex(
- ctx, key_size, self._ffi.NULL, self._ffi.NULL,
+ ctx, key_size, self._ffi.NULL, 0,
self._ffi.NULL, self._ffi.NULL, self._ffi.NULL
)
assert res == 1
- return dsa.DSAParams(
+ return dsa.DSAParameters(
modulus=self._bn_to_int(ctx.p),
- subroup_order=self._bn_to_int(ctx.q),
+ subgroup_order=self._bn_to_int(ctx.q),
generator=self._bn_to_int(ctx.g)
)
diff --git a/cryptography/hazmat/primitives/asymmetric/dsa.py b/cryptography/hazmat/primitives/asymmetric/dsa.py
index eb4a162c..e32e05c0 100644
--- a/cryptography/hazmat/primitives/asymmetric/dsa.py
+++ b/cryptography/hazmat/primitives/asymmetric/dsa.py
@@ -50,7 +50,7 @@ class DSAParameters(object):
self._generator = generator
@classmethod
- def generate(cls, backend, key_size):
+ def generate(cls, key_size, backend):
return backend.generate_dsa_parameters(key_size)
@property
@@ -101,7 +101,7 @@ class DSAPrivateKey(object):
self._y = y
@classmethod
- def generate(cls, backend, parameters):
+ def generate(cls, parameters, backend):
return backend.generate_dsa_private_key(parameters)
@property