diff options
| author | Alex Stapleton <alexs@prol.etari.at> | 2014-06-29 12:13:49 +0100 |
|---|---|---|
| committer | Alex Stapleton <alexs@prol.etari.at> | 2014-06-29 12:13:49 +0100 |
| commit | 7bcdff9830e80f7dd7c5b5243892423548917bca (patch) | |
| tree | f7b08411e67794b74ada74bd4e570d6bb471806a | |
| parent | 0c19dc93a56a59d972993300c0233eb877d3da28 (diff) | |
| download | cryptography-7bcdff9830e80f7dd7c5b5243892423548917bca.tar.gz cryptography-7bcdff9830e80f7dd7c5b5243892423548917bca.tar.bz2 cryptography-7bcdff9830e80f7dd7c5b5243892423548917bca.zip | |
These functions can do their own GC now
| -rw-r--r-- | cryptography/hazmat/backends/openssl/backend.py | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/cryptography/hazmat/backends/openssl/backend.py b/cryptography/hazmat/backends/openssl/backend.py index e8fc3a4d..cfd1078b 100644 --- a/cryptography/hazmat/backends/openssl/backend.py +++ b/cryptography/hazmat/backends/openssl/backend.py @@ -506,10 +506,10 @@ class Backend(object): ) def _rsa_cdata_from_private_key(self, private_key): - # Does not GC the RSA cdata. You *must* make sure it's freed - # correctly yourself! ctx = self._lib.RSA_new() assert ctx != self._ffi.NULL + ctx = self._ffi.gc(ctx, self._lib.RSA_free) + ctx.p = self._int_to_bn(private_key.p) ctx.q = self._int_to_bn(private_key.q) ctx.d = self._int_to_bn(private_key.d) @@ -524,11 +524,10 @@ class Backend(object): return ctx def _rsa_cdata_from_public_key(self, public_key): - # Does not GC the RSA cdata. You *must* make sure it's freed - # correctly yourself! - ctx = self._lib.RSA_new() assert ctx != self._ffi.NULL + ctx = self._ffi.gc(ctx, self._lib.RSA_free) + ctx.e = self._int_to_bn(public_key.e) ctx.n = self._int_to_bn(public_key.n) res = self._lib.RSA_blinding_on(ctx, self._ffi.NULL) @@ -544,7 +543,6 @@ class Backend(object): stacklevel=2 ) rsa_cdata = self._rsa_cdata_from_private_key(private_key) - rsa_cdata = self._ffi.gc(rsa_cdata, self._lib.RSA_free) key = _RSAPrivateKey(self, rsa_cdata) return _RSASignatureContext(self, key, padding, algorithm) @@ -557,7 +555,6 @@ class Backend(object): stacklevel=2 ) rsa_cdata = self._rsa_cdata_from_public_key(public_key) - rsa_cdata = self._ffi.gc(rsa_cdata, self._lib.RSA_free) key = _RSAPublicKey(self, rsa_cdata) return _RSAVerificationContext(self, key, signature, padding, algorithm) @@ -739,7 +736,6 @@ class Backend(object): stacklevel=2 ) rsa_cdata = self._rsa_cdata_from_private_key(private_key) - rsa_cdata = self._ffi.gc(rsa_cdata, self._lib.RSA_free) key = _RSAPrivateKey(self, rsa_cdata) return key.decrypt(ciphertext, padding) @@ -751,7 +747,6 @@ class Backend(object): stacklevel=2 ) rsa_cdata = self._rsa_cdata_from_public_key(public_key) - rsa_cdata = self._ffi.gc(rsa_cdata, self._lib.RSA_free) key = _RSAPublicKey(self, rsa_cdata) return key.encrypt(plaintext, padding) |