nss: clear session cache if a client cert from file is used

This commit fixes a regression introduced in 052a08ff.

NSS caches certs/keys returned by the SSL_GetClientAuthDataHook callback
and if we connect second time to the same server, the cached cert/key
pair is used.  If we use multiple client certificates for different
paths on the same server, we need to clear the session cache to force
NSS to call the hook again.  The commit 052a08ff prevented the session
cache from being cleared if a client certificate from file was used.

The condition is now fixed to cover both cases: consssl->client_nickname
is not NULL if a client certificate from the NSS database is used and
connssl->obj_clicert is not NULL if a client certificate from file is
used.

Review by: Kai Engert

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 0bf433647ef18cfda05c83efdcdbe1aa62c49da6..c809d35fd5c95eef840ff3b35c270a13938dff87 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -27,7 +27,7 @@ This release includes the following bugfixes:
  o HTTP: remove stray CRLF in chunk-encoded content-free request bodies
  o build: fix AIX compilation and usage of events/revents
  o VC Makefiles: add missing hostcheck
- o 
+ o nss: clear session cache if a client certificate from file is used
 
 This release includes the following known bugs:
 

diff --git a/lib/nss.c b/lib/nss.c
index 298ddad172546aae1073988d18126c285c6e9caf..5c9c11c5ffffae9bf6cc570f7848ef05551098f6 100644 (file)
--- a/lib/nss.c
+++ b/lib/nss.c
@@ -1054,13 +1054,17 @@ void Curl_nss_close(struct connectdata *conn, int sockindex)
        as closed to avoid double close */
     fake_sclose(conn->sock[sockindex]);
     conn->sock[sockindex] = CURL_SOCKET_BAD;
+
+    if((connssl->client_nickname != NULL) || (connssl->obj_clicert != NULL))
+      /* A server might require different authentication based on the
+       * particular path being requested by the client.  To support this
+       * scenario, we must ensure that a connection will never reuse the
+       * authentication data from a previous connection. */
+      SSL_InvalidateSession(connssl->handle);
+
     if(connssl->client_nickname != NULL) {
       free(connssl->client_nickname);
       connssl->client_nickname = NULL;
-
-      /* force NSS to ask again for a client cert when connecting
-       * next time to the same server */
-      SSL_InvalidateSession(connssl->handle);
     }
     /* destroy all NSS objects in order to avoid failure of NSS shutdown */
     Curl_llist_destroy(connssl->obj_list, NULL);