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

Side by Side Diff: crypto/signature_creator_openssl.cc

Issue 1539353003: Switch to standard integer types in crypto/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix Created 4 years, 12 months 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
« no previous file with comments | « crypto/signature_creator_nss.cc ('k') | crypto/signature_creator_unittest.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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_creator.h" 5 #include "crypto/signature_creator.h"
6 6
7 #include <openssl/evp.h> 7 #include <openssl/evp.h>
8 #include <openssl/rsa.h> 8 #include <openssl/rsa.h>
9 #include <stddef.h>
10 #include <stdint.h>
9 11
10 #include "base/logging.h" 12 #include "base/logging.h"
11 #include "base/memory/scoped_ptr.h" 13 #include "base/memory/scoped_ptr.h"
12 #include "crypto/openssl_util.h" 14 #include "crypto/openssl_util.h"
13 #include "crypto/rsa_private_key.h" 15 #include "crypto/rsa_private_key.h"
14 #include "crypto/scoped_openssl_types.h" 16 #include "crypto/scoped_openssl_types.h"
15 17
16 namespace crypto { 18 namespace crypto {
17 19
18 namespace { 20 namespace {
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 if (!EVP_DigestSignInit(result->sign_context_, NULL, digest, NULL, 54 if (!EVP_DigestSignInit(result->sign_context_, NULL, digest, NULL,
53 key->key())) { 55 key->key())) {
54 return NULL; 56 return NULL;
55 } 57 }
56 return result.release(); 58 return result.release();
57 } 59 }
58 60
59 // static 61 // static
60 bool SignatureCreator::Sign(RSAPrivateKey* key, 62 bool SignatureCreator::Sign(RSAPrivateKey* key,
61 HashAlgorithm hash_alg, 63 HashAlgorithm hash_alg,
62 const uint8* data, 64 const uint8_t* data,
63 int data_len, 65 int data_len,
64 std::vector<uint8>* signature) { 66 std::vector<uint8_t>* signature) {
65 ScopedRSA rsa_key(EVP_PKEY_get1_RSA(key->key())); 67 ScopedRSA rsa_key(EVP_PKEY_get1_RSA(key->key()));
66 if (!rsa_key) 68 if (!rsa_key)
67 return false; 69 return false;
68 signature->resize(RSA_size(rsa_key.get())); 70 signature->resize(RSA_size(rsa_key.get()));
69 71
70 unsigned int len = 0; 72 unsigned int len = 0;
71 if (!RSA_sign(ToOpenSSLDigestType(hash_alg), data, data_len, 73 if (!RSA_sign(ToOpenSSLDigestType(hash_alg), data, data_len,
72 signature->data(), &len, rsa_key.get())) { 74 signature->data(), &len, rsa_key.get())) {
73 signature->clear(); 75 signature->clear();
74 return false; 76 return false;
75 } 77 }
76 signature->resize(len); 78 signature->resize(len);
77 return true; 79 return true;
78 } 80 }
79 81
80 SignatureCreator::SignatureCreator() 82 SignatureCreator::SignatureCreator()
81 : sign_context_(EVP_MD_CTX_create()) { 83 : sign_context_(EVP_MD_CTX_create()) {
82 } 84 }
83 85
84 SignatureCreator::~SignatureCreator() { 86 SignatureCreator::~SignatureCreator() {
85 EVP_MD_CTX_destroy(sign_context_); 87 EVP_MD_CTX_destroy(sign_context_);
86 } 88 }
87 89
88 bool SignatureCreator::Update(const uint8* data_part, int data_part_len) { 90 bool SignatureCreator::Update(const uint8_t* data_part, int data_part_len) {
89 OpenSSLErrStackTracer err_tracer(FROM_HERE); 91 OpenSSLErrStackTracer err_tracer(FROM_HERE);
90 return !!EVP_DigestSignUpdate(sign_context_, data_part, data_part_len); 92 return !!EVP_DigestSignUpdate(sign_context_, data_part, data_part_len);
91 } 93 }
92 94
93 bool SignatureCreator::Final(std::vector<uint8>* signature) { 95 bool SignatureCreator::Final(std::vector<uint8_t>* signature) {
94 OpenSSLErrStackTracer err_tracer(FROM_HERE); 96 OpenSSLErrStackTracer err_tracer(FROM_HERE);
95 97
96 // Determine the maximum length of the signature. 98 // Determine the maximum length of the signature.
97 size_t len = 0; 99 size_t len = 0;
98 if (!EVP_DigestSignFinal(sign_context_, NULL, &len)) { 100 if (!EVP_DigestSignFinal(sign_context_, NULL, &len)) {
99 signature->clear(); 101 signature->clear();
100 return false; 102 return false;
101 } 103 }
102 signature->resize(len); 104 signature->resize(len);
103 105
104 // Sign it. 106 // Sign it.
105 if (!EVP_DigestSignFinal(sign_context_, signature->data(), &len)) { 107 if (!EVP_DigestSignFinal(sign_context_, signature->data(), &len)) {
106 signature->clear(); 108 signature->clear();
107 return false; 109 return false;
108 } 110 }
109 signature->resize(len); 111 signature->resize(len);
110 return true; 112 return true;
111 } 113 }
112 114
113 } // namespace crypto 115 } // namespace crypto
OLDNEW
« no previous file with comments | « crypto/signature_creator_nss.cc ('k') | crypto/signature_creator_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698