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

openssl/ssl/d1_enc.c

 /* ssl/d1_enc.c */
 /* 
  * DTLS implementation written by Nagendra Modadugu
  * (nagendra@cs.stanford.edu) for the OpenSSL project 2005.  
  */
 /* ====================================================================
  * Copyright (c) 1998-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
@@ skipping 118 matching lines @@
 int dtls1_enc(SSL *s, int send)
         {
         SSL3_RECORD *rec;
         EVP_CIPHER_CTX *ds;
         unsigned long l;
         int bs,i,ii,j,k,n=0;
         const EVP_CIPHER *enc;
 
         if (send)
                 {
-                if (s->write_hash != NULL)
-                        n=EVP_MD_size(s->write_hash);
+                if (EVP_MD_CTX_md(s->write_hash))
+                        {
+                        n=EVP_MD_CTX_size(s->write_hash);
+                        if (n < 0)
+                                return -1;
+                        }
                 ds=s->enc_write_ctx;
                 rec= &(s->s3->wrec);
                 if (s->enc_write_ctx == NULL)
                         enc=NULL;
                 else
                         {
                         enc=EVP_CIPHER_CTX_cipher(s->enc_write_ctx);
                         if ( rec->data != rec->input)
                                 /* we can't write into the input stream */
                                 fprintf(stderr, "%s:%d: rec->data != rec->input\n",
                                         __FILE__, __LINE__);
                         else if ( EVP_CIPHER_block_size(ds->cipher) > 1)
                                 {
                                 if (RAND_bytes(rec->input, EVP_CIPHER_block_size(ds->cipher)) <= 0)
                                         return -1;
                                 }
                         }
                 }
         else
                 {
-                if (s->read_hash != NULL)
-                        n=EVP_MD_size(s->read_hash);
+                if (EVP_MD_CTX_md(s->read_hash))
+                        {
+                        n=EVP_MD_CTX_size(s->read_hash);
+                        if (n < 0)
+                                return -1;
+                        }
                 ds=s->enc_read_ctx;
                 rec= &(s->s3->rrec);
                 if (s->enc_read_ctx == NULL)
                         enc=NULL;
                 else
                         enc=EVP_CIPHER_CTX_cipher(s->enc_read_ctx);
                 }
 
 #ifdef KSSL_DEBUG
         printf("dtls1_enc(%d)\n", send);
@@ skipping 26 matching lines @@
                         for (k=(int)l; k<(int)(l+i); k++)
                                 rec->input[k]=j;
                         l+=i;
                         rec->length+=i;
                         }
 
 #ifdef KSSL_DEBUG
                 {
                 unsigned long ui;
                 printf("EVP_Cipher(ds=%p,rec->data=%p,rec->input=%p,l=%ld) ==>\n",
-                        (void *)ds,rec->data,rec->input,l);
-                printf("\tEVP_CIPHER_CTX: %d buf_len, %d key_len [%ld %ld], %d iv_len\n",
+                        ds,rec->data,rec->input,l);
+                printf("\tEVP_CIPHER_CTX: %d buf_len, %d key_len [%d %d], %d iv_len\n",
                         ds->buf_len, ds->cipher->key_len,
-                        (unsigned long)DES_KEY_SZ,
-                        (unsigned long)DES_SCHEDULE_SZ,
+                        DES_KEY_SZ, DES_SCHEDULE_SZ,
                         ds->cipher->iv_len);
                 printf("\t\tIV: ");
                 for (i=0; i<ds->cipher->iv_len; i++) printf("%02X", ds->iv[i]);
                 printf("\n");
                 printf("\trec->input=");
                 for (ui=0; ui<l; ui++) printf(" %02x", rec->input[ui]);
                 printf("\n");
                 }
 #endif  /* KSSL_DEBUG */
 
                 if (!send)
                         {
                         if (l == 0 || l%bs != 0)
-                                {
-                                SSLerr(SSL_F_DTLS1_ENC,SSL_R_BLOCK_CIPHER_PAD_IS_WRONG);
-                                ssl3_send_alert(s,SSL3_AL_FATAL,SSL_AD_DECRYPTION_FAILED);
-                                return 0;
-                                }
+                                return -1;
                         }
                 
                 EVP_Cipher(ds,rec->data,rec->input,l);
 
 #ifdef KSSL_DEBUG
                 {
-                unsigned long ki;
+                unsigned long i;
                 printf("\trec->data=");
-                for (ki=0; ki<l; ki++)
-                        printf(" %02x", rec->data[ki]);  printf("\n");
+                for (i=0; i<l; i++)
+                        printf(" %02x", rec->data[i]);  printf("\n");
                 }
 #endif  /* KSSL_DEBUG */
 
                 if ((bs != 1) && !send)
                         {
                         ii=i=rec->data[l-1]; /* padding_length */
                         i++;
                         if (s->options&SSL_OP_TLS_BLOCK_PADDING_BUG)
                                 {
                                 /* First packet is even in size, so check */
@@ skipping 25 matching lines @@
                         rec->length-=i;
 
                         rec->data += bs;    /* skip the implicit IV */
                         rec->input += bs;
                         rec->length -= bs;
                         }
                 }
         return(1);
         }