aboutsummaryrefslogtreecommitdiffstats
path: root/src/_cffi_src/openssl/rsa.py
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2018-05-30 22:31:47 -0400
committerPaul Kehrer <paul.l.kehrer@gmail.com>2018-05-31 10:31:47 +0800
commit8a64f1f2fbea73f0b7a4725768dc9597d240c661 (patch)
tree38379a1da072116328118a7e8ba266050ad34c4d /src/_cffi_src/openssl/rsa.py
parent015483830765fbdd01ce393bd1f02c9f72344a03 (diff)
downloadcryptography-8a64f1f2fbea73f0b7a4725768dc9597d240c661.tar.gz
cryptography-8a64f1f2fbea73f0b7a4725768dc9597d240c661.tar.bz2
cryptography-8a64f1f2fbea73f0b7a4725768dc9597d240c661.zip
Removes branches in bindings for various OpenSSL 1.1.0 prereleases (#4269)
* Remove defines for openssl 1.1.0 pre * Update bio.py * Update dh.py * Update dsa.py * Update rsa.py * Update x509_vfy.py * Compress branches
Diffstat (limited to 'src/_cffi_src/openssl/rsa.py')
-rw-r--r--src/_cffi_src/openssl/rsa.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/_cffi_src/openssl/rsa.py b/src/_cffi_src/openssl/rsa.py
index 13de2aae..9455433e 100644
--- a/src/_cffi_src/openssl/rsa.py
+++ b/src/_cffi_src/openssl/rsa.py
@@ -75,8 +75,8 @@ int (*EVP_PKEY_CTX_set0_rsa_oaep_label)(EVP_PKEY_CTX *, unsigned char *,
int) = NULL;
#endif
-/* These functions were added in OpenSSL 1.1.0-pre5 (beta2) */
-#if CRYPTOGRAPHY_OPENSSL_LESS_THAN_110PRE5
+/* These functions were added in OpenSSL 1.1.0 */
+#if CRYPTOGRAPHY_OPENSSL_LESS_THAN_110
int RSA_set0_key(RSA *r, BIGNUM *n, BIGNUM *e, BIGNUM *d)
{
/* If the fields n and e in r are NULL, the corresponding input