--- evolution-data-server-2.27.90/camel/camel-tcp-stream-ssl.c	2009-08-07 21:20:30.000000000 +0800
+++ evolution-data-server-2.27.90-patched/camel/camel-tcp-stream-ssl.c	2009-08-21 18:47:58.000000000 +0800
@@ -1067,8 +1067,13 @@
 
 	SSL_SetURL (ssl_fd, ssl->priv->expected_host);
 
-	/*SSL_GetClientAuthDataHook (sslSocket, ssl_get_client_auth, (gpointer) certNickname);*/
-	/*SSL_AuthCertificateHook (ssl_fd, ssl_auth_cert, (gpointer) CERT_GetDefaultCertDB ());*/
+ 	/* NSS provides a default implementation for the SSL_GetClientAuthDataHook callback
+ 	 * but does not enable it by default. It must be explicltly requested by the application.
+ 	 * See: http://www.mozilla.org/projects/security/pki/nss/ref/ssl/sslfnc.html#1126622 */
+ 	SSL_GetClientAuthDataHook (ssl_fd, (SSLGetClientAuthData)&NSS_GetClientAuthData, NULL );
+ 
+ 	/* NSS provides _and_ installs a default implementation for the
+ 	 * SSL_AuthCertificateHook callback so we _don't_ need to install one. */
 	SSL_BadCertHook (ssl_fd, ssl_bad_cert, ssl);
 
 	ssl->priv->ssl_mode = TRUE;
