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

Side by Side Diff: base/crypto/signature_creator_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 | « no previous file | base/crypto/signature_verifier_openssl.cc » ('j') | 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) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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_creator.h" 5 #include "base/crypto/signature_creator.h"
6 6
7 #include <openssl/evp.h> 7 #include <openssl/evp.h>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/openssl_util.h" 10 #include "base/openssl_util.h"
11 #include "base/scoped_ptr.h" 11 #include "base/scoped_ptr.h"
12 #include "base/stl_util-inl.h"
12 13
13 namespace base { 14 namespace base {
14 15
15 // static 16 // static
16 SignatureCreator* SignatureCreator::Create(RSAPrivateKey* key) { 17 SignatureCreator* SignatureCreator::Create(RSAPrivateKey* key) {
17 OpenSSLErrStackTracer err_tracer(FROM_HERE); 18 OpenSSLErrStackTracer err_tracer(FROM_HERE);
18 scoped_ptr<SignatureCreator> result(new SignatureCreator); 19 scoped_ptr<SignatureCreator> result(new SignatureCreator);
19 result->key_ = key; 20 result->key_ = key;
20 if (!EVP_SignInit_ex(result->sign_context_, EVP_sha1(), NULL)) 21 if (!EVP_SignInit_ex(result->sign_context_, EVP_sha1(), NULL))
21 return NULL; 22 return NULL;
(...skipping 12 matching lines...) Expand all
34 OpenSSLErrStackTracer err_tracer(FROM_HERE); 35 OpenSSLErrStackTracer err_tracer(FROM_HERE);
35 return EVP_SignUpdate(sign_context_, data_part, data_part_len) == 1; 36 return EVP_SignUpdate(sign_context_, data_part, data_part_len) == 1;
36 } 37 }
37 38
38 bool SignatureCreator::Final(std::vector<uint8>* signature) { 39 bool SignatureCreator::Final(std::vector<uint8>* signature) {
39 OpenSSLErrStackTracer err_tracer(FROM_HERE); 40 OpenSSLErrStackTracer err_tracer(FROM_HERE);
40 EVP_PKEY* key = key_->key(); 41 EVP_PKEY* key = key_->key();
41 signature->resize(EVP_PKEY_size(key)); 42 signature->resize(EVP_PKEY_size(key));
42 43
43 unsigned int len = 0; 44 unsigned int len = 0;
44 int rv = EVP_SignFinal(sign_context_, signature->data(), &len, key); 45 int rv = EVP_SignFinal(sign_context_, vector_as_array(signature), &len, key);
45 if (!rv) { 46 if (!rv) {
46 signature->clear(); 47 signature->clear();
47 return false; 48 return false;
48 } 49 }
49 signature->resize(len); 50 signature->resize(len);
50 return true; 51 return true;
51 } 52 }
52 53
53 } // namespace base 54 } // namespace base
OLDNEW
« no previous file with comments | « no previous file | base/crypto/signature_verifier_openssl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698