Update to NSS 3.16.2 Beta 3.

nss/lib/pk11wrap/pk11akey.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 contains functions to manage asymetric keys, (public and
  * private keys).
  */
 #include "seccomon.h"
 #include "secmod.h"
 #include "secmodi.h"
@@ skipping 1870 matching lines @@
     SECKEYPrivateKey              *pk   = PK11_FindKeyByAnyCert(cert, wincx);
     if (pk != NULL) {
         epki = PK11_ExportEncryptedPrivKeyInfo(slot, algTag, pwitem, pk, 
                                                iteration, wincx);
         SECKEY_DestroyPrivateKey(pk);
     }
     return epki;
 }
 
 SECItem*
-PK11_DEREncodePublicKey(SECKEYPublicKey *pubk)
+PK11_DEREncodePublicKey(const SECKEYPublicKey *pubk)
 {
     return SECKEY_EncodeDERSubjectPublicKeyInfo(pubk);
 }
 
 char *
 PK11_GetPrivateKeyNickname(SECKEYPrivateKey *privKey)
 {
     return PK11_GetObjectNickname(privKey->pkcs11Slot,privKey->pkcs11ID);
 }
 
@@ skipping 472 matching lines @@
     for (i=0; i < objCount ; i++) {
         SECKEYPrivateKey *privKey = 
                 PK11_MakePrivKey(slot,nullKey,PR_TRUE,key_ids[i],wincx);
         SECKEY_AddPrivateKeyToListTail(keys, privKey);
    }
 
    PORT_Free(key_ids);
    return keys;
 }