Remove usage of singleton software_slot_ in nss on ChromeOS

crypto/nss_util_internal.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CRYPTO_NSS_UTIL_INTERNAL_H_
 #define CRYPTO_NSS_UTIL_INTERNAL_H_
 
 #include <secmodt.h>
 
 #include "base/callback.h"
@@ skipping 33 matching lines @@
   SECMODListLock* lock_;
   DISALLOW_COPY_AND_ASSIGN(AutoSECMODListReadLock);
 };
 
 #if defined(OS_CHROMEOS)
 // Prepare per-user NSS slot mapping. It is safe to call this function multiple
 // times. Returns true if the user was added, or false if it already existed.
 CRYPTO_EXPORT bool InitializeNSSForChromeOSUser(
     const std::string& email,
     const std::string& username_hash,
-    bool is_primary_user,
-    const base::FilePath& path) WARN_UNUSED_RESULT;
+    const base::FilePath& path);
+
+// Returns whether TPM for ChromeOS user still needs initialization. If
+// true is returned, the caller must proceed to initialize TPM slot for the
+// user. All subsequent calls will return false.
+// |InitializeNSSForChromeOSUser| must have been called first.
+CRYPTO_EXPORT bool GetAndSetStartedInitializeTPMForChromeOSUser(

[Ryan Sleevi, 2014/07/09 19:05:40]

Naming still confused the hell out of me.

ShouldInitializeTPMForChromeOSUser?

I'm guessing the issue is that once this API returns true, it expects the caller
to initialize, because it's going to start returning false for everyone else?
That seems like a dangerous sort of API.

IsResponsibleToInitializeTPMForChromeOSUser?

Alternatively, split the ShouldInit and SetWillInit into two methods.

[tbarzic, 2014/07/09 20:45:34]

Yeah, we had the same expectation with old API, but somewhat hidden in
InitializeNSSForChromeOSUser.
OK, I'll go with this. Should be less confusing.

+    const std::string& username_hash) WARN_UNUSED_RESULT;
 
 // Use TPM slot |slot_id| for user.  InitializeNSSForChromeOSUser must have been
 // called first.
 CRYPTO_EXPORT void InitializeTPMForChromeOSUser(
     const std::string& username_hash,
     CK_SLOT_ID slot_id);
 
 // Use the software slot as the private slot for user.
 // InitializeNSSForChromeOSUser must have been called first.
 CRYPTO_EXPORT void InitializePrivateSoftwareSlotForChromeOSUser(
     const std::string& username_hash);
 
 // Returns a reference to the public slot for user.
 CRYPTO_EXPORT ScopedPK11Slot GetPublicSlotForChromeOSUser(
     const std::string& username_hash) WARN_UNUSED_RESULT;
 
 // Returns the private slot for |username_hash| if it is loaded. If it is not
 // loaded and |callback| is non-null, the |callback| will be run once the slot
 // is loaded.
 CRYPTO_EXPORT ScopedPK11Slot GetPrivateSlotForChromeOSUser(
     const std::string& username_hash,
     const base::Callback<void(ScopedPK11Slot)>& callback) WARN_UNUSED_RESULT;
 #endif  // defined(OS_CHROMEOS)
 
 }  // namespace crypto
 
 #endif  // CRYPTO_NSS_UTIL_INTERNAL_H_