Update NSS to NSS_3_15_BETA2.

nss/lib/pk11wrap/pk11pub.h

 /* 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 _PK11PUB_H_
 #define _PK11PUB_H_
 #include "plarena.h"
 #include "seccomon.h"
 #include "secoidt.h"
 #include "secdert.h"
 #include "keyt.h"
@@ skipping 218 matching lines @@
  * create and destroy merge logs needed by PK11_MergeTokens
  */
 PK11MergeLog * PK11_CreateMergeLog(void);
 void PK11_DestroyMergeLog(PK11MergeLog *log);
 
 
 
 /*********************************************************************
  *       Mechanism Mapping functions
  *********************************************************************/
-CK_MECHANISM_TYPE PK11_GetKeyType(CK_MECHANISM_TYPE type,unsigned long len);
+CK_KEY_TYPE PK11_GetKeyType(CK_MECHANISM_TYPE type,unsigned long len);
 CK_MECHANISM_TYPE PK11_GetKeyGen(CK_MECHANISM_TYPE type);
 int PK11_GetBlockSize(CK_MECHANISM_TYPE type,SECItem *params);
 int PK11_GetIVLength(CK_MECHANISM_TYPE type);
 SECItem *PK11_ParamFromIV(CK_MECHANISM_TYPE type,SECItem *iv);
 unsigned char *PK11_IVFromParam(CK_MECHANISM_TYPE type,SECItem *param,int *len);
 SECItem * PK11_BlockData(SECItem *data,unsigned long size);
 
 /* PKCS #11 to DER mapping functions */
 SECItem *PK11_ParamFromAlgid(SECAlgorithmID *algid);
 SECItem *PK11_GenerateNewParam(CK_MECHANISM_TYPE, PK11SymKey *);
@@ skipping 582 matching lines @@
 PK11_GetLowLevelKeyIDForCert(PK11SlotInfo *slot,
                                         CERTCertificate *cert, void *pwarg);
 SECItem *
 PK11_GetLowLevelKeyIDForPrivateKey(SECKEYPrivateKey *key);
 
 PRBool SECMOD_HasRootCerts(void);
 
 SEC_END_PROTOS
 
 #endif