diff options
| author | Philip Hazel <ph10@hermes.cam.ac.uk> | 2004-11-25 15:29:36 +0000 |
|---|---|---|
| committer | Philip Hazel <ph10@hermes.cam.ac.uk> | 2004-11-25 15:29:36 +0000 |
| commit | d6453af2c864d0bd57785f5f808bc366d6f18970 (patch) | |
| tree | 49559f01e3257ca744ede05e2b79ec1ab1fb9302 | |
| parent | c38d6da94aa327f7c42a90b50508c62702412fef (diff) | |
| download | exim4-d6453af2c864d0bd57785f5f808bc366d6f18970.tar.gz | |
OpenSSL: make same change as recently for GnuTLS: show file name if
certificate or key file setup fails, because the message from the
library doesn't. Also, update all the OpenSSL TLS tests, which hadn't
been tried for a while, for various recent changes such as protocol
names.
| -rw-r--r-- | doc/doc-txt/ChangeLog | 4 | ||||
| -rw-r--r-- | src/src/tls-openssl.c | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog index a9980534c..c35a96f65 100644 --- a/doc/doc-txt/ChangeLog +++ b/doc/doc-txt/ChangeLog @@ -1,4 +1,4 @@ -$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.41 2004/11/25 13:54:31 ph10 Exp $ +$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.42 2004/11/25 15:29:36 ph10 Exp $ Change log file for Exim from version 4.21 ------------------------------------------- @@ -178,6 +178,8 @@ Exim version 4.44 42. Allow both -bf and -bF in the same test run. +43. Did the same fix as 41 above for OpenSSL, which had the same infelicity. + Exim version 4.43 ----------------- diff --git a/src/src/tls-openssl.c b/src/src/tls-openssl.c index 18165e306..951e46c25 100644 --- a/src/src/tls-openssl.c +++ b/src/src/tls-openssl.c @@ -1,4 +1,4 @@ -/* $Cambridge: exim/src/src/tls-openssl.c,v 1.1 2004/10/07 10:39:01 ph10 Exp $ */ +/* $Cambridge: exim/src/src/tls-openssl.c,v 1.2 2004/11/25 15:29:37 ph10 Exp $ */ /************************************************* * Exim - an Internet mail transport agent * @@ -381,7 +381,8 @@ if (certificate != NULL) { DEBUG(D_tls) debug_printf("tls_certificate file %s\n", expanded); if (!SSL_CTX_use_certificate_chain_file(ctx, CS expanded)) - return tls_error(US"SSL_CTX_use_certificate_chain_file", host); + return tls_error(string_sprintf( + "SSL_CTX_use_certificate_chain_file file=%s", expanded), host); } if (privatekey != NULL && @@ -392,7 +393,8 @@ if (certificate != NULL) { DEBUG(D_tls) debug_printf("tls_privatekey file %s\n", expanded); if (!SSL_CTX_use_PrivateKey_file(ctx, CS expanded, SSL_FILETYPE_PEM)) - return tls_error(US"SSL_CTX_use_PrivateKey_file", host); + return tls_error(string_sprintf( + "SSL_CTX_use_PrivateKey_file file=%s", expanded), host); } } |