diff options
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/hmac_openssl.cc | 2 | ||||
| -rw-r--r-- | crypto/rsa_private_key_openssl.cc | 4 | ||||
| -rw-r--r-- | crypto/sha2.cc | 2 | ||||
| -rw-r--r-- | crypto/signature_creator_openssl.cc | 2 | ||||
| -rw-r--r-- | crypto/signature_verifier_openssl.cc | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/crypto/hmac_openssl.cc b/crypto/hmac_openssl.cc index 74645c7..3ea1c6a 100644 --- a/crypto/hmac_openssl.cc +++ b/crypto/hmac_openssl.cc @@ -11,7 +11,7 @@ #include "base/logging.h" #include "base/memory/scoped_ptr.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "crypto/openssl_util.h" namespace crypto { diff --git a/crypto/rsa_private_key_openssl.cc b/crypto/rsa_private_key_openssl.cc index f39b718..b9902a0 100644 --- a/crypto/rsa_private_key_openssl.cc +++ b/crypto/rsa_private_key_openssl.cc @@ -10,7 +10,6 @@ #include "base/logging.h" #include "base/memory/scoped_ptr.h" -#include "base/stl_util-inl.h" #include "crypto/openssl_util.h" namespace crypto { @@ -41,7 +40,8 @@ bool ExportKey(EVP_PKEY* key, if (!data || len < 0) return false; - STLAssignToVector(output, reinterpret_cast<const uint8*>(data), len); + std::vector<uint8> for_output(data, data + len); + output->swap(for_output); return true; } diff --git a/crypto/sha2.cc b/crypto/sha2.cc index 7c9b9d2..7626bdc 100644 --- a/crypto/sha2.cc +++ b/crypto/sha2.cc @@ -5,7 +5,7 @@ #include "crypto/sha2.h" #include "base/scoped_ptr.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "crypto/secure_hash.h" namespace crypto { diff --git a/crypto/signature_creator_openssl.cc b/crypto/signature_creator_openssl.cc index e6aa422..d12d166 100644 --- a/crypto/signature_creator_openssl.cc +++ b/crypto/signature_creator_openssl.cc @@ -8,7 +8,7 @@ #include "base/logging.h" #include "base/memory/scoped_ptr.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "crypto/openssl_util.h" namespace crypto { diff --git a/crypto/signature_verifier_openssl.cc b/crypto/signature_verifier_openssl.cc index 2a58155..cab45db 100644 --- a/crypto/signature_verifier_openssl.cc +++ b/crypto/signature_verifier_openssl.cc @@ -11,7 +11,7 @@ #include "base/logging.h" #include "base/memory/scoped_ptr.h" -#include "base/stl_util-inl.h" +#include "base/stl_util.h" #include "crypto/openssl_util.h" namespace crypto { |