18 files changed, 17 insertions, 113 deletions
diff --git a/dep/ACE_wrappers/m4/aio.m4 b/dep/ACE_wrappers/m4/aio.m4
index b38a8b981aa..49fa7d19afd 100644
--- a/dep/ACE_wrappers/m4/aio.m4
+++ b/dep/ACE_wrappers/m4/aio.m4
@@ -64,7 +64,6 @@ if test "$ace_has_aio_funcs" = yes; then
 #include <string.h>
 #include <errno.h>
 #include <stdio.h>
-#include <iostream.h>
 
 #include <aio.h>
 
diff --git a/dep/include/Makefile.am b/dep/include/Makefile.am
index 3991d1e6274..455f0a81307 100644
--- a/dep/include/Makefile.am
+++ b/dep/include/Makefile.am
@@ -199,54 +199,6 @@ EXTRA_DIST += \
 	zlib/zconf.h \
 	zlib/zlib.h
 
-#  ZThread header files for Win32 builds
-EXTRA_DIST += \
-	zthread/AtomicCount.h \
-	zthread/Barrier.h \
-	zthread/BiasedReadWriteLock.h \
-	zthread/BlockingQueue.h \
-	zthread/BoundedQueue.h \
-	zthread/Cancelable.h \
-	zthread/ClassLockable.h \
-	zthread/ConcurrentExecutor.h \
-	zthread/Condition.h \
-	zthread/Config.h \
-	zthread/CountedPtr.h \
-	zthread/CountingSemaphore.h \
-	zthread/Exceptions.h \
-	zthread/Executor.h \
-	zthread/FairReadWriteLock.h \
-	zthread/FastMutex.h \
-	zthread/FastRecursiveMutex.h \
-	zthread/Guard.h \
-	zthread/GuardedClass.h \
-	zthread/Lockable.h \
-	zthread/LockedQueue.h \
-	zthread/MonitoredQueue.h \
-	zthread/Mutex.h \
-	zthread/NonCopyable.h \
-	zthread/PoolExecutor.h \
-	zthread/Priority.h \
-	zthread/PriorityCondition.h \
-	zthread/PriorityInheritanceMutex.h \
-	zthread/PriorityMutex.h \
-	zthread/PrioritySemaphore.h \
-	zthread/Queue.h \
-	zthread/ReadWriteLock.h \
-	zthread/RecursiveMutex.h \
-	zthread/Runnable.h \
-	zthread/Semaphore.h \
-	zthread/Singleton.h \
-	zthread/SynchronousExecutor.h \
-	zthread/Task.h \
-	zthread/Thread.h \
-	zthread/ThreadLocal.h \
-	zthread/ThreadLocalImpl.h \
-	zthread/ThreadedExecutor.h \
-	zthread/Time.h \
-	zthread/Waitable.h \
-	zthread/ZThread.h
-
 # Mersenne Twister random number generator header files
 EXTRA_DIST += \
 	mersennetwister/MersenneTwister.h
diff --git a/dep/include/openssl/asn1.h b/dep/include/openssl/asn1.h
index 424cd348bb5..e3385226d4a 100644
--- a/dep/include/openssl/asn1.h
+++ b/dep/include/openssl/asn1.h
@@ -612,6 +612,7 @@ typedef struct BIT_STRING_BITNAME_st {
 			B_ASN1_GENERALIZEDTIME
 
 #define B_ASN1_PRINTABLE \
+			B_ASN1_NUMERICSTRING| \
 			B_ASN1_PRINTABLESTRING| \
 			B_ASN1_T61STRING| \
 			B_ASN1_IA5STRING| \
@@ -1217,6 +1218,7 @@ void ERR_load_ASN1_strings(void);
 #define ASN1_R_BAD_OBJECT_HEADER			 102
 #define ASN1_R_BAD_PASSWORD_READ			 103
 #define ASN1_R_BAD_TAG					 104
+#define ASN1_R_BMPSTRING_IS_WRONG_LENGTH		 210
 #define ASN1_R_BN_LIB					 105
 #define ASN1_R_BOOLEAN_IS_WRONG_LENGTH			 106
 #define ASN1_R_BUFFER_TOO_SMALL				 107
@@ -1306,6 +1308,7 @@ void ERR_load_ASN1_strings(void);
 #define ASN1_R_UNABLE_TO_DECODE_RSA_KEY			 157
 #define ASN1_R_UNABLE_TO_DECODE_RSA_PRIVATE_KEY		 158
 #define ASN1_R_UNEXPECTED_EOC				 159
+#define ASN1_R_UNIVERSALSTRING_IS_WRONG_LENGTH		 211
 #define ASN1_R_UNKNOWN_FORMAT				 160
 #define ASN1_R_UNKNOWN_MESSAGE_DIGEST_ALGORITHM		 161
 #define ASN1_R_UNKNOWN_OBJECT_TYPE			 162
diff --git a/dep/include/openssl/opensslconf.h b/dep/include/openssl/opensslconf.h
index 231bf7bfdbe..2d571c894c7 100644
--- a/dep/include/openssl/opensslconf.h
+++ b/dep/include/openssl/opensslconf.h
@@ -104,8 +104,8 @@
 
 #if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */
 #if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
-#define ENGINESDIR "G:\openssl_build/lib/engines"
-#define OPENSSLDIR "G:\openssl_build/ssl"
+#define ENGINESDIR "g:/openssl/lib/engines"
+#define OPENSSLDIR "g:/openssl/ssl"
 #endif
 #endif
 
diff --git a/dep/include/openssl/opensslv.h b/dep/include/openssl/opensslv.h
index 09687b5136a..c6207f76b2c 100644
--- a/dep/include/openssl/opensslv.h
+++ b/dep/include/openssl/opensslv.h
@@ -25,11 +25,11 @@
  * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for
  *  major minor fix final patch/beta)
  */
