Update third_party/nss to 3.15.5 Beta 2.

nss/lib/softoken/pkcs11c.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/. */
 /*
  * This file implements PKCS 11 on top of our existing security modules
  *
  * For more information about PKCS 11 See PKCS 11 Token Inteface Standard.
  *   This implementation has two slots:
  *      slot 1 is our generic crypto support. It does not require login.
  *   It supports Public Key ops, and all they bulk ciphers and hashes. 
@@ skipping 4013 matching lines @@
         key_gen_type = nsc_jpake;
         key_type = CKK_NSS_JPAKE_ROUND1;
         objclass = CKO_PRIVATE_KEY;
         if (pMechanism->pParameter == NULL ||
             pMechanism->ulParameterLen != sizeof(CK_NSS_JPAKERound1Params)) {
             crv = CKR_MECHANISM_PARAM_INVALID;
             break;
         }
         if (sftk_isTrue(key, CKA_TOKEN)) {
             crv = CKR_TEMPLATE_INCONSISTENT;
+            break;
         }
         crv = CKR_OK;
         break;
     default:
         crv = CKR_MECHANISM_INVALID;
         break;
     }
 
     /* make sure we aren't going to overflow the buffer */
     if (sizeof(buf) < key_length) {
@@ skipping 3359 matching lines @@
     att = sftk_FindAttribute(key,CKA_VALUE);
     sftk_FreeObject(key);
     if (!att) {
         return CKR_KEY_HANDLE_INVALID;        
     }
     crv = NSC_DigestUpdate(hSession,(CK_BYTE_PTR)att->attrib.pValue,
                            att->attrib.ulValueLen);
     sftk_FreeAttribute(att);
     return crv;
 }