Update NSS to NSS_3_15_1_BETA2.

nss/lib/pki/tdcache.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/. */
 
 #ifndef PKIM_H
 #include "pkim.h"
 #endif /* PKIM_H */
 
 #ifndef PKIT_H
 #include "pkit.h"
@@ skipping 679 matching lines @@
     int i;
     SECStatus rv = SECSuccess;
 
     instances = nssPKIObject_GetInstances(from);
     if (instances == NULL) {
         return SECFailure;
     }
     for (ci = instances, i = 0; *ci; ci++, i++) {
         nssCryptokiObject *instance = nssCryptokiObject_Clone(*ci);
         if (instance) {
-            if (nssPKIObject_AddInstance(to, instance) == SECSuccess) {
+            if (nssPKIObject_AddInstance(to, instance) == PR_SUCCESS) {
                 continue;
             }
             nssCryptokiObject_Destroy(instance);
         }
         remove_object_instances(to, instances, i);
         rv = SECFailure;
         break;
     }
     nssCryptokiObjectArray_Destroy(instances);
     return rv;
@@ skipping 426 matching lines @@
 nssTrustDomain_DumpCacheInfo (
   NSSTrustDomain *td,
   void (* cert_dump_iter)(const void *, void *, void *),
   void *arg
 )
 {
     PZ_Lock(td->cache->lock);
     nssHash_Iterate(td->cache->issuerAndSN, cert_dump_iter, arg);
     PZ_Unlock(td->cache->lock);
 }