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

openssl/crypto/rand/rand_os2.c

 /* crypto/rand/rand_os2.c */
 /* ====================================================================
  * Copyright (c) 1998-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:
  *
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer. 
@@ skipping 60 matching lines @@
     ULONG ulTimeLow;            /* Low 32 bits of time stamp      */
     ULONG ulTimeHigh;           /* High 32 bits of time stamp     */
     ULONG ulIdleLow;            /* Low 32 bits of idle time       */
     ULONG ulIdleHigh;           /* High 32 bits of idle time      */
     ULONG ulBusyLow;            /* Low 32 bits of busy time       */
     ULONG ulBusyHigh;           /* High 32 bits of busy time      */
     ULONG ulIntrLow;            /* Low 32 bits of interrupt time  */
     ULONG ulIntrHigh;           /* High 32 bits of interrupt time */
 } CPUUTIL;
 
+#ifndef __KLIBC__
 APIRET APIENTRY(*DosPerfSysCall) (ULONG ulCommand, ULONG ulParm1, ULONG ulParm2, ULONG ulParm3) = NULL;
 APIRET APIENTRY(*DosQuerySysState) (ULONG func, ULONG arg1, ULONG pid, ULONG _res_, PVOID buf, ULONG bufsz) = NULL;
+#endif
 HMODULE hDoscalls = 0;
 
 int RAND_poll(void)
 {
     char failed_module[20];
     QWORD qwTime;
     ULONG SysVars[QSV_FOREGROUND_PROCESS];
 
     if (hDoscalls == 0) {
         ULONG rc = DosLoadModule(failed_module, sizeof(failed_module), "DOSCALLS", &hDoscalls);
 
+#ifndef __KLIBC__
         if (rc == 0) {
             rc = DosQueryProcAddr(hDoscalls, 976, NULL, (PFN *)&DosPerfSysCall);
 
             if (rc)
                 DosPerfSysCall = NULL;
 
             rc = DosQueryProcAddr(hDoscalls, 368, NULL, (PFN *)&DosQuerySysState);
 
             if (rc)
                 DosQuerySysState = NULL;
         }
+#endif
     }
 
     /* Sample the hi-res timer, runs at around 1.1 MHz */
     DosTmrQueryTime(&qwTime);
     RAND_add(&qwTime, sizeof(qwTime), 2);
 
     /* Sample a bunch of system variables, includes various process & memory statistics */
     DosQuerySysInfo(1, QSV_FOREGROUND_PROCESS, SysVars, sizeof(SysVars));
     RAND_add(SysVars, sizeof(SysVars), 4);
 
     /* If available, sample CPU registers that count at CPU MHz
      * Only fairly new CPUs (PPro & K6 onwards) & OS/2 versions support this
      */
     if (DosPerfSysCall) {
         CPUUTIL util;
 
         if (DosPerfSysCall(CMD_KI_RDCNT, (ULONG)&util, 0, 0) == 0) {
             RAND_add(&util, sizeof(util), 10);
         }
         else {
+#ifndef __KLIBC__
             DosPerfSysCall = NULL;
+#endif
         }
     }
 
     /* DosQuerySysState() gives us a huge quantity of process, thread, memory & handle stats */
     if (DosQuerySysState) {
         char *buffer = OPENSSL_malloc(256 * 1024);
 
         if (DosQuerySysState(0x1F, 0, 0, 0, buffer, 256 * 1024) == 0) {
             /* First 4 bytes in buffer is a pointer to the thread count
              * there should be at least 1 byte of entropy per thread
              */
             RAND_add(buffer, 256 * 1024, **(ULONG **)buffer);
         }
 
         OPENSSL_free(buffer);
         return 1;
     }
 
     return 0;
 }
 
 #endif /* OPENSSL_SYS_OS2 */