| Index: crypto/encryptor.h
|
| diff --git a/crypto/encryptor.h b/crypto/encryptor.h
|
| index f1a478ad844cb2a91f4530ea88c26a5f48aec592..f5a1031a50a9974c56465d9491a53f1754a617d5 100644
|
| --- a/crypto/encryptor.h
|
| +++ b/crypto/encryptor.h
|
| @@ -15,10 +15,6 @@
|
| #include "build/build_config.h"
|
| #include "crypto/crypto_export.h"
|
|
|
| -#if !defined(USE_OPENSSL)
|
| -#include "crypto/scoped_nss_types.h"
|
| -#endif
|
| -
|
| namespace crypto {
|
|
|
| class SymmetricKey;
|
| @@ -115,7 +111,6 @@ class CRYPTO_EXPORT Encryptor {
|
| Mode mode_;
|
| std::unique_ptr<Counter> counter_;
|
|
|
| -#if defined(USE_OPENSSL)
|
| bool Crypt(bool do_encrypt, // Pass true to encrypt, false to decrypt.
|
| const base::StringPiece& input,
|
| std::string* output);
|
| @@ -123,15 +118,6 @@ class CRYPTO_EXPORT Encryptor {
|
| const base::StringPiece& input,
|
| std::string* output);
|
| std::string iv_;
|
| -#else
|
| - bool Crypt(PK11Context* context,
|
| - const base::StringPiece& input,
|
| - std::string* output);
|
| - bool CryptCTR(PK11Context* context,
|
| - const base::StringPiece& input,
|
| - std::string* output);
|
| - ScopedSECItem param_;
|
| -#endif
|
| };
|
|
|
| } // namespace crypto
|
|
|