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

openssl/crypto/aes/aes_wrap.c

 /* crypto/aes/aes_wrap.c */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project.
  */
 /* ====================================================================
  * Copyright (c) 2008 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 67 matching lines @@
         for (j = 0; j < 6; j++)
                 {
                 R = out + 8;
                 for (i = 0; i < inlen; i += 8, t++, R += 8)
                         {
                         memcpy(B + 8, R, 8);
                         AES_encrypt(B, B, key);
                         A[7] ^= (unsigned char)(t & 0xff);
                         if (t > 0xff)   
                                 {
-                                A[6] ^= (unsigned char)((t & 0xff) >> 8);
-                                A[5] ^= (unsigned char)((t & 0xff) >> 16);
-                                A[4] ^= (unsigned char)((t & 0xff) >> 24);
+                                A[6] ^= (unsigned char)((t >> 8) & 0xff);
+                                A[5] ^= (unsigned char)((t >> 16) & 0xff);
+                                A[4] ^= (unsigned char)((t >> 24) & 0xff);
                                 }
                         memcpy(R, B + 8, 8);
                         }
                 }
         memcpy(out, A, 8);
         return inlen + 8;
         }
 
 int AES_unwrap_key(AES_KEY *key, const unsigned char *iv,
                 unsigned char *out,
@@ skipping 11 matching lines @@
         memcpy(A, in, 8);
         memcpy(out, in + 8, inlen);
         for (j = 0; j < 6; j++)
                 {
                 R = out + inlen - 8;
                 for (i = 0; i < inlen; i += 8, t--, R -= 8)
                         {
                         A[7] ^= (unsigned char)(t & 0xff);
                         if (t > 0xff)   
                                 {
-                                A[6] ^= (unsigned char)((t & 0xff) >> 8);
-                                A[5] ^= (unsigned char)((t & 0xff) >> 16);
-                                A[4] ^= (unsigned char)((t & 0xff) >> 24);
+                                A[6] ^= (unsigned char)((t >> 8) & 0xff);
+                                A[5] ^= (unsigned char)((t >> 16) & 0xff);
+                                A[4] ^= (unsigned char)((t >> 24) & 0xff);
                                 }
                         memcpy(B + 8, R, 8);
                         AES_decrypt(B, B, key);
                         memcpy(R, B + 8, 8);
                         }
                 }
         if (!iv)
                 iv = default_iv;
         if (memcmp(A, iv, 8))
                 {
@@ skipping 115 matching lines @@
         ret = AES_wrap_unwrap_test(kek, 192, NULL, e4, key, 24);
         fprintf(stderr, "Key test result %d\n", ret);
         ret = AES_wrap_unwrap_test(kek, 256, NULL, e5, key, 24);
         fprintf(stderr, "Key test result %d\n", ret);
         ret = AES_wrap_unwrap_test(kek, 256, NULL, e6, key, 32);
         fprintf(stderr, "Key test result %d\n", ret);
 }
         
         
 #endif