diff options
| author | Donald Stufft <donald@stufft.io> | 2014-04-09 09:58:58 -0400 |
|---|---|---|
| committer | Donald Stufft <donald@stufft.io> | 2014-04-09 09:58:58 -0400 |
| commit | f62953a5044065d61ad99b2543940a97c988f00c (patch) | |
| tree | 7c0435f3de66c425c4a70f5a2e4104791c8c08f5 | |
| parent | cb7285b87c384b94609ccd7699d7be9ee97b93de (diff) | |
| parent | 8eda85f7d24d7604121e3a86f64e3a1d6e2a2f95 (diff) | |
| download | cryptography-f62953a5044065d61ad99b2543940a97c988f00c.tar.gz cryptography-f62953a5044065d61ad99b2543940a97c988f00c.tar.bz2 cryptography-f62953a5044065d61ad99b2543940a97c988f00c.zip | |
Merge pull request #907 from reaperhulk/move-rsa-blinding
move RSA blinding to rsa_cdata creation methods rather than evp_pkey
| -rw-r--r-- | cryptography/hazmat/backends/openssl/backend.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/cryptography/hazmat/backends/openssl/backend.py b/cryptography/hazmat/backends/openssl/backend.py index 47d4e37d..bbcfa327 100644 --- a/cryptography/hazmat/backends/openssl/backend.py +++ b/cryptography/hazmat/backends/openssl/backend.py @@ -346,9 +346,6 @@ class Backend(object): evp_pkey = self._new_evp_pkey() rsa_cdata = self._rsa_cdata_from_private_key(private_key) - res = self._lib.RSA_blinding_on(rsa_cdata, self._ffi.NULL) - assert res == 1 - res = self._lib.EVP_PKEY_assign_RSA(evp_pkey, rsa_cdata) assert res == 1 @@ -358,9 +355,6 @@ class Backend(object): evp_pkey = self._new_evp_pkey() rsa_cdata = self._rsa_cdata_from_public_key(public_key) - res = self._lib.RSA_blinding_on(rsa_cdata, self._ffi.NULL) - assert res == 1 - res = self._lib.EVP_PKEY_assign_RSA(evp_pkey, rsa_cdata) assert res == 1 @@ -391,6 +385,9 @@ class Backend(object): ctx.dmp1 = self._int_to_bn(private_key.dmp1) ctx.dmq1 = self._int_to_bn(private_key.dmq1) ctx.iqmp = self._int_to_bn(private_key.iqmp) + res = self._lib.RSA_blinding_on(ctx, self._ffi.NULL) + assert res == 1 + return ctx def _rsa_cdata_from_public_key(self, public_key): @@ -401,6 +398,9 @@ class Backend(object): assert ctx != self._ffi.NULL 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) + assert res == 1 + return ctx def create_rsa_signature_ctx(self, private_key, padding, algorithm): |