Add NSS function to retrieve TLS client cert types requested by server.

net/third_party/nss/ssl/sslsock.c

 /*
  * vtables (and methods that call through them) for the 4 types of 
  * SSLSockets supported.  Only one type is still supported.
  * Various other functions.
  *
  * ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
@@ skipping 1597 matching lines @@
     if (!ss) {
         SSL_DBG(("%d: SSL[%d]: bad socket in SSL_HandshakeResumedSession",
                  SSL_GETPID(), fd));
         return SECFailure;
     }
 
     *handshake_resumed = ss->ssl3.hs.isResuming;
     return SECSuccess;
 }
 
+SSL_IMPORT

[wtc, 2011/12/02 22:31:46]

Remove SSL_IMPORT, and put
  SECItem *
on its own line.

Put the opening curly brace '{' on its own line.  (That's
the NSS style.)

[mattm, 2011/12/06 00:32:01]

Done.

+SECItem *SSL_CertificateRequestCertTypes(PRFileDesc *fd) {
+  sslSocket *ss = ssl_FindSocket(fd);
+
+  if (!ss) {
+      SSL_DBG(("%d: SSL[%d]: bad socket in SSL_CertificateRequestCertTypes",
+               SSL_GETPID(), fd));
+      return NULL;
+  }
+
+  return ss->requestedCertTypes;
+}
+
 /************************************************************************/
 /* The following functions are the TOP LEVEL SSL functions.
 ** They all get called through the NSPRIOMethods table below.
 */
 
 static PRFileDesc * PR_CALLBACK
 ssl_Accept(PRFileDesc *fd, PRNetAddr *sockaddr, PRIntervalTime timeout)
 {
     sslSocket  *ss;
     sslSocket  *ns      = NULL;
@@ skipping 964 matching lines @@
         ss->preferredCipher    = NULL;
         ss->url                = NULL;
 
         for (i=kt_null; i < kt_kea_size; i++) {
             sslServerCerts * sc = ss->serverCerts + i;
             sc->serverCert      = NULL;
             sc->serverCertChain = NULL;
             sc->serverKeyPair   = NULL;
             sc->serverKeyBits   = 0;
         }
         ss->stepDownKeyPair    = NULL;

[wtc, 2011/12/02 22:31:46]

Let's also set
    ss->requestedCertTypes = NULL;
here, before this line.

[mattm, 2011/12/06 00:32:01]

Done.

         ss->dbHandle           = CERT_GetDefaultCertDB();
 
         /* Provide default implementation of hooks */
         ss->authCertificate    = SSL_AuthCertificate;
         ss->authCertificateArg = (void *)ss->dbHandle;
         ss->sniSocketConfig    = NULL;
         ss->sniSocketConfigArg = NULL;
         ss->getClientAuthData  = NULL;
 #ifdef NSS_PLATFORM_CLIENT_AUTH
         ss->getPlatformClientAuthData = NULL;
@@ skipping 19 matching lines @@
         if (status != SECSuccess) {
 loser:
             ssl_DestroySocketContents(ss);
             ssl_DestroyLocks(ss);
             PORT_Free(ss);
             ss = NULL;
         }
     }
     return ss;
 }
-