Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(673)

Side by Side Diff: base/crypto/signature_verifier_openssl.cc

Issue 5705006: Fix openssl portability issue (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 10 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « base/crypto/signature_creator_openssl.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/crypto/signature_verifier.h" 5 #include "base/crypto/signature_verifier.h"
6 6
7 #include <openssl/evp.h> 7 #include <openssl/evp.h>
8 #include <openssl/x509.h> 8 #include <openssl/x509.h>
9 9
10 #include <vector> 10 #include <vector>
11 11
12 #include "base/logging.h" 12 #include "base/logging.h"
13 #include "base/openssl_util.h" 13 #include "base/openssl_util.h"
14 #include "base/scoped_ptr.h" 14 #include "base/scoped_ptr.h"
15 #include "base/stl_util-inl.h"
15 16
16 namespace base { 17 namespace base {
17 18
18 struct SignatureVerifier::VerifyContext { 19 struct SignatureVerifier::VerifyContext {
19 ScopedOpenSSL<EVP_PKEY, EVP_PKEY_free> public_key; 20 ScopedOpenSSL<EVP_PKEY, EVP_PKEY_free> public_key;
20 ScopedOpenSSL<EVP_MD_CTX, EVP_MD_CTX_destroy> ctx; 21 ScopedOpenSSL<EVP_MD_CTX, EVP_MD_CTX_destroy> ctx;
21 }; 22 };
22 23
23 SignatureVerifier::SignatureVerifier() 24 SignatureVerifier::SignatureVerifier()
24 : verify_context_(NULL) { 25 : verify_context_(NULL) {
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 OpenSSLErrStackTracer err_tracer(FROM_HERE); 71 OpenSSLErrStackTracer err_tracer(FROM_HERE);
71 int rv = EVP_VerifyUpdate(verify_context_->ctx.get(), 72 int rv = EVP_VerifyUpdate(verify_context_->ctx.get(),
72 data_part, data_part_len); 73 data_part, data_part_len);
73 DCHECK_EQ(rv, 1); 74 DCHECK_EQ(rv, 1);
74 } 75 }
75 76
76 bool SignatureVerifier::VerifyFinal() { 77 bool SignatureVerifier::VerifyFinal() {
77 DCHECK(verify_context_); 78 DCHECK(verify_context_);
78 OpenSSLErrStackTracer err_tracer(FROM_HERE); 79 OpenSSLErrStackTracer err_tracer(FROM_HERE);
79 int rv = EVP_VerifyFinal(verify_context_->ctx.get(), 80 int rv = EVP_VerifyFinal(verify_context_->ctx.get(),
80 signature_.data(), signature_.size(), 81 vector_as_array(&signature_), signature_.size(),
81 verify_context_->public_key.get()); 82 verify_context_->public_key.get());
82 DCHECK_GE(rv, 0); 83 DCHECK_GE(rv, 0);
83 Reset(); 84 Reset();
84 return rv == 1; 85 return rv == 1;
85 } 86 }
86 87
87 void SignatureVerifier::Reset() { 88 void SignatureVerifier::Reset() {
88 delete verify_context_; 89 delete verify_context_;
89 verify_context_ = NULL; 90 verify_context_ = NULL;
90 signature_.clear(); 91 signature_.clear();
91 } 92 }
92 93
93 } // namespace base 94 } // namespace base
OLDNEW
« no previous file with comments | « base/crypto/signature_creator_openssl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698