-#define OPENSSL_VERSION_NUMBER	0x009080afL
+#define OPENSSL_VERSION_NUMBER	0x009080bfL
 #ifdef OPENSSL_FIPS
-#define OPENSSL_VERSION_TEXT	"OpenSSL 0.9.8j-fips 07 Jan 2009"
+#define OPENSSL_VERSION_TEXT	"OpenSSL 0.9.8k-fips 25 Mar 2009"
 #else
-#define OPENSSL_VERSION_TEXT	"OpenSSL 0.9.8j 07 Jan 2009"
+#define OPENSSL_VERSION_TEXT	"OpenSSL 0.9.8k 25 Mar 2009"
 #endif
 #define OPENSSL_VERSION_PTEXT	" part of " OPENSSL_VERSION_TEXT
 
diff --git a/dep/include/openssl/pem.h b/dep/include/openssl/pem.h
index 6f8e01544bb..6c193f1cbfa 100644
--- a/dep/include/openssl/pem.h
+++ b/dep/include/openssl/pem.h
@@ -215,7 +215,9 @@ typedef struct pem_ctx_st
 
 #define IMPLEMENT_PEM_read_fp(name, type, str, asn1) /**/
 #define IMPLEMENT_PEM_write_fp(name, type, str, asn1) /**/
+#define IMPLEMENT_PEM_write_fp_const(name, type, str, asn1) /**/
 #define IMPLEMENT_PEM_write_cb_fp(name, type, str, asn1) /**/
+#define IMPLEMENT_PEM_write_cb_fp_const(name, type, str, asn1) /**/
 
 #else
 
@@ -355,6 +357,7 @@ int PEM_write_bio_##name(BIO *bp, type *x, const EVP_CIPHER *enc, \
 
 #define DECLARE_PEM_read_fp(name, type) /**/
 #define DECLARE_PEM_write_fp(name, type) /**/
+#define DECLARE_PEM_write_fp_const(name, type) /**/
 #define DECLARE_PEM_write_cb_fp(name, type) /**/
 
 #else
@@ -392,6 +395,7 @@ int PEM_write_bio_##name(BIO *bp, type *x, const EVP_CIPHER *enc, \
 
 #define DECLARE_PEM_read_bio(name, type) /**/
 #define DECLARE_PEM_write_bio(name, type) /**/
+#define DECLARE_PEM_write_bio_const(name, type) /**/
 #define DECLARE_PEM_write_cb_bio(name, type) /**/
 
 #endif
diff --git a/dep/include/openssl/symhacks.h b/dep/include/openssl/symhacks.h
index 6cfb5fe4794..8728e6124da 100644
--- a/dep/include/openssl/symhacks.h
+++ b/dep/include/openssl/symhacks.h
@@ -62,6 +62,10 @@
    VAX. */
 #ifdef OPENSSL_SYS_VMS
 
+/* Hack a long name in crypto/cryptlib.c */
+#undef int_CRYPTO_set_do_dynlock_callback
+#define int_CRYPTO_set_do_dynlock_callback	int_CRYPTO_set_do_dynlock_cb
+
 /* Hack a long name in crypto/ex_data.c */
 #undef CRYPTO_get_ex_data_implementation
 #define CRYPTO_get_ex_data_implementation	CRYPTO_get_ex_data_impl
