Make the AES-GCM cipher suites work in DTLS, by moving the

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 54 matching lines @@
 #define calg_camellia   ssl_calg_camellia
 #define calg_seed       ssl_calg_seed
 #define calg_aes_gcm    ssl_calg_aes_gcm
 
 #define mac_null        ssl_mac_null
 #define mac_md5         ssl_mac_md5
 #define mac_sha         ssl_mac_sha
 #define hmac_md5        ssl_hmac_md5
 #define hmac_sha        ssl_hmac_sha
 #define hmac_sha256     ssl_hmac_sha256
+#define hmac_sha384     ssl_hmac_sha384
+#define hmac_sha512     ssl_hmac_sha512
+#define mac_aead        ssl_mac_aead
 
 #define SET_ERROR_CODE          /* reminder */
 #define SEND_ALERT              /* reminder */
 #define TEST_FOR_FAILURE        /* reminder */
 #define DEAL_WITH_FAILURE       /* reminder */
 
 #if defined(DEBUG) || defined(TRACE)
 #ifdef __cplusplus
 #define Debug 1
 #else
@@ skipping 441 matching lines @@
                                const unsigned char *in,
                                int                  inlen);
 typedef SECStatus (*SSLAEADCipher)(
                                ssl3KeyMaterial *    keys,
                                PRBool               doDecrypt,
                                unsigned char *      out,
                                int *                outlen,
                                int                  maxout,
                                const unsigned char *in,
                                int                  inlen,
-                               SSL3ContentType      type,
-                               SSL3ProtocolVersion  version,
-                               SSL3SequenceNumber   seqnum);

[wtc, 2013/08/17 00:21:15]

The |type|, |version|, and |seqnum| arguments were only used to build
the record pseudo-header. For DTLS, the |version| is the logical version,
not the version used on the wire. This is why SSLAEADCipher didn't work
in DTLS.

To fix this, I have the callers of SSLAEADCipher call
ssl3_BuildRecordPseudoHeader and pass the pseudo-header as the
|additionalData| argument to SSLAEADCipher.

+                               const unsigned char *additionalData,
+                               int                  additionalDataLen);
 typedef SECStatus (*SSLCompressor)(void *               context,
                                    unsigned char *      out,
                                    int *                outlen,
                                    int                  maxout,
                                    const unsigned char *in,
                                    int                  inlen);
 typedef SECStatus (*SSLDestroy)(void *context, PRBool freeit);
 
 /* The DTLS anti-replay window. Defined here because we need it in
  * the cipher spec. Note that this is a ring buffer but left and
@@ skipping 1383 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_ */