Index: chrome/common/extensions/api/networking_private/networking_private_crypto.h |
diff --git a/chrome/common/extensions/api/networking_private/networking_private_crypto.h b/chrome/common/extensions/api/networking_private/networking_private_crypto.h |
index ffdb99739609661ce5af74c286fb3cf32ab07f0f..612db00f77dac6a5eb614ea623334ffc446811be 100644 |
--- a/chrome/common/extensions/api/networking_private/networking_private_crypto.h |
+++ b/chrome/common/extensions/api/networking_private/networking_private_crypto.h |
@@ -12,56 +12,45 @@ |
#include "base/basictypes.h" |
-// Implementation of Crypto support for networking private API. |
-// Based on chromeos_public//src/platform/shill/shims/crypto_util.cc |
-class NetworkingPrivateCrypto { |
- public: |
- NetworkingPrivateCrypto(); |
- ~NetworkingPrivateCrypto(); |
- |
- // Verify that credentials described by |certificate| and |signed_data| are |
- // valid. |
- // |
- // 1) The MAC address listed in the certificate matches |connected_mac|. |
- // 2) The certificate is a valid PEM encoded certificate signed by trusted CA. |
- // 3) |signature| is a valid signature for |data|, using the public key in |
- // |certificate| |
- bool VerifyCredentials(const std::string& certificate, |
- const std::string& signature, |
- const std::string& data, |
- const std::string& connected_mac); |
- |
- // Encrypt |data| with |public_key|. |public_key| is a DER-encoded |
- // RSAPublicKey. |data| is some string of bytes that is smaller than the |
- // maximum length permissible for PKCS#1 v1.5 with a key of |public_key| size. |
- // |
- // Returns true on success, storing the encrypted result in |
- // |encrypted_output|. |
- bool EncryptByteString(const std::vector<uint8_t>& public_key, |
- const std::string& data, |
- std::vector<uint8_t>* encrypted_output); |
- |
- private: |
- friend class NetworkingPrivateCryptoTest; |
- |
- // Decrypt |encrypted_data| with |private_key_pem|. |private_key_pem| is the |
- // PKCS8 PEM-encoded private key. |encrypted_data| is data encrypted with |
- // EncryptByteString. Used in NetworkingPrivateCryptoTest::EncryptString test. |
- // |
- // Returns true on success, storing the decrypted result in |
- // |decrypted_output|. |
- bool DecryptByteString(const std::string& private_key_pem, |
- const std::vector<uint8_t>& encrypted_data, |
- std::string* decrypted_output); |
- |
- // The trusted public key as a DER-encoded PKCS#1 RSAPublicKey |
- // structure. |
- static const uint8_t kTrustedCAPublicKeyDER[]; |
- |
- // The length of |kTrustedCAPublicKeyDER| in bytes. |
- static const size_t kTrustedCAPublicKeyDERLength; |
- |
- DISALLOW_COPY_AND_ASSIGN(NetworkingPrivateCrypto); |
-}; |
+namespace networking_private_crypto { |
+ |
+// Verify that the credentials described by |certificate| and |signed_data| |
+// are valid as follows: |
+// 1) The MAC address listed in the certificate matches |connected_mac|. |
+// 2) The certificate is a valid PEM encoded certificate signed by trusted CA. |
+// 3) |signature| is a valid signature for |data|, using the public key in |
+// |certificate| |
+bool VerifyCredentials(const std::string& certificate, |
+ const std::string& signature, |
+ const std::string& data, |
+ const std::string& connected_mac); |
+ |
+// Encrypt |data| with |public_key|. |public_key| is a DER-encoded |
+// RSAPublicKey. |data| is some string of bytes that is smaller than the |
+// maximum length permissible for PKCS#1 v1.5 with a key of |public_key| size. |
+// |
+// Returns true on success, storing the encrypted result in |
+// |encrypted_output|. |
+bool EncryptByteString(const std::vector<uint8_t>& public_key, |
+ const std::string& data, |
+ std::vector<uint8_t>* encrypted_output); |
+ |
+// Decrypt |encrypted_data| with |private_key_pem|. |private_key_pem| is the |
+// PKCS8 PEM-encoded private key. |encrypted_data| is data encrypted with |
+// EncryptByteString. Used in NetworkingPrivateCryptoTest::EncryptString test. |
+// Returns true on success, storing the decrypted result in |
+// |decrypted_output|. |
+bool DecryptByteString(const std::string& private_key_pem, |
+ const std::vector<uint8_t>& encrypted_data, |
+ std::string* decrypted_output); |
+ |
+// The trusted public key as a DER-encoded PKCS#1 RSAPublicKey |
pneubeck (no reviews)
2014/08/06 16:01:38
nit: fits on one line?
What means "The" here? Wha
stevenjb
2014/08/06 16:52:14
Made one line. I don't know how to clarify this co
|
+// structure. |
+extern const uint8_t kTrustedCAPublicKeyDER[]; |
+ |
+// The length of |kTrustedCAPublicKeyDER| in bytes. |
+extern const size_t kTrustedCAPublicKeyDERLength; |
+ |
+} // namespace networking_private_crypto |
#endif // CHROME_COMMON_EXTENSIONS_API_NETWORKING_PRIVATE_NETWORKING_PRIVATE_CRYPTO_H_ |