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

openssl/crypto/dso/dso_lib.c

 /* dso_lib.c -*- mode:C; c-file-style: "eay" -*- */
 /* Written by Geoff Thorpe (geoff@geoffthorpe.net) for the OpenSSL
  * project 2000.
  */
 /* ====================================================================
  * Copyright (c) 2000 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 89 matching lines @@
                  * to stealing the "best available" method. Will fallback
                  * to DSO_METH_null() in the worst case. */
                 default_DSO_meth = DSO_METHOD_openssl();
         ret = (DSO *)OPENSSL_malloc(sizeof(DSO));
         if(ret == NULL)
                 {
                 DSOerr(DSO_F_DSO_NEW_METHOD,ERR_R_MALLOC_FAILURE);
                 return(NULL);
                 }
         memset(ret, 0, sizeof(DSO));
-        ret->meth_data = sk_new_null();
+        ret->meth_data = sk_void_new_null();
         if(ret->meth_data == NULL)
                 {
                 /* sk_new doesn't generate any errors so we do */
                 DSOerr(DSO_F_DSO_NEW_METHOD,ERR_R_MALLOC_FAILURE);
                 OPENSSL_free(ret);
                 return(NULL);
                 }
         if(meth == NULL)
                 ret->meth = default_DSO_meth;
         else
@@ skipping 35 matching lines @@
                 DSOerr(DSO_F_DSO_FREE,DSO_R_UNLOAD_FAILED);
                 return(0);
                 }
  
         if((dso->meth->finish != NULL) && !dso->meth->finish(dso))
                 {
                 DSOerr(DSO_F_DSO_FREE,DSO_R_FINISH_FAILED);
                 return(0);
                 }
         
-        sk_free(dso->meth_data);
+        sk_void_free(dso->meth_data);
         if(dso->filename != NULL)
                 OPENSSL_free(dso->filename);
         if(dso->loaded_filename != NULL)
                 OPENSSL_free(dso->loaded_filename);
  
         OPENSSL_free(dso);
         return(1);
         }
 
 int DSO_flags(DSO *dso)
@@ skipping 215 matching lines @@
 
 char *DSO_merge(DSO *dso, const char *filespec1, const char *filespec2)
         {
         char *result = NULL;
 
         if(dso == NULL || filespec1 == NULL)
                 {
                 DSOerr(DSO_F_DSO_MERGE,ERR_R_PASSED_NULL_PARAMETER);
                 return(NULL);
                 }
-        if(filespec1 == NULL)
-                filespec1 = dso->filename;
-        if(filespec1 == NULL)
-                {
-                DSOerr(DSO_F_DSO_MERGE,DSO_R_NO_FILE_SPECIFICATION);
-                return(NULL);
-                }
         if((dso->flags & DSO_FLAG_NO_NAME_TRANSLATION) == 0)
                 {
                 if(dso->merger != NULL)
                         result = dso->merger(dso, filespec1, filespec2);
                 else if(dso->meth->dso_merger != NULL)
                         result = dso->meth->dso_merger(dso,
                                 filespec1, filespec2);
                 }
         return(result);
         }
@@ skipping 38 matching lines @@
 const char *DSO_get_loaded_filename(DSO *dso)
         {
         if(dso == NULL)
                 {
                 DSOerr(DSO_F_DSO_GET_LOADED_FILENAME,
                                 ERR_R_PASSED_NULL_PARAMETER);
                 return(NULL);
                 }
         return(dso->loaded_filename);
         }
+
+int DSO_pathbyaddr(void *addr,char *path,int sz)
+        {
+        DSO_METHOD *meth = default_DSO_meth;
+        if (meth == NULL) meth = DSO_METHOD_openssl();
+        if (meth->pathbyaddr == NULL)
+                {
+                DSOerr(DSO_F_DSO_PATHBYADDR,DSO_R_UNSUPPORTED);
+                return -1;
+                }
+        return (*meth->pathbyaddr)(addr,path,sz);
+        }
+
+void *DSO_global_lookup(const char *name)
+        {
+        DSO_METHOD *meth = default_DSO_meth;
+        if (meth == NULL) meth = DSO_METHOD_openssl();
+        if (meth->globallookup == NULL)
+                {
+                DSOerr(DSO_F_DSO_GLOBAL_LOOKUP,DSO_R_UNSUPPORTED);
+                return NULL;
+                }
+        return (*meth->globallookup)(name);
+        }