Update NSS to NSS_3_16_RC0.

nss/lib/softoken/fipstokn.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
  *   (unless you've enabled FIPS). It supports Public Key ops, and all they
@@ skipping 15 matching lines @@
 #include "prprf.h"
 
 #include <ctype.h>
 
 #ifdef XP_UNIX
 #define NSS_AUDIT_WITH_SYSLOG 1
 #include <syslog.h>
 #include <unistd.h>
 #endif
 
-#ifdef SOLARIS
-#include <bsm/libbsm.h>
-#define AUE_FIPS_AUDIT 34444
-#endif
-
 #ifdef LINUX
 #include <pthread.h>
 #include <dlfcn.h>
 #define LIBAUDIT_NAME "libaudit.so.0"
 #ifndef AUDIT_CRYPTO_TEST_USER
 #define AUDIT_CRYPTO_TEST_USER          2400 /* Crypto test results */
 #define AUDIT_CRYPTO_PARAM_CHANGE_USER  2401 /* Crypto attribute change */
 #define AUDIT_CRYPTO_LOGIN              2402 /* Logged in as crypto officer */
 #define AUDIT_CRYPTO_LOGOUT             2403 /* Logged out from crypto */
 #define AUDIT_CRYPTO_KEY_USER           2404 /* Create,delete,negotiate */
@@ skipping 349 matching lines @@
         if (audit_log_user_message_func) {
             audit_log_user_message_func(audit_fd, linuxAuditType, message,
                                         NULL, NULL, NULL, result);
         } else {
             audit_send_user_message_func(audit_fd, linuxAuditType, message);
         }
         audit_close_func(audit_fd);
         PR_smprintf_free(message);
     }
 #endif /* LINUX */
-#ifdef SOLARIS
-    {
-        int rd;
-        char *message = PR_smprintf("NSS " SOFTOKEN_LIB_NAME ": %s", msg);
-
-        if (!message) {
-            return;
-        }
-
-        /* open the record descriptor */
-        if ((rd = au_open()) == -1) {
-            PR_smprintf_free(message);
-            return;
-        }
-
-        /* write the audit tokens to the audit record */
-        if (au_write(rd, au_to_text(message))) {
-            (void)au_close(rd, AU_TO_NO_WRITE, AUE_FIPS_AUDIT);
-            PR_smprintf_free(message);
-            return;
-        }
-
-        /* close the record and send it to the audit trail */
-        (void)au_close(rd, AU_TO_WRITE, AUE_FIPS_AUDIT);
-
-        PR_smprintf_free(message);
-    }
-#endif /* SOLARIS */
 #else
     /* do nothing */
 #endif
 }
 
 
 /**********************************************************************
  *
  *     Start of PKCS 11 functions 
  *
@@ skipping 1118 matching lines @@
 }
 
 
 CK_RV FC_WaitForSlotEvent(CK_FLAGS flags, CK_SLOT_ID_PTR pSlot,
                                                          CK_VOID_PTR pReserved)
 {
     CHECK_FORK();
 
     return NSC_WaitForSlotEvent(flags, pSlot, pReserved);
 }