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

openssl/crypto/dso/dso_dl.c

 /* dso_dl.c -*- mode:C; c-file-style: "eay" -*- */
 /* Written by Richard Levitte (richard@levitte.org) 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 67 matching lines @@
 static DSO_FUNC_TYPE dl_bind_func(DSO *dso, const char *symname);
 #if 0
 static int dl_unbind_var(DSO *dso, char *symname, void *symptr);
 static int dl_unbind_func(DSO *dso, char *symname, DSO_FUNC_TYPE symptr);
 static int dl_init(DSO *dso);
 static int dl_finish(DSO *dso);
 static int dl_ctrl(DSO *dso, int cmd, long larg, void *parg);
 #endif
 static char *dl_name_converter(DSO *dso, const char *filename);
 static char *dl_merger(DSO *dso, const char *filespec1, const char *filespec2);
+static int dl_pathbyaddr(void *addr,char *path,int sz);
+static void *dl_globallookup(const char *name);
 
 static DSO_METHOD dso_meth_dl = {
         "OpenSSL 'dl' shared library method",
         dl_load,
         dl_unload,
         dl_bind_var,
         dl_bind_func,
 /* For now, "unbind" doesn't exist */
 #if 0
         NULL, /* unbind_var */
         NULL, /* unbind_func */
 #endif
         NULL, /* ctrl */
         dl_name_converter,
         dl_merger,
         NULL, /* init */
-        NULL  /* finish */
+        NULL, /* finish */
+        dl_pathbyaddr,
+        dl_globallookup
         };
 
 DSO_METHOD *DSO_METHOD_dl(void)
         {
         return(&dso_meth_dl);
         }
 
 /* For this DSO_METHOD, our meth_data STACK will contain;
  * (i) the handle (shl_t) returned from shl_load().
  * NB: I checked on HPUX11 and shl_t is itself a pointer
@@ skipping 228 matching lines @@
                 if ((DSO_flags(dso) & DSO_FLAG_NAME_TRANSLATION_EXT_ONLY) == 0)
                         sprintf(translated, "lib%s%s", filename, extension);
                 else
                         sprintf(translated, "%s%s", filename, extension);
                 }
         else
                 sprintf(translated, "%s", filename);
         return(translated);
         }
 
+static int dl_pathbyaddr(void *addr,char *path,int sz)
+        {
+        struct shl_descriptor inf;
+        int i,len;
+
+        if (addr == NULL)
+                {
+                union   { int(*f)(void*,char*,int); void *p; } t =
+                        { dl_pathbyaddr };
+                addr = t.p;
+                }
+
+        for (i=-1;shl_get_r(i,&inf)==0;i++)
+                {
+                if (((size_t)addr >= inf.tstart && (size_t)addr < inf.tend) ||
+                    ((size_t)addr >= inf.dstart && (size_t)addr < inf.dend))
+                        {
+                        len = (int)strlen(inf.filename);
+                        if (sz <= 0) return len+1;
+                        if (len >= sz) len=sz-1;
+                        memcpy(path,inf.filename,len);
+                        path[len++] = 0;
+                        return len;
+                        }
+                }
+
+        return -1;
+        }
+
+static void *dl_globallookup(const char *name)
+        {
+        void *ret;
+        shl_t h = NULL;
+
+        return shl_findsym(&h,name,TYPE_UNDEFINED,&ret) ? NULL : ret;
+        }
 #endif /* DSO_DL */