diff --git a/dep/lib/win32_debug/libeay32.dll b/dep/lib/win32_debug/libeay32.dll
index 1cbc5dfc23d..79f55974cdd 100644
--- a/dep/lib/win32_debug/libeay32.dll
+++ b/dep/lib/win32_debug/libeay32.dll
diff --git a/dep/lib/win32_debug/libeay32.lib b/dep/lib/win32_debug/libeay32.lib
index 70407d3e070..590c39eb75f 100644
--- a/dep/lib/win32_debug/libeay32.lib
+++ b/dep/lib/win32_debug/libeay32.lib
diff --git a/dep/lib/win32_release/libeay32.dll b/dep/lib/win32_release/libeay32.dll
index ed6543efefa..9b7dc65c4c9 100644
--- a/dep/lib/win32_release/libeay32.dll
+++ b/dep/lib/win32_release/libeay32.dll
diff --git a/dep/lib/win32_release/libeay32.lib b/dep/lib/win32_release/libeay32.lib
index 2796163595d..fb5a2445bbc 100644
--- a/dep/lib/win32_release/libeay32.lib
+++ b/dep/lib/win32_release/libeay32.lib
diff --git a/dep/lib/x64_Debug/libeay32.dll b/dep/lib/x64_Debug/libeay32.dll
index 1a6952eeadb..d9df5ecc862 100644
--- a/dep/lib/x64_Debug/libeay32.dll
+++ b/dep/lib/x64_Debug/libeay32.dll
diff --git a/dep/lib/x64_Debug/libeay32.lib b/dep/lib/x64_Debug/libeay32.lib
index e27b6ccde09..a495e921070 100644
--- a/dep/lib/x64_Debug/libeay32.lib
+++ b/dep/lib/x64_Debug/libeay32.lib
diff --git a/dep/lib/x64_release/libeay32.dll b/dep/lib/x64_release/libeay32.dll
index e2d98bea828..45357905e74 100644
--- a/dep/lib/x64_release/libeay32.dll
+++ b/dep/lib/x64_release/libeay32.dll
diff --git a/dep/lib/x64_release/libeay32.lib b/dep/lib/x64_release/libeay32.lib
index d004d975adb..750e837dcdf 100644
--- a/dep/lib/x64_release/libeay32.lib
+++ b/dep/lib/x64_release/libeay32.lib
diff --git a/dep/src/Makefile.am b/dep/src/Makefile.am
index 6ae2808895c..50814f8ff13 100644
--- a/dep/src/Makefile.am
+++ b/dep/src/Makefile.am
@@ -19,7 +19,7 @@
 ## Process this file with automake to produce Makefile.in
 
 ## Sub-directories to parse
-SUBDIRS = g3dlite sockets zlib zthread
+SUBDIRS = g3dlite sockets zlib
 
 ## Additional files to include when running 'make dist'
 #  Nothing yet.
diff --git a/dep/src/zthread/AtomicCount.cxx b/dep/src/zthread/AtomicCount.cxx
deleted file mode 100644
index ac0d0773b12..00000000000
--- a/dep/src/zthread/AtomicCount.cxx
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (c) 2005, Eric Crahen
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is furnished
- * to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- */
-
-#ifndef __ZTATOMICCOUNTSELECT_H__
-#define __ZTATOMICCOUNTSELECT_H__
-
-#include "zthread/AtomicCount.h"
-#include "zthread/Config.h"
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-/*
-// Select the correct AtomicCount implementation based on
-// what the compilation environment has defined
-
-#ifndef ZT_VANILLA
-
-#if defined(HAVE_ATOMIC_LINUX)
-#  include "linux/AtomicCount.cxx"
-#elif defined(ZT_WIN32)
-#  include "win32/AtomicCount.cxx"
-#elif defined(ZT_WIN9X)
-#  include "win9x/AtomicCount.cxx"
-#endif
-
-#endif
-
-// Default to an AtomicCount that just uses a FastLock
-#ifndef __ZTATOMICCOUNTIMPL_H__
-#  include "vanilla/SimpleAtomicCount.cxx"
-#endif
-*/
-
-#  include "vanilla/SimpleAtomicCount.cxx"
-
-#endif // __ZTATOMICCOUNTSELECT_H__
diff --git a/dep/src/zthread/CMakeLists.txt b/dep/src/zthread/CMakeLists.txt
index 61fb1310588..c2ac36c367c 100644
--- a/dep/src/zthread/CMakeLists.txt
+++ b/dep/src/zthread/CMakeLists.txt
@@ -1,7 +1,6 @@
 ########### next target ###############
 
 SET(ZThread_LIB_SRCS
-   AtomicCount.cxx
    Condition.cxx
    ConcurrentExecutor.cxx
    CountingSemaphore.cxx