summaryrefslogtreecommitdiffstats
path: root/base/crypto
diff options
context:
space:
mode:
authorjoth@chromium.org <joth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-14 13:55:44 +0000
committerjoth@chromium.org <joth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-14 13:55:44 +0000
commit70be9244de17229105b630834b6cffef69cc0d18 (patch)
treeba5735d8001e4ccfc42b2d540bdb5fd5c234e0e1 /base/crypto
parent1c84532ba1864e266260c85580aabc92b237fe77 (diff)
downloadchromium_src-70be9244de17229105b630834b6cffef69cc0d18.zip
chromium_src-70be9244de17229105b630834b6cffef69cc0d18.tar.gz
chromium_src-70be9244de17229105b630834b6cffef69cc0d18.tar.bz2
Fix openssl portability issue
- in STL vector<> has no data() member. BUG=None TEST=Builds. base_unittest --gtest_filter=*Sym* Review URL: http://codereview.chromium.org/5705006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69128 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/crypto')
-rw-r--r--base/crypto/signature_creator_openssl.cc3
-rw-r--r--base/crypto/signature_verifier_openssl.cc3
2 files changed, 4 insertions, 2 deletions
diff --git a/base/crypto/signature_creator_openssl.cc b/base/crypto/signature_creator_openssl.cc
index 7eed379..5bdb783 100644
--- a/base/crypto/signature_creator_openssl.cc
+++ b/base/crypto/signature_creator_openssl.cc
@@ -9,6 +9,7 @@
#include "base/logging.h"
#include "base/openssl_util.h"
#include "base/scoped_ptr.h"
+#include "base/stl_util-inl.h"
namespace base {
@@ -41,7 +42,7 @@ bool SignatureCreator::Final(std::vector<uint8>* signature) {
signature->resize(EVP_PKEY_size(key));
unsigned int len = 0;
- int rv = EVP_SignFinal(sign_context_, signature->data(), &len, key);
+ int rv = EVP_SignFinal(sign_context_, vector_as_array(signature), &len, key);
if (!rv) {
signature->clear();
return false;
diff --git a/base/crypto/signature_verifier_openssl.cc b/base/crypto/signature_verifier_openssl.cc
index b4fff78..4850efa 100644
--- a/base/crypto/signature_verifier_openssl.cc
+++ b/base/crypto/signature_verifier_openssl.cc
@@ -12,6 +12,7 @@
#include "base/logging.h"
#include "base/openssl_util.h"
#include "base/scoped_ptr.h"
+#include "base/stl_util-inl.h"
namespace base {
@@ -77,7 +78,7 @@ bool SignatureVerifier::VerifyFinal() {
DCHECK(verify_context_);
OpenSSLErrStackTracer err_tracer(FROM_HERE);
int rv = EVP_VerifyFinal(verify_context_->ctx.get(),
- signature_.data(), signature_.size(),
+ vector_as_array(&signature_), signature_.size(),
verify_context_->public_key.get());
DCHECK_GE(rv, 0);
Reset();