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

openssl/engines/e_aep.c

 /* ====================================================================
  * Copyright (c) 1999 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 39 matching lines @@
  * (eay@cryptsoft.com).  This product includes software written by Tim
  * Hudson (tjh@cryptsoft.com).
  *
  */
 
 #include <stdio.h>
 #include <openssl/bn.h>
 #include <string.h>
 
 #include <openssl/e_os2.h>
-#if !defined(OPENSSL_SYS_MSDOS) || defined(__DJGPP__)
+#if !defined(OPENSSL_SYS_MSDOS) || defined(__DJGPP__) || defined(__MINGW32__)
 #include <sys/types.h>
 #include <unistd.h>
 #else
 #include <process.h>
 typedef int pid_t;
 #endif
 
 #if defined(OPENSSL_SYS_NETWARE) && defined(NETWARE_CLIB)
 #define getpid GetThreadID
 extern int GetThreadID(void);
+#elif defined(_WIN32) && !defined(__WATCOMC__)
+#define getpid _getpid
 #endif
 
 #include <openssl/crypto.h>
 #include <openssl/dso.h>
 #include <openssl/engine.h>
 #include <openssl/buffer.h>
 #ifndef OPENSSL_NO_RSA
 #include <openssl/rsa.h>
 #endif
 #ifndef OPENSSL_NO_DSA
@@ skipping 779 matching lines @@
 static AEP_RV aep_get_connection(AEP_CONNECTION_HNDL_PTR phConnection)
         {
         int count;
         AEP_RV rv = AEP_R_OK;
 
         /*Get the current process id*/
         pid_t curr_pid;
 
         CRYPTO_w_lock(CRYPTO_LOCK_ENGINE);
 
-#ifdef NETWARE_CLIB
-        curr_pid = GetThreadID();
-#elif defined(_WIN32)
-        curr_pid = _getpid();
-#else
         curr_pid = getpid();
-#endif
 
         /*Check if this is the first time this is being called from the current
           process*/
         if (recorded_pid != curr_pid)
                 {
                 /*Remember our pid so we can check if we're in a new process*/
                 recorded_pid = curr_pid;
 
                 /*Call Finalize to make sure we have not inherited some data
                   from a parent process*/
@@ skipping 248 matching lines @@
                         ((unsigned) AEP_BigNum[1] << 8 | AEP_BigNum[0]);
                 AEP_BigNum += 4;
                 }
 #endif
 
         return AEP_R_OK;
 }       
         
 #endif /* !OPENSSL_NO_HW_AEP */
 #endif /* !OPENSSL_NO_HW */