Reland r209278

net/third_party/nss/README.chromium

 Name: Network Security Services (NSS)
 URL: http://www.mozilla.org/projects/security/pki/nss/
 Version: 3.15 Beta 2
 Security Critical: Yes
 License: MPL 2
 License File: NOT_SHIPPED
 
 This directory includes a copy of NSS's libssl from the hg repo at:
   https://hg.mozilla.org/projects/nss
 
@@ skipping 57 matching lines @@
 
   * SSL_ExportKeyingMaterial should get the RecvBufLock and SSL3HandshakeLock.
     This change was made in https://chromiumcodereview.appspot.com/10454066.
     patches/secretexporterlocks.patch
 
   * Allow the constant-time CBC processing code to be compiled against older
     NSS that doesn't contain the CBC constant-time changes.
     patches/cbc.patch
     https://code.google.com/p/chromium/issues/detail?id=172658#c12
 
-  * Define AES_256_KEY_LENGTH if the system blapit.h header doesn't define it.
-    Remove this patch when all system NSS packages are NSS 3.12.10 or later.
-    patches/aes256keylength.patch
-
   * Change ssl3_SuiteBOnly to always return PR_TRUE. The softoken in NSS
     versions older than 3.15 report an EC key size range of 112 bits to 571
     bits, even when it is compiled to support only the NIST P-256, P-384, and
     P-521 curves. Remove this patch when all system NSS softoken packages are
     NSS 3.15 or later.
     patches/suitebonly.patch
 
   * Define the SECItemArray type and declare the SECItemArray handling
     functions, which were added in NSS 3.15. Remove this patch when all system
     NSS packages are NSS 3.15 or later.
@@ skipping 16 matching lines @@
     https://bugzilla.mozilla.org/show_bug.cgi?id=480514
 
   * Update Chromium-specific code for TLS 1.2.
     patches/tls12chromium.patch
 
 Apply the patches to NSS by running the patches/applypatches.sh script.  Read
 the comments at the top of patches/applypatches.sh for instructions.
 
 The ssl/bodge directory contains files taken from the NSS repo that we required
 for building libssl outside of its usual build environment.