Update to NSS 3.12.9. falsestart.patch, falsestart2.patch, and...

net/third_party/nss/ssl/ssl3con.c

 /*
  * SSL3 Protocol
  *
  * ***** 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
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
@@ skipping 21 matching lines @@
  * in which case the provisions of the GPL or the LGPL are applicable instead
  * of those above. If you wish to allow use of your version of this file only
  * under the terms of either the GPL or the LGPL, and not to allow others to
  * use your version of this file under the terms of the MPL, indicate your
  * decision by deleting the provisions above and replace them with the notice
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-/* $Id: ssl3con.c,v 1.142 2010/06/24 19:53:20 wtc%google.com Exp $ */
+/* $Id: ssl3con.c,v 1.142.2.4 2010/09/01 19:47:11 wtc%google.com Exp $ */
 
 #include "cert.h"
 #include "ssl.h"
 #include "cryptohi.h"   /* for DSAU_ stuff */
 #include "keyhi.h"
 #include "secder.h"
 #include "secitem.h"
 
 #include "sslimpl.h"
 #include "sslproto.h"
@@ skipping 2790 matching lines @@
         key_derive    = CKM_TLS_KEY_AND_MAC_DERIVE;
         keyFlags      = CKF_SIGN | CKF_VERIFY;
     } else {
         if (isDH) master_derive = CKM_SSL3_MASTER_KEY_DERIVE_DH;
         else master_derive = CKM_SSL3_MASTER_KEY_DERIVE;
         key_derive    = CKM_SSL3_KEY_AND_MAC_DERIVE;
         keyFlags      = 0;
     }
 
     if (pms || !pwSpec->master_secret) {
-        master_params.pVersion                     = &pms_version;
+        if (isDH) {
+            master_params.pVersion                     = NULL;
+        } else {
+            master_params.pVersion                     = &pms_version;
+        }
         master_params.RandomInfo.pClientRandom     = cr;
         master_params.RandomInfo.ulClientRandomLen = SSL3_RANDOM_LENGTH;
         master_params.RandomInfo.pServerRandom     = sr;
         master_params.RandomInfo.ulServerRandomLen = SSL3_RANDOM_LENGTH;
 
         params.data = (unsigned char *) &master_params;
         params.len  = sizeof master_params;
     }
 
     if (pms != NULL) {
@@ skipping 2501 matching lines @@
     case kt_dh: {
         SECItem          dh_p      = {siBuffer, NULL, 0};
         SECItem          dh_g      = {siBuffer, NULL, 0};
         SECItem          dh_Ys     = {siBuffer, NULL, 0};
 
         rv = ssl3_ConsumeHandshakeVariable(ss, &dh_p, 2, &b, &length);
         if (rv != SECSuccess) {
             goto loser;         /* malformed. */
         }
         if (dh_p.len < 512/8) {
-            errCode = SSL_ERROR_WEAK_SERVER_KEY;
+            errCode = SSL_ERROR_WEAK_SERVER_EPHEMERAL_DH_KEY;
             goto alert_loser;
         }
         rv = ssl3_ConsumeHandshakeVariable(ss, &dh_g, 2, &b, &length);
         if (rv != SECSuccess) {
             goto loser;         /* malformed. */
         }
         if (dh_g.len == 0 || dh_g.len > dh_p.len + 1 ||
            (dh_g.len == 1 && dh_g.data[0] == 0))
             goto alert_loser;
         rv = ssl3_ConsumeHandshakeVariable(ss, &dh_Ys, 2, &b, &length);
@@ skipping 4492 matching lines @@
 
     ss->ssl3.initialized = PR_FALSE;
 
     if (ss->ssl3.nextProto.data) {
         PORT_Free(ss->ssl3.nextProto.data);
         ss->ssl3.nextProto.data = NULL;
     }
 }
 
 /* End of ssl3con.c */