Update NSS to NSS_3_15_BETA2.

nss/lib/freebl/gcm.c

 /* 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/. */
 
 #ifdef FREEBL_NO_DEPEND
 #include "stubs.h"
 #endif
 #include "blapii.h"
 #include "blapit.h"
 #include "gcm.h"
@@ skipping 559 matching lines @@
     PORT_Memset(ghash->counterBuf, 0, GCM_HASH_LEN_LEN*2);
     ghash->bufLen = 0;
     gcm_zeroX(ghash);
 
     /* now kick things off by hashing the Additional Authenticated Data */
     if (AADLen != 0) {
         rv = gcmHash_Update(ghash, AAD, AADLen, blocksize);
         if (rv != SECSuccess) {
             return SECFailure;
         }
+        rv = gcmHash_Sync(ghash, blocksize);
+        if (rv != SECSuccess) {
+            return SECFailure;
+        }
     }
-    rv = gcmHash_Sync(ghash, blocksize);
-    if (rv != SECSuccess) {
-        return SECFailure;
-    }
     return SECSuccess;
 }
 
 /**************************************************************************
  *           Now implement the GCM using gcmHash and CTR                  *
  **************************************************************************/
 
 /* state to handle the full GCM operation (hash and counter) */
 struct GCMContextStr {
     gcmHashContext ghash_context;
@@ skipping 242 matching lines @@
      * preserve the masked off missing bits.  */
     if (NSS_SecureMemcmp(tag, intag, tagBytes) != 0) {
         /* force a CKR_ENCRYPTED_DATA_INVALID error at in softoken */
         PORT_SetError(SEC_ERROR_BAD_DATA);
         return SECFailure;
     }
     /* finish the decryption */
     return CTR_Update(&gcm->ctr_context, outbuf, outlen, maxout,
                           inbuf, inlen, blocksize);
 }