Certificate Transparency TLS extension patch for NSS

net/third_party/nss/ssl/sslimpl.h

 /*
  * This file is PRIVATE to SSL and should be the first thing included by
  * any SSL implementation file.
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #ifndef __sslimpl_h_
 #define __sslimpl_h_
@@ skipping 287 matching lines @@
 #define ssl_V3_SUITES_IMPLEMENTED 37
 #endif /* NSS_ENABLE_ECC */
 
 #define MAX_DTLS_SRTP_CIPHER_SUITES 4
 
 typedef struct sslOptionsStr {
     /* If SSL_SetNextProtoNego has been called, then this contains the
      * list of supported protocols. */
     SECItem nextProtoNego;
 
-    unsigned int useSecurity            : 1;  /*  1 */
-    unsigned int useSocks               : 1;  /*  2 */
-    unsigned int requestCertificate     : 1;  /*  3 */
-    unsigned int requireCertificate     : 2;  /*  4-5 */
-    unsigned int handshakeAsClient      : 1;  /*  6 */
-    unsigned int handshakeAsServer      : 1;  /*  7 */
-    unsigned int enableSSL2             : 1;  /*  8 */
-    unsigned int unusedBit9             : 1;  /*  9 */
-    unsigned int unusedBit10            : 1;  /* 10 */
-    unsigned int noCache                : 1;  /* 11 */
-    unsigned int fdx                    : 1;  /* 12 */
-    unsigned int v2CompatibleHello      : 1;  /* 13 */
-    unsigned int detectRollBack         : 1;  /* 14 */
-    unsigned int noStepDown             : 1;  /* 15 */
-    unsigned int bypassPKCS11           : 1;  /* 16 */
-    unsigned int noLocks                : 1;  /* 17 */
-    unsigned int enableSessionTickets   : 1;  /* 18 */
-    unsigned int enableDeflate          : 1;  /* 19 */
-    unsigned int enableRenegotiation    : 2;  /* 20-21 */
-    unsigned int requireSafeNegotiation : 1;  /* 22 */
-    unsigned int enableFalseStart       : 1;  /* 23 */
-    unsigned int cbcRandomIV            : 1;  /* 24 */
-    unsigned int enableOCSPStapling     : 1;  /* 25 */
+    unsigned int useSecurity                : 1;  /*  1 */
+    unsigned int useSocks                   : 1;  /*  2 */
+    unsigned int requestCertificate         : 1;  /*  3 */
+    unsigned int requireCertificate         : 2;  /*  4-5 */
+    unsigned int handshakeAsClient          : 1;  /*  6 */
+    unsigned int handshakeAsServer          : 1;  /*  7 */
+    unsigned int enableSSL2                 : 1;  /*  8 */
+    unsigned int unusedBit9                 : 1;  /*  9 */
+    unsigned int unusedBit10                : 1;  /* 10 */
+    unsigned int noCache                    : 1;  /* 11 */
+    unsigned int fdx                        : 1;  /* 12 */
+    unsigned int v2CompatibleHello          : 1;  /* 13 */
+    unsigned int detectRollBack             : 1;  /* 14 */
+    unsigned int noStepDown                 : 1;  /* 15 */
+    unsigned int bypassPKCS11               : 1;  /* 16 */
+    unsigned int noLocks                    : 1;  /* 17 */
+    unsigned int enableSessionTickets       : 1;  /* 18 */
+    unsigned int enableDeflate              : 1;  /* 19 */
+    unsigned int enableRenegotiation        : 2;  /* 20-21 */
+    unsigned int requireSafeNegotiation     : 1;  /* 22 */
+    unsigned int enableFalseStart           : 1;  /* 23 */
+    unsigned int cbcRandomIV                : 1;  /* 24 */
+    unsigned int enableOCSPStapling         : 1;  /* 25 */
+    unsigned int enableSignedCertTimestamps : 1;  /* 26 */
 } sslOptions;
 
 typedef enum { sslHandshakingUndetermined = 0,
                sslHandshakingAsClient,
                sslHandshakingAsServer 
 } sslHandshakingType;
 
 typedef struct sslServerCertsStr {
     /* Configuration state for server sockets */
     CERTCertificate *     serverCert;
@@ skipping 350 matching lines @@
             PRUint16          clAuthSeries;
 
             char              masterValid;
             char              clAuthValid;
 
             /* Session ticket if we have one, is sent as an extension in the
              * ClientHello message.  This field is used by clients.
              */
             NewSessionTicket  sessionTicket;
             SECItem           srvName;
+            /* Signed certificate timestamps received in a TLS extension.

[wtc, 2013/11/08 19:51:31]

Nit: add a blank line before this line.

[ekasper, 2013/11/18 17:47:18]

Done.

+            ** (used only in client).
+            */
+            SECItem           signedCertTimestamps;
         } ssl3;
     } u;
 };
 
 
 typedef struct ssl3CipherSuiteDefStr {
     ssl3CipherSuite          cipher_suite;
     SSL3BulkCipher           bulk_cipher_alg;
     SSL3MACAlgorithm         mac_alg;
     SSL3KeyExchangeAlgorithm key_exchange_alg;
@@ skipping 71 matching lines @@
     /* SessionTicket Extension related data. */
     PRBool ticketTimestampVerified;
     PRBool emptySessionTicket;
 
     /* SNI Extension related data
      * Names data is not coppied from the input buffer. It can not be
      * used outside the scope where input buffer is defined and that
      * is beyond ssl3_HandleClientHello function. */
     SECItem *sniNameArr;
     PRUint32 sniNameArrSize;
+    /* Signed Certificate Timestamps extracted from the TLS extension.

[wtc, 2013/11/08 19:51:31]

Nit: add a blank line before this line.

[ekasper, 2013/11/18 17:47:18]

Done.

+     * (client only).
+     * This container holds a temporary pointer to the extension data,
+     * until a session is setup that can hold a permanent copy of the data.

[wtc, 2013/11/08 19:51:31]

Is the 'signedCertTimestamps' SECItem on line 705 the permanent copy of the
data?

Nit: change "a session" to "a session ID" (which means the NSS sslSessionID
structure). Or we can be precise and use "ss->sec.ci.sid".

[ekasper, 2013/11/18 17:47:18]

Yup.
Changed to more precise wording.

+     * The data pointed to by this structure is neither explicitly allocated
+     * nor copied: the pointer points to the handshake message buffer and is
+     * only valid in the scope of ssl3_HandleServerHello.
+     */
+    SECItem signedCertTimestamps;
 };
 
 typedef SECStatus (*sslRestartTarget)(sslSocket *);
 
 /*
 ** A DTLS queued message (potentially to be retransmitted)
 */
 typedef struct DTLSQueuedMessageStr {
     PRCList link;         /* The linked list link */
     DTLSEpoch epoch;      /* The epoch to use */
@@ skipping 1140 matching lines @@
 #if defined(XP_UNIX) || defined(XP_OS2) || defined(XP_BEOS)
 #define SSL_GETPID getpid
 #elif defined(WIN32)
 extern int __cdecl _getpid(void);
 #define SSL_GETPID _getpid
 #else
 #define SSL_GETPID() 0
 #endif
 
 #endif /* __sslimpl_h_ */