Roll src/third_party/boringssl/src 0fe4d8bef..f01fb5dc0

components/webcrypto/algorithms/sha.cc

 // Copyright 2014 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.
 
 #include <openssl/evp.h>
 #include <openssl/sha.h>
 #include <stdint.h>
 #include <vector>
 
 #include "base/logging.h"
@@ skipping 38 matching lines @@
   bool finish(unsigned char*& result_data,
               unsigned int& result_data_size) override {
     Status error = FinishInternal(result_, &result_data_size);
     if (!error.IsSuccess())
       return false;
     result_data = result_;
     return true;
   }
 
   Status FinishWithVectorAndStatus(std::vector<uint8_t>* result) {
-    const int hash_expected_size = EVP_MD_CTX_size(digest_context_.get());
+    const size_t hash_expected_size = EVP_MD_CTX_size(digest_context_.get());
     result->resize(hash_expected_size);
     unsigned int hash_buffer_size;  // ignored
     return FinishInternal(result->data(), &hash_buffer_size);
   }
 
  private:
   Status Init() {
     if (initialized_)
       return Status::Success();
 
@@ skipping 10 matching lines @@
     initialized_ = true;
     return Status::Success();
   }
 
   Status FinishInternal(unsigned char* result, unsigned int* result_size) {
     crypto::OpenSSLErrStackTracer err_tracer(FROM_HERE);
     Status error = Init();
     if (!error.IsSuccess())
       return error;
 
-    const int hash_expected_size = EVP_MD_CTX_size(digest_context_.get());
-    if (hash_expected_size <= 0)
+    const size_t hash_expected_size = EVP_MD_CTX_size(digest_context_.get());
+    if (hash_expected_size == 0)
       return Status::ErrorUnexpected();
-    DCHECK_LE(hash_expected_size, EVP_MAX_MD_SIZE);
+    DCHECK_LE(hash_expected_size, static_cast<unsigned>(EVP_MAX_MD_SIZE));

[davidben, 2016/04/21 00:17:09]

This is kind of depressing. :-/ EVP_MAX_MD_SIZE is an untyped macro. I can see
about adding a 'u' suffix to it at some point, though I worry that might break
other compiles.

 
     if (!EVP_DigestFinal_ex(digest_context_.get(), result, result_size) ||
-        static_cast<int>(*result_size) != hash_expected_size)
+        *result_size != hash_expected_size)
       return Status::OperationError();
 
     return Status::Success();
   }
 
   bool initialized_;
   crypto::ScopedEVP_MD_CTX digest_context_;
   blink::WebCryptoAlgorithmId algorithm_id_;
   unsigned char result_[EVP_MAX_MD_SIZE];
 };
@@ skipping 18 matching lines @@
 scoped_ptr<AlgorithmImplementation> CreateShaImplementation() {
   return make_scoped_ptr(new ShaImplementation());
 }
 
 scoped_ptr<blink::WebCryptoDigestor> CreateDigestorImplementation(
     blink::WebCryptoAlgorithmId algorithm) {
   return scoped_ptr<blink::WebCryptoDigestor>(new DigestorImpl(algorithm));
 }
 
 }  // namespace webcrypto