Changed OAuth token+secret encryption to use supplemental user key.

crypto/nss_util.h

Index: crypto/nss_util.h
===================================================================
--- crypto/nss_util.h	(revision 99168)
+++ crypto/nss_util.h	(working copy)
@@ -24,6 +24,8 @@
 // initialization functions.
 namespace crypto {
 
+class SymmetricKey;
+
 #if defined(USE_NSS)
 // EarlySetupForNSSInit performs lightweight setup which must occur before the
 // process goes multithreaded. This does not initialise NSS. For test, see
@@ -133,6 +135,9 @@
 // Same as IsTPMTokenReady() except this attempts to initialize the token
 // if necessary.
 CRYPTO_EXPORT bool EnsureTPMTokenReady();
+
+// Gets supplemental user key. Creates one in NSS database if it does not exist.
+CRYPTO_EXPORT SymmetricKey* GetSupplementalUserKey();
 #endif
 
 // Convert a NSS PRTime value into a base::Time object.
@@ -140,6 +145,7 @@
 CRYPTO_EXPORT base::Time PRTimeToBaseTime(int64 prtime);
 
 #if defined(USE_NSS)
+CRYPTO_EXPORT SymmetricKey* GetSupplementalUserKey();

[wtc, 2011/09/06 21:35:17]

Remove this line?  This is a duplicate declaration of the
GetSupplementalUserKey() function.

On line 139, can you define what a "supplemental user key"
is?  I did a Google search for "supplemental user key", and
the first search result is this CL :-)

[zel, 2011/09/06 22:33:35]

Done.

 // Exposed for unittests only.  |path| should be an existing directory under
 // which the DB files will be placed.  |description| is a user-visible name for
 // the DB, as a utf8 string, which will be truncated at 32 bytes.