Upgrade chrome's OpenSSL to same version Android ships with.

openssl/crypto/rsa/rsa_pss.c

 /* rsa_pss.c */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2005.
  */
 /* ====================================================================
  * Copyright (c) 2005 The OpenSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ skipping 63 matching lines @@
                         const EVP_MD *Hash, const unsigned char *EM, int sLen)
         {
         int i;
         int ret = 0;
         int hLen, maskedDBLen, MSBits, emLen;
         const unsigned char *H;
         unsigned char *DB = NULL;
         EVP_MD_CTX ctx;
         unsigned char H_[EVP_MAX_MD_SIZE];
 
-        hLen = M_EVP_MD_size(Hash);
+        hLen = EVP_MD_size(Hash);
+        if (hLen < 0)
+                goto err;
         /*
          * Negative sLen has special meanings:
          *      -1      sLen == hLen
          *      -2      salt length is autorecovered from signature
          *      -N      reserved
          */
         if      (sLen == -1)    sLen = hLen;
         else if (sLen == -2)    sLen = -2;
         else if (sLen < -2)
                 {
@@ skipping 24 matching lines @@
                 goto err;
                 }
         maskedDBLen = emLen - hLen - 1;
         H = EM + maskedDBLen;
         DB = OPENSSL_malloc(maskedDBLen);
         if (!DB)
                 {
                 RSAerr(RSA_F_RSA_VERIFY_PKCS1_PSS, ERR_R_MALLOC_FAILURE);
                 goto err;
                 }
-        PKCS1_MGF1(DB, maskedDBLen, H, hLen, Hash);
+        if (PKCS1_MGF1(DB, maskedDBLen, H, hLen, Hash) < 0)
+                goto err;
         for (i = 0; i < maskedDBLen; i++)
                 DB[i] ^= EM[i];
         if (MSBits)
                 DB[0] &= 0xFF >> (8 - MSBits);
         for (i = 0; DB[i] == 0 && i < (maskedDBLen-1); i++) ;
         if (DB[i++] != 0x1)
                 {
                 RSAerr(RSA_F_RSA_VERIFY_PKCS1_PSS, RSA_R_SLEN_RECOVERY_FAILED);
                 goto err;
                 }
@@ skipping 29 matching lines @@
 int RSA_padding_add_PKCS1_PSS(RSA *rsa, unsigned char *EM,
                         const unsigned char *mHash,
                         const EVP_MD *Hash, int sLen)
         {
         int i;
         int ret = 0;
         int hLen, maskedDBLen, MSBits, emLen;
         unsigned char *H, *salt = NULL, *p;
         EVP_MD_CTX ctx;
 
-        hLen = M_EVP_MD_size(Hash);
+        hLen = EVP_MD_size(Hash);
+        if (hLen < 0)
+                goto err;
         /*
          * Negative sLen has special meanings:
          *      -1      sLen == hLen
          *      -2      salt length is maximized
          *      -N      reserved
          */
         if      (sLen == -1)    sLen = hLen;
         else if (sLen == -2)    sLen = -2;
         else if (sLen < -2)
                 {
@@ skipping 35 matching lines @@
         EVP_MD_CTX_init(&ctx);
         EVP_DigestInit_ex(&ctx, Hash, NULL);
         EVP_DigestUpdate(&ctx, zeroes, sizeof zeroes);
         EVP_DigestUpdate(&ctx, mHash, hLen);
         if (sLen)
                 EVP_DigestUpdate(&ctx, salt, sLen);
         EVP_DigestFinal(&ctx, H, NULL);
         EVP_MD_CTX_cleanup(&ctx);
 
         /* Generate dbMask in place then perform XOR on it */
-        PKCS1_MGF1(EM, maskedDBLen, H, hLen, Hash);
+        if (PKCS1_MGF1(EM, maskedDBLen, H, hLen, Hash))
+                goto err;
 
         p = EM;
 
         /* Initial PS XORs with all zeroes which is a NOP so just update
          * pointer. Note from a test above this value is guaranteed to
          * be non-negative.
          */
         p += emLen - sLen - hLen - 2;
         *p++ ^= 0x1;
         if (sLen > 0)
@@ skipping 14 matching lines @@
         if (salt)
                 OPENSSL_free(salt);
 
         return ret;
 
         }
 
 #if defined(_MSC_VER)
 #pragma optimize("",on)
 #endif