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

openssl/crypto/aes/aes_ige.c

 /* crypto/aes/aes_ige.c -*- mode:C; c-file-style: "eay" -*- */
 /* ====================================================================
  * Copyright (c) 2006 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:
  *
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer. 
@@ skipping 59 matching lines @@
 #define load_block(d, s)        (d) = *(const aes_block_t *)(s)
 #define store_block(d, s)       *(aes_block_t *)(d) = (s)
 #else
 #define load_block(d, s)        memcpy((d).data, (s), AES_BLOCK_SIZE)
 #define store_block(d, s)       memcpy((d), (s).data, AES_BLOCK_SIZE)
 #endif
 
 /* N.B. The IV for this mode is _twice_ the block size */
 
 void AES_ige_encrypt(const unsigned char *in, unsigned char *out,
-                                         const unsigned long length, const AES_KEY *key,
+                                         size_t length, const AES_KEY *key,
                                          unsigned char *ivec, const int enc)
         {
-        unsigned long n;
-        unsigned long len;
+        size_t n;
+        size_t len = length;
 
         OPENSSL_assert(in && out && key && ivec);
         OPENSSL_assert((AES_ENCRYPT == enc)||(AES_DECRYPT == enc));
         OPENSSL_assert((length%AES_BLOCK_SIZE) == 0);
 
         len = length / AES_BLOCK_SIZE;
 
         if (AES_ENCRYPT == enc)
                 {
                 if (in != out &&
@@ skipping 109 matching lines @@
         }
 
 /*
  * Note that its effectively impossible to do biIGE in anything other
  * than a single pass, so no provision is made for chaining.
  */
 
 /* N.B. The IV for this mode is _four times_ the block size */
 
 void AES_bi_ige_encrypt(const unsigned char *in, unsigned char *out,
-                                                const unsigned long length, const AES_KEY *key,
+                                                size_t length, const AES_KEY *key,
                                                 const AES_KEY *key2, const unsigned char *ivec,
                                                 const int enc)
         {
-        unsigned long n;
-        unsigned long len = length;
+        size_t n;
+        size_t len = length;
         unsigned char tmp[AES_BLOCK_SIZE];
         unsigned char tmp2[AES_BLOCK_SIZE];
         unsigned char tmp3[AES_BLOCK_SIZE];
         unsigned char prev[AES_BLOCK_SIZE];
         const unsigned char *iv;
         const unsigned char *iv2;
 
         OPENSSL_assert(in && out && key && ivec);
         OPENSSL_assert((AES_ENCRYPT == enc)||(AES_DECRYPT == enc));
         OPENSSL_assert((length%AES_BLOCK_SIZE) == 0);
@@ skipping 84 matching lines @@
                                 out[n] ^= iv[n];
                         memcpy(tmp3, tmp2, AES_BLOCK_SIZE);
                         iv = tmp3;
                         iv2 = out;
                         len -= AES_BLOCK_SIZE;
                         in += AES_BLOCK_SIZE;
                         out += AES_BLOCK_SIZE;
                         }
                 }
         }