diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-01-04 14:17:57 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-01-05 10:05:06 +0000 |
| commit | 39d357e3248f80abea0159765ff39554affb40db (patch) | |
| tree | aba0e6bfb76de0244bba0f5fdbd64b830dd6e621 /chromium/crypto/rsa_private_key.h | |
| parent | 87778abf5a1f89266f37d1321b92a21851d8244d (diff) | |
| download | qtwebengine-chromium-39d357e3248f80abea0159765ff39554affb40db.tar.gz | |
BASELINE: Update Chromium to 55.0.2883.105
And updates ninja to 1.7.2
Change-Id: I20d43c737f82764d857ada9a55586901b18b9243
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/crypto/rsa_private_key.h')
| -rw-r--r-- | chromium/crypto/rsa_private_key.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/chromium/crypto/rsa_private_key.h b/chromium/crypto/rsa_private_key.h index f0b9efaa58f..987b3bfc701 100644 --- a/chromium/crypto/rsa_private_key.h +++ b/chromium/crypto/rsa_private_key.h @@ -5,6 +5,7 @@ #ifndef CRYPTO_RSA_PRIVATE_KEY_H_ #define CRYPTO_RSA_PRIVATE_KEY_H_ +#include <openssl/base.h> #include <stddef.h> #include <stdint.h> @@ -15,9 +16,6 @@ #include "build/build_config.h" #include "crypto/crypto_export.h" -// Forward declaration for openssl/*.h -typedef struct evp_pkey_st EVP_PKEY; - namespace crypto { // Encapsulates an RSA private key. Can be used to generate new keys, export @@ -41,7 +39,7 @@ class CRYPTO_EXPORT RSAPrivateKey { // failure. static std::unique_ptr<RSAPrivateKey> CreateFromKey(EVP_PKEY* key); - EVP_PKEY* key() { return key_; } + EVP_PKEY* key() { return key_.get(); } // Creates a copy of the object. std::unique_ptr<RSAPrivateKey> Copy() const; @@ -56,7 +54,7 @@ class CRYPTO_EXPORT RSAPrivateKey { // Constructor is private. Use one of the Create*() methods above instead. RSAPrivateKey(); - EVP_PKEY* key_; + bssl::UniquePtr<EVP_PKEY> key_; DISALLOW_COPY_AND_ASSIGN(RSAPrivateKey); }; |