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

openssl/crypto/evp/evp_lib.c

 /* crypto/evp/evp_lib.c */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
  * This package is an SSL implementation written
  * by Eric Young (eay@cryptsoft.com).
  * The implementation was written so as to conform with Netscapes SSL.
  * 
  * This library is free for commercial and non-commercial use as long as
  * the following conditions are aheared to.  The following conditions
@@ skipping 49 matching lines @@
 #include "cryptlib.h"
 #include <openssl/evp.h>
 #include <openssl/objects.h>
 
 int EVP_CIPHER_param_to_asn1(EVP_CIPHER_CTX *c, ASN1_TYPE *type)
         {
         int ret;
 
         if (c->cipher->set_asn1_parameters != NULL)
                 ret=c->cipher->set_asn1_parameters(c,type);
-        else if (c->cipher->flags & EVP_CIPH_FLAG_DEFAULT_ASN1)
-                ret=EVP_CIPHER_set_asn1_iv(c, type);
         else
                 ret=-1;
         return(ret);
         }
 
 int EVP_CIPHER_asn1_to_param(EVP_CIPHER_CTX *c, ASN1_TYPE *type)
         {
         int ret;
 
         if (c->cipher->get_asn1_parameters != NULL)
                 ret=c->cipher->get_asn1_parameters(c,type);
-        else if (c->cipher->flags & EVP_CIPH_FLAG_DEFAULT_ASN1)
-                ret=EVP_CIPHER_get_asn1_iv(c, type);
         else
                 ret=-1;
         return(ret);
         }
 
 int EVP_CIPHER_get_asn1_iv(EVP_CIPHER_CTX *c, ASN1_TYPE *type)
         {
         int i=0;
         unsigned int l;
 
@@ skipping 86 matching lines @@
 int EVP_CIPHER_block_size(const EVP_CIPHER *e)
         {
         return e->block_size;
         }
 
 int EVP_CIPHER_CTX_block_size(const EVP_CIPHER_CTX *ctx)
         {
         return ctx->cipher->block_size;
         }
 
+int EVP_Cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, const unsigned char *in, unsigned int inl)
+        {
+        return ctx->cipher->do_cipher(ctx,out,in,inl);
+        }
+
 const EVP_CIPHER *EVP_CIPHER_CTX_cipher(const EVP_CIPHER_CTX *ctx)
         {
         return ctx->cipher;
         }
 
 unsigned long EVP_CIPHER_flags(const EVP_CIPHER *cipher)
         {
         return cipher->flags;
         }
 
+unsigned long EVP_CIPHER_CTX_flags(const EVP_CIPHER_CTX *ctx)
+        {
+        return ctx->cipher->flags;
+        }
+
 void *EVP_CIPHER_CTX_get_app_data(const EVP_CIPHER_CTX *ctx)
         {
         return ctx->app_data;
         }
 
 void EVP_CIPHER_CTX_set_app_data(EVP_CIPHER_CTX *ctx, void *data)
         {
         ctx->app_data = data;
         }
 
 int EVP_CIPHER_iv_length(const EVP_CIPHER *cipher)
         {
         return cipher->iv_len;
         }
 
+int EVP_CIPHER_CTX_iv_length(const EVP_CIPHER_CTX *ctx)
+        {
+        return ctx->cipher->iv_len;
+        }
+
 int EVP_CIPHER_key_length(const EVP_CIPHER *cipher)
         {
         return cipher->key_len;
         }
 
 int EVP_CIPHER_CTX_key_length(const EVP_CIPHER_CTX *ctx)
         {
         return ctx->key_len;
         }
 
+int EVP_CIPHER_nid(const EVP_CIPHER *cipher)
+        {
+        return cipher->nid;
+        }
+
 int EVP_CIPHER_CTX_nid(const EVP_CIPHER_CTX *ctx)
         {
         return ctx->cipher->nid;
         }
 
 int EVP_MD_block_size(const EVP_MD *md) 
         {
         return md->block_size;
         }
 
 int EVP_MD_type(const EVP_MD *md)
         {
         return md->type;
         }
 
 int EVP_MD_pkey_type(const EVP_MD *md)
         {
         return md->pkey_type;
         }
 
 int EVP_MD_size(const EVP_MD *md)
         {
+        if (!md)
+                {
+                EVPerr(EVP_F_EVP_MD_SIZE, EVP_R_MESSAGE_DIGEST_IS_NULL);
+                return -1;
+                }
         return md->md_size;
         }
 
-const EVP_MD * EVP_MD_CTX_md(const EVP_MD_CTX *ctx)
+unsigned long EVP_MD_flags(const EVP_MD *md)
         {
+        return md->flags;
+        }
+
+const EVP_MD *EVP_MD_CTX_md(const EVP_MD_CTX *ctx)
+        {
+        if (!ctx)
+                return NULL;
         return ctx->digest;
         }
 
 void EVP_MD_CTX_set_flags(EVP_MD_CTX *ctx, int flags)
         {
         ctx->flags |= flags;
         }
 
 void EVP_MD_CTX_clear_flags(EVP_MD_CTX *ctx, int flags)
         {
@@ skipping 12 matching lines @@
 
 void EVP_CIPHER_CTX_clear_flags(EVP_CIPHER_CTX *ctx, int flags)
         {
         ctx->flags &= ~flags;
         }
 
 int EVP_CIPHER_CTX_test_flags(const EVP_CIPHER_CTX *ctx, int flags)
         {
         return (ctx->flags & flags);
         }