Fix crypto_unittests on Windows BoringSSL port.
MSVC is somewhat pickier about casting things to bool. BUG=338884 Review URL: https://codereview.chromium.org/618123007 Cr-Commit-Position: refs/heads/master@{#297770}
This commit is contained in:
@ -17,12 +17,6 @@
|
||||
|
||||
namespace crypto {
|
||||
|
||||
namespace {
|
||||
|
||||
typedef ScopedOpenSSL<ECDSA_SIG, ECDSA_SIG_free>::Type ScopedECDSA_SIG;
|
||||
|
||||
} // namespace
|
||||
|
||||
ECSignatureCreatorImpl::ECSignatureCreatorImpl(ECPrivateKey* key)
|
||||
: key_(key), signature_len_(0) {
|
||||
EnsureOpenSSLInit();
|
||||
|
@ -54,7 +54,7 @@ bool HMAC::Sign(const base::StringPiece& data,
|
||||
DCHECK(!plat_->key.empty()); // Init must be called before Sign.
|
||||
|
||||
ScopedOpenSSLSafeSizeBuffer<EVP_MAX_MD_SIZE> result(digest, digest_length);
|
||||
return ::HMAC(hash_alg_ == SHA1 ? EVP_sha1() : EVP_sha256(),
|
||||
return !!::HMAC(hash_alg_ == SHA1 ? EVP_sha1() : EVP_sha256(),
|
||||
&plat_->key[0], plat_->key.size(),
|
||||
reinterpret_cast<const unsigned char*>(data.data()),
|
||||
data.size(),
|
||||
|
@ -68,9 +68,8 @@ bool SignatureCreator::Sign(RSAPrivateKey* key,
|
||||
signature->resize(RSA_size(rsa_key.get()));
|
||||
|
||||
unsigned int len = 0;
|
||||
bool success = RSA_sign(ToOpenSSLDigestType(hash_alg), data, data_len,
|
||||
vector_as_array(signature), &len, rsa_key.get());
|
||||
if (!success) {
|
||||
if (!RSA_sign(ToOpenSSLDigestType(hash_alg), data, data_len,
|
||||
vector_as_array(signature), &len, rsa_key.get())) {
|
||||
signature->clear();
|
||||
return false;
|
||||
}
|
||||
|
Reference in New Issue
Block a user