Add GetSystemNSSKeySlot, merge GetPrivateNSSKeySlot/GetPublicNSSKeySlot to GetPersistentNSSKeySlot.

net/socket/ssl_server_socket_nss.cc

 // 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.
 
 #include "net/socket/ssl_server_socket_nss.h"
 
 #if defined(OS_WIN)
 #include <winsock2.h>
 #endif
 
@@ skipping 428 matching lines @@
   }
 
   // Get a key of SECKEYPrivateKey* structure.
   std::vector<uint8> key_vector;
   if (!key_->ExportPrivateKey(&key_vector)) {
     CERT_DestroyCertificate(cert);
     return ERR_UNEXPECTED;
   }
 
   SECKEYPrivateKeyStr* private_key = NULL;
-  PK11SlotInfo* slot = crypto::GetPrivateNSSKeySlot();
+  PK11SlotInfo* slot = PK11_GetInternalSlot();

[pneubeck (no reviews), 2014/07/10 09:44:11]

This changed from PK11_GetInternalKeySlot to PK11_GetInternalSlot, which seems
fine according to the descriptions that I could find.

If I understand GetInternalSlot correctly, then this slot is a temporary,
not-persistent one provided by NSS that doesn't require authentication?

[mattm, 2014/07/10 22:20:45]

Right. This function only imports a temporary key, so doesn't need a persistent
slot.

   if (!slot) {
     CERT_DestroyCertificate(cert);
     return ERR_UNEXPECTED;
   }
 
   SECItem der_private_key_info;
   der_private_key_info.data =
       const_cast<unsigned char*>(&key_vector.front());
   der_private_key_info.len = key_vector.size();
   // The server's RSA private key must be imported into NSS with the
@@ skipping 371 matching lines @@
   // initializes the NSS base library.
   EnsureNSSSSLInit();
   if (!NSS_IsInitialized())
     return ERR_UNEXPECTED;
 
   EnableSSLServerSockets();
   return OK;
 }
 
 }  // namespace net