projects
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Debug: fix coding in dnssec reporting. Bug 2205
[exim.git]
/
src
/
src
/
tls-openssl.c
diff --git
a/src/src/tls-openssl.c
b/src/src/tls-openssl.c
index f1176a63e512484937abca78c772505991148a6b..9816f734f3018a0bcf0638139c759a9dc144d7fa 100644
(file)
--- a/
src/src/tls-openssl.c
+++ b/
src/src/tls-openssl.c
@@
-228,14
+228,13
@@
return host ? FAIL : DEFER;
-#ifdef EXIM_HAVE_EPHEM_RSA_KEX
/*************************************************
* Callback to generate RSA key *
*************************************************/
/*
Arguments:
/*************************************************
* Callback to generate RSA key *
*************************************************/
/*
Arguments:
- s SSL connection
+ s SSL connection
(not used)
export not used
keylength keylength
export not used
keylength keylength
@@
-270,7
+269,6
@@
if (!(rsa_key = RSA_generate_key(keylength, RSA_F4, NULL, NULL)))
}
return rsa_key;
}
}
return rsa_key;
}
-#endif
@@
-977,8
+975,7
@@
if (!(x509 = X509_new()))
goto err;
where = US"generating pkey";
goto err;
where = US"generating pkey";
- /* deprecated, use RSA_generate_key_ex() */
-if (!(rsa = RSA_generate_key(1024, RSA_F4, NULL, NULL)))
+if (!(rsa = rsa_callback(NULL, 0, 1024)))
goto err;
where = US"assigning pkey";
goto err;
where = US"assigning pkey";