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

crypto/symmetric_key.h

 // Copyright (c) 2011 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_SYMMETRIC_KEY_H_
 #define CRYPTO_SYMMETRIC_KEY_H_
 #pragma once
 
 #include <string>
 
@@ skipping 14 matching lines @@
 // scoped_ptr.
 class CRYPTO_EXPORT SymmetricKey {
  public:
   // Defines the algorithm that a key will be used with. See also
   // classs Encrptor.
   enum Algorithm {
     AES,
     HMAC_SHA1,
   };
 
+#if defined(OS_CHROMEOS)
+  explicit SymmetricKey(PK11SymKey* key);

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

Maybe it's better to add an ImportPlatformKey or ImportNSSKey
static method, rather than making this constructor public.

Please document that this constructor (or static method)
takes ownership of |key|.

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

Added comment.

I thought about that ImportNSSKey approach but I still don't have a good public
SymmetricKey constructor on ChromeOS. I've create a factory function
SymmetricKey::CreateFromKey() instead.

+#endif
+
   virtual ~SymmetricKey();
 
   // Generates a random key suitable to be used with |algorithm| and of
   // |key_size_in_bits| bits.
   // The caller is responsible for deleting the returned SymmetricKey.
   static SymmetricKey* GenerateRandomKey(Algorithm algorithm,
                                          size_t key_size_in_bits);
 
   // Derives a key from the supplied password and salt using PBKDF2, suitable
   // for use with specified |algorithm|. Note |algorithm| is not the algorithm
@@ skipping 24 matching lines @@
   // Extracts the raw key from the platform specific data.
   // Warning: |raw_key| holds the raw key as bytes and thus must be handled
   // carefully.
   bool GetRawKey(std::string* raw_key);
 
  private:
 #if defined(USE_OPENSSL)
   SymmetricKey() {}
   std::string key_;
 #elif defined(USE_NSS)
+#if !defined(OS_CHROMEOS)
   explicit SymmetricKey(PK11SymKey* key);
+#endif
   ScopedPK11SymKey key_;
 #elif defined(OS_MACOSX)
   SymmetricKey(const void* key_data, size_t key_size_in_bits);
   std::string key_;
 #elif defined(OS_WIN)
   SymmetricKey(HCRYPTPROV provider, HCRYPTKEY key,
                const void* key_data, size_t key_size_in_bytes);
 
   ScopedHCRYPTPROV provider_;
   ScopedHCRYPTKEY key_;
 
   // Contains the raw key, if it is known during initialization and when it
   // is likely that the associated |provider_| will be unable to export the
   // |key_|. This is the case of HMAC keys when the key size exceeds 16 bytes
   // when using the default RSA provider.
   // TODO(rsleevi): See if KP_EFFECTIVE_KEYLEN is the reason why CryptExportKey
   // fails with NTE_BAD_KEY/NTE_BAD_LEN
   std::string raw_key_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(SymmetricKey);
 };
 
 }  // namespace crypto
 
 #endif  // CRYPTO_SYMMETRIC_KEY_H_