projects
/
citadel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
59aee5f
)
LONG STRING OF EXPLETIVES
author
Art Cancro
<ajc@citadel.org>
Mon, 10 Jan 2022 21:10:34 +0000
(16:10 -0500)
committer
Art Cancro
<ajc@citadel.org>
Mon, 10 Jan 2022 21:10:34 +0000
(16:10 -0500)
citadel/modules/crypto/serv_crypto.c
patch
|
blob
|
history
diff --git
a/citadel/modules/crypto/serv_crypto.c
b/citadel/modules/crypto/serv_crypto.c
index ee03fdaef91357e815791b9ffb43ef1962ab29e6..695ae4209740e3eda46ec1675b9e6837a2197a14 100644
(file)
--- a/
citadel/modules/crypto/serv_crypto.c
+++ b/
citadel/modules/crypto/serv_crypto.c
@@
-216,7
+216,14
@@
void bind_to_key_and_certificate(void) {
SSL_CTX *old_ctx = NULL;
SSL_CTX *new_ctx = NULL;
SSL_CTX *old_ctx = NULL;
SSL_CTX *new_ctx = NULL;
- if (!(new_ctx = SSL_CTX_new(TLS_server_method()))) {
+ const SSL_METHOD *method = TLS_server_method();
+ if (!method) {
+ syslog(LOG_ERR, "crypto: TLS_server_method() failed: %s", ERR_reason_error_string(ERR_get_error()));
+ return;
+ }
+
+ new_ctx = SSL_CTX_new(method);
+ if (!new_ctx) {
syslog(LOG_ERR, "crypto: SSL_CTX_new failed: %s", ERR_reason_error_string(ERR_get_error()));
return;
}
syslog(LOG_ERR, "crypto: SSL_CTX_new failed: %s", ERR_reason_error_string(ERR_get_error()));
return;
}
@@
-273,6
+280,7
@@
void init_ssl(void) {
SSL_load_error_strings();
ERR_load_crypto_strings();
OpenSSL_add_all_algorithms();
SSL_load_error_strings();
ERR_load_crypto_strings();
OpenSSL_add_all_algorithms();
+ OpenSSL_add_all_ciphers();
SSL_library_init();
// Load (or generate) a key and certificate
SSL_library_init();
// Load (or generate) a key and certificate