This adds support for encrypted ONC import

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 52 matching lines @@
   PK11SymKey* key() const { return key_.get(); }
 #elif defined(OS_MACOSX)
   CSSM_DATA cssm_data() const;
 #elif defined(OS_WIN)
   HCRYPTKEY key() const { return key_.get(); }
 #endif
 
   // 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);
+  bool GetRawKey(std::string* raw_key) const;

[Ryan Sleevi, 2012/01/04 01:33:43]

This isn't a const operation on Windows, at least not according to the API
specs. Getting the raw key can mutate the underlying key IIRC.

On Mac it works because we keep a copy of the raw key around, but normally (eg:
CSSM-only) it would be the same as Windows.

[Greg Spencer (Chromium), 2012/01/05 22:18:03]

Crap.  OK, I'll change the constness of the arguments all the way up.. Grrr.

 
 #if defined(OS_CHROMEOS)
   // Creates symmetric key from NSS key. Takes over the ownership of |key|.
   static SymmetricKey* CreateFromKey(PK11SymKey* key);
 #endif
 
  private:
 #if defined(USE_OPENSSL)
   SymmetricKey() {}
   std::string key_;
@@ skipping 18 matching lines @@
   // 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_