Merge pull request #1720 from reaperhulk/gcc-old-openssl-match-made-i…

…n-hell Revert "simplify our DSA parameter copying"
pyca · Mar 4, 2015 · c21c4af · c21c4af
2 parents 7144556 + d39c560
commit c21c4af
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/cryptography/hazmat/backends/openssl/backend.py b/src/cryptography/hazmat/backends/openssl/backend.py
@@ -602,9 +602,12 @@ def generate_dsa_parameters(self, key_size):
         return _DSAParameters(self, ctx)
 
     def generate_dsa_private_key(self, parameters):
-        ctx = self._lib.DSAparams_dup(parameters._dsa_cdata)
+        ctx = self._lib.DSA_new()
         assert ctx != self._ffi.NULL
         ctx = self._ffi.gc(ctx, self._lib.DSA_free)
+        ctx.p = self._lib.BN_dup(parameters._dsa_cdata.p)
+        ctx.q = self._lib.BN_dup(parameters._dsa_cdata.q)
+        ctx.g = self._lib.BN_dup(parameters._dsa_cdata.g)
 
         self._lib.DSA_generate_key(ctx)
 

diff --git a/src/cryptography/hazmat/bindings/openssl/dsa.py b/src/cryptography/hazmat/bindings/openssl/dsa.py
@@ -48,8 +48,6 @@
 MACROS = """
 int DSA_generate_parameters_ex(DSA *, int, unsigned char *, int,
                                int *, unsigned long *, BN_GENCB *);
-// This is a macro in OpenSSL < 1.0.0
-DSA *DSAparams_dup(DSA *);
 """
 
 CUSTOMIZATIONS = """