diff options
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/ec_private_key_nss.cc | 13 | ||||
| -rw-r--r-- | crypto/ec_signature_creator_nss.cc | 9 | ||||
| -rw-r--r-- | crypto/third_party/nss/secsign.cc | 6 |
3 files changed, 18 insertions, 10 deletions
diff --git a/crypto/ec_private_key_nss.cc b/crypto/ec_private_key_nss.cc index 1fb13e7..a799285 100644 --- a/crypto/ec_private_key_nss.cc +++ b/crypto/ec_private_key_nss.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -128,7 +128,7 @@ bool ECPrivateKey::ImportFromEncryptedPrivateKeyInfo( SECItem encoded_epki = { siBuffer, const_cast<unsigned char*>(encrypted_private_key_info), - encrypted_private_key_info_len + static_cast<unsigned>(encrypted_private_key_info_len) }; SECKEYEncryptedPrivateKeyInfo epki; memset(&epki, 0, sizeof(epki)); @@ -150,7 +150,7 @@ bool ECPrivateKey::ImportFromEncryptedPrivateKeyInfo( SECItem password_item = { siBuffer, reinterpret_cast<unsigned char*>(const_cast<char*>(password.data())), - password.size() + static_cast<unsigned>(password.size()) }; rv = ImportEncryptedECPrivateKeyInfoAndReturnKey( @@ -185,7 +185,7 @@ bool ECPrivateKey::ExportEncryptedPrivateKey( SECItem password_item = { siBuffer, reinterpret_cast<unsigned char*>(const_cast<char*>(password.data())), - password.size() + static_cast<unsigned>(password.size()) }; SECKEYEncryptedPrivateKeyInfo* encrypted = PK11_ExportEncryptedPrivKeyInfo( @@ -264,7 +264,8 @@ ECPrivateKey* ECPrivateKey::CreateWithParams(bool permanent, DCHECK_LE(oid_data->oid.len, 127U); std::vector<unsigned char> parameters_buf(2 + oid_data->oid.len); SECKEYECParams ec_parameters = { - siDEROID, ¶meters_buf[0], parameters_buf.size() + siDEROID, ¶meters_buf[0], + static_cast<unsigned>(parameters_buf.size()) }; ec_parameters.data[0] = SEC_ASN1_OBJECT_ID; @@ -300,7 +301,7 @@ ECPrivateKey* ECPrivateKey::CreateFromEncryptedPrivateKeyInfoWithParams( SECItem encoded_spki = { siBuffer, const_cast<unsigned char*>(&subject_public_key_info[0]), - subject_public_key_info.size() + static_cast<unsigned>(subject_public_key_info.size()) }; CERTSubjectPublicKeyInfo* decoded_spki = SECKEY_DecodeDERSubjectPublicKeyInfo( &encoded_spki); diff --git a/crypto/ec_signature_creator_nss.cc b/crypto/ec_signature_creator_nss.cc index 388870f..a85b1e9 100644 --- a/crypto/ec_signature_creator_nss.cc +++ b/crypto/ec_signature_creator_nss.cc @@ -8,6 +8,9 @@ #include <pk11pub.h> #include <secerr.h> #include <sechash.h> +#if defined(OS_POSIX) +#include <unistd.h> +#endif #include "base/logging.h" #include "crypto/ec_private_key.h" @@ -34,12 +37,14 @@ SECStatus SignData(SECItem* result, hash_type, &hash_data[0], input->data, input->len); if (rv != SECSuccess) return rv; - SECItem hash = {siBuffer, &hash_data[0], hash_data.size()}; + SECItem hash = {siBuffer, &hash_data[0], + static_cast<unsigned int>(hash_data.size())}; // Compute signature of hash. int signature_len = PK11_SignatureLen(key); std::vector<uint8> signature_data(signature_len); - SECItem sig = {siBuffer, &signature_data[0], signature_len}; + SECItem sig = {siBuffer, &signature_data[0], + static_cast<unsigned int>(signature_len)}; rv = PK11_Sign(key, &sig, &hash); if (rv != SECSuccess) return rv; diff --git a/crypto/third_party/nss/secsign.cc b/crypto/third_party/nss/secsign.cc index 9272d4a..a788def 100644 --- a/crypto/third_party/nss/secsign.cc +++ b/crypto/third_party/nss/secsign.cc @@ -93,12 +93,14 @@ SECStatus DerSignData(PLArenaPool *arena, hash_type, &hash_data[0], input->data, input->len); if (rv != SECSuccess) return rv; - SECItem hash = {siBuffer, &hash_data[0], hash_data.size()}; + SECItem hash = {siBuffer, &hash_data[0], + static_cast<unsigned int>(hash_data.size())}; // Compute signature of hash. int signature_len = PK11_SignatureLen(key); std::vector<uint8> signature_data(signature_len); - SECItem sig = {siBuffer, &signature_data[0], signature_len}; + SECItem sig = {siBuffer, &signature_data[0], + static_cast<unsigned int>(signature_len)}; rv = PK11_Sign(key, &sig, &hash); if (rv != SECSuccess) return rv; |