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

Side by Side Diff: crypto/signature_verifier_openssl.cc

Issue 1441543002: Make vector_as_array use std::vector::data and switch a few directories. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase, update //styleguide Created 5 years, 1 month 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
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "crypto/signature_verifier.h" 5 #include "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/memory/scoped_ptr.h" 13 #include "base/memory/scoped_ptr.h"
14 #include "base/stl_util.h"
15 #include "crypto/openssl_util.h" 14 #include "crypto/openssl_util.h"
16 #include "crypto/scoped_openssl_types.h" 15 #include "crypto/scoped_openssl_types.h"
17 16
18 namespace crypto { 17 namespace crypto {
19 18
20 namespace { 19 namespace {
21 20
22 const EVP_MD* ToOpenSSLDigest(SignatureVerifier::HashAlgorithm hash_alg) { 21 const EVP_MD* ToOpenSSLDigest(SignatureVerifier::HashAlgorithm hash_alg) {
23 switch (hash_alg) { 22 switch (hash_alg) {
24 case SignatureVerifier::SHA1: 23 case SignatureVerifier::SHA1:
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 DCHECK(verify_context_); 111 DCHECK(verify_context_);
113 OpenSSLErrStackTracer err_tracer(FROM_HERE); 112 OpenSSLErrStackTracer err_tracer(FROM_HERE);
114 int rv = EVP_DigestVerifyUpdate(verify_context_->ctx.get(), 113 int rv = EVP_DigestVerifyUpdate(verify_context_->ctx.get(),
115 data_part, data_part_len); 114 data_part, data_part_len);
116 DCHECK_EQ(rv, 1); 115 DCHECK_EQ(rv, 1);
117 } 116 }
118 117
119 bool SignatureVerifier::VerifyFinal() { 118 bool SignatureVerifier::VerifyFinal() {
120 DCHECK(verify_context_); 119 DCHECK(verify_context_);
121 OpenSSLErrStackTracer err_tracer(FROM_HERE); 120 OpenSSLErrStackTracer err_tracer(FROM_HERE);
122 int rv = EVP_DigestVerifyFinal(verify_context_->ctx.get(), 121 int rv = EVP_DigestVerifyFinal(verify_context_->ctx.get(), signature_.data(),
123 vector_as_array(&signature_),
124 signature_.size()); 122 signature_.size());
125 DCHECK_EQ(static_cast<int>(!!rv), rv); 123 DCHECK_EQ(static_cast<int>(!!rv), rv);
126 Reset(); 124 Reset();
127 return rv == 1; 125 return rv == 1;
128 } 126 }
129 127
130 bool SignatureVerifier::CommonInit(const EVP_MD* digest, 128 bool SignatureVerifier::CommonInit(const EVP_MD* digest,
131 const uint8* signature, 129 const uint8* signature,
132 int signature_len, 130 int signature_len,
133 const uint8* public_key_info, 131 const uint8* public_key_info,
(...skipping 17 matching lines...) Expand all
151 return rv == 1; 149 return rv == 1;
152 } 150 }
153 151
154 void SignatureVerifier::Reset() { 152 void SignatureVerifier::Reset() {
155 delete verify_context_; 153 delete verify_context_;
156 verify_context_ = NULL; 154 verify_context_ = NULL;
157 signature_.clear(); 155 signature_.clear();
158 } 156 }
159 157
160 } // namespace crypto 158 } // namespace crypto
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698