[Pkg-Cyrus-imapd-Debian-devel] [SVN] r97 - in trunk/cyrus-imapd-2.2.12: imap imtest lib

[pkg-cyrus-imapd-debian-devel@lists.alioth.debian.org]

Author: sven
Date: 2005-04-15 22:45:24 +0200 (Fri, 15 Apr 2005)
New Revision: 97

Modified:
   trunk/cyrus-imapd-2.2.12/imap/tls.c
   trunk/cyrus-imapd-2.2.12/imtest/imtest.c
   trunk/cyrus-imapd-2.2.12/lib/imclient.c
Log:
Add a guess of what the problem might be to the set_cert_stuff failure ha=
ndling

Modified: trunk/cyrus-imapd-2.2.12/imap/tls.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/cyrus-imapd-2.2.12/imap/tls.c	2005-04-08 17:32:01 UTC (rev 96)
+++ trunk/cyrus-imapd-2.2.12/imap/tls.c	2005-04-15 20:45:24 UTC (rev 97)
@@ -679,7 +679,7 @@
     s_key_file =3D config_getstring(IMAPOPT_TLS_KEY_FILE);
=20
     if (!set_cert_stuff(s_ctx, s_cert_file, s_key_file)) {
-	syslog(LOG_ERR,"TLS server engine: cannot load cert/key data");
+	syslog(LOG_ERR,"TLS server engine: cannot load cert/key data, may be a =
cert/key mismatch?");
 	return (-1);
     }
     SSL_CTX_set_tmp_rsa_callback(s_ctx, tmp_rsa_cb);
@@ -1098,7 +1098,7 @@
    =20
     if (c_cert_file || c_key_file) {
 	if (!set_cert_stuff(c_ctx, c_cert_file, c_key_file)) {
-	    syslog(LOG_ERR,"TLS client engine: cannot load cert/key data");
+	    syslog(LOG_ERR,"TLS client engine: cannot load cert/key data, may b=
e a cert/key mismatch?");
 	    return (-1);
 	}
     }

Modified: trunk/cyrus-imapd-2.2.12/imtest/imtest.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/cyrus-imapd-2.2.12/imtest/imtest.c	2005-04-08 17:32:01 UTC (rev=
 96)
+++ trunk/cyrus-imapd-2.2.12/imtest/imtest.c	2005-04-15 20:45:24 UTC (rev=
 97)
@@ -532,7 +532,7 @@
    =20
     if (c_cert_file || c_key_file)
 	if (!set_cert_stuff(tls_ctx, c_cert_file, c_key_file)) {
-	    printf("TLS engine: cannot load cert/key data\n");
+	    printf("TLS engine: cannot load cert/key data, maybe a cert/key mis=
match?\n");
 	    return IMTEST_FAIL;
 	}
     SSL_CTX_set_tmp_rsa_callback(tls_ctx, tmp_rsa_cb);

Modified: trunk/cyrus-imapd-2.2.12/lib/imclient.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/cyrus-imapd-2.2.12/lib/imclient.c	2005-04-08 17:32:01 UTC (rev =
96)
+++ trunk/cyrus-imapd-2.2.12/lib/imclient.c	2005-04-15 20:45:24 UTC (rev =
97)
@@ -1733,7 +1733,7 @@
=20
     if (c_cert_file || c_key_file)
 	if (!set_cert_stuff(imclient->tls_ctx, c_cert_file, c_key_file)) {
-	    printf("[ TLS engine: cannot load cert/key data ]\n");
+	    printf("[ TLS engine: cannot load cert/key data, might be a cert/ke=
y mismatch]\n");
 	    return -1;
 	}
     SSL_CTX_set_tmp_rsa_callback(imclient->tls_ctx, tmp_rsa_cb);