diff --git a/bin/pkcs11/openssl-0.9.8zh-patch b/bin/pkcs11/openssl-0.9.8zh-patch
index 21f5905bb3..d41feaf544 100644
--- a/bin/pkcs11/openssl-0.9.8zh-patch
+++ b/bin/pkcs11/openssl-0.9.8zh-patch
@@ -15803,76 +15803,6 @@ diff -u /dev/null openssl/crypto/engine/pkcs11t.h:1.2
 +typedef CK_ARIA_CBC_ENCRYPT_DATA_PARAMS CK_PTR CK_ARIA_CBC_ENCRYPT_DATA_PARAMS_PTR;
 +
 +#endif
-Index: openssl/demos/easy_tls/easy-tls.c
-diff -u openssl/demos/easy_tls/easy-tls.c:1.1.1.1.72.1 openssl/demos/easy_tls/easy-tls.c:1.1.1.1.18.1
---- openssl/demos/easy_tls/easy-tls.c:1.1.1.1.72.1	Wed Dec 23 16:04:24 2015
-+++ openssl/demos/easy_tls/easy-tls.c	Wed Dec 23 16:46:13 2015
-@@ -1,7 +1,7 @@
- /* -*- Mode: C; c-file-style: "bsd" -*- */
- /*-
-  * easy-tls.c -- generic TLS proxy.
-- * $Id: easy-tls.c,v 1.1.1.1.72.1 2015-12-23 16:04:24 fdupont Exp $
-+ * $Id: easy-tls.c,v 1.1.1.1.18.1 2015-12-23 16:46:13 fdupont Exp $
-  */
- /*-
-  (c) Copyright 1999 Bodo Moeller.  All rights reserved.
-@@ -73,7 +73,7 @@
-  */
- 
- static char const rcsid[] =
--    "$Id: easy-tls.c,v 1.1.1.1.72.1 2015-12-23 16:04:24 fdupont Exp $";
-+    "$Id: easy-tls.c,v 1.1.1.1.18.1 2015-12-23 16:46:13 fdupont Exp $";
- 
- #include <assert.h>
- #include <errno.h>
-Index: openssl/demos/easy_tls/easy-tls.h
-diff -u openssl/demos/easy_tls/easy-tls.h:1.1.1.1.72.1 openssl/demos/easy_tls/easy-tls.h:1.1.1.1.18.1
---- openssl/demos/easy_tls/easy-tls.h:1.1.1.1.72.1	Wed Dec 23 16:04:24 2015
-+++ openssl/demos/easy_tls/easy-tls.h	Wed Dec 23 16:46:13 2015
-@@ -1,7 +1,7 @@
- /* -*- Mode: C; c-file-style: "bsd" -*- */
- /*-
-  * easy-tls.h -- generic TLS proxy.
-- * $Id: easy-tls.h,v 1.1.1.1.72.1 2015-12-23 16:04:24 fdupont Exp $
-+ * $Id: easy-tls.h,v 1.1.1.1.18.1 2015-12-23 16:46:13 fdupont Exp $
-  */
- /*
-  * (c) Copyright 1999 Bodo Moeller.  All rights reserved.
-Index: openssl/demos/easy_tls/test.c
-diff -u openssl/demos/easy_tls/test.c:1.1.1.1.72.1 openssl/demos/easy_tls/test.c:1.1.1.1.18.1
---- openssl/demos/easy_tls/test.c:1.1.1.1.72.1	Wed Dec 23 16:04:24 2015
-+++ openssl/demos/easy_tls/test.c	Wed Dec 23 16:46:13 2015
-@@ -1,5 +1,5 @@
- /* test.c */
--/* $Id: test.c,v 1.1.1.1.72.1 2015-12-23 16:04:24 fdupont Exp $ */
-+/* $Id: test.c,v 1.1.1.1.18.1 2015-12-23 16:46:13 fdupont Exp $ */
- 
- #define L_PORT 9999
- #define C_PORT 443
-Index: openssl/demos/easy_tls/test.h
-diff -u openssl/demos/easy_tls/test.h:1.1.1.1.72.1 openssl/demos/easy_tls/test.h:1.1.1.1.18.1
---- openssl/demos/easy_tls/test.h:1.1.1.1.72.1	Wed Dec 23 16:04:24 2015
-+++ openssl/demos/easy_tls/test.h	Wed Dec 23 16:46:13 2015
-@@ -1,5 +1,5 @@
- /* test.h */
--/* $Id: test.h,v 1.1.1.1.72.1 2015-12-23 16:04:24 fdupont Exp $ */
-+/* $Id: test.h,v 1.1.1.1.18.1 2015-12-23 16:46:13 fdupont Exp $ */
- 
- void test_process_init(int fd, int client_p, void *apparg);
- #define TLS_APP_PROCESS_INIT test_process_init
-Index: openssl/engines/vendor_defns/hwcryptohook.h
-diff -u openssl/engines/vendor_defns/hwcryptohook.h:1.1.1.1.72.1 openssl/engines/vendor_defns/hwcryptohook.h:1.1.1.1.18.1
---- openssl/engines/vendor_defns/hwcryptohook.h:1.1.1.1.72.1	Wed Dec 23 16:04:32 2015
-+++ openssl/engines/vendor_defns/hwcryptohook.h	Wed Dec 23 16:46:21 2015
-@@ -65,7 +65,7 @@
-  * please contact nCipher.
-  *
-  *
-- * $Id: hwcryptohook.h,v 1.1.1.1.72.1 2015-12-23 16:04:32 fdupont Exp $
-+ * $Id: hwcryptohook.h,v 1.1.1.1.18.1 2015-12-23 16:46:21 fdupont Exp $
-  */
- 
- #ifndef HWCRYPTOHOOK_H
 Index: openssl/util/libeay.num
 diff -u openssl/util/libeay.num:1.7.6.1.4.1.2.1.4.1 openssl/util/libeay.num:1.7.2.3
 --- openssl/util/libeay.num:1.7.6.1.4.1.2.1.4.1	Wed Mar  4 13:46:38 2015
diff --git a/bin/pkcs11/openssl-1.0.0t-patch b/bin/pkcs11/openssl-1.0.0t-patch
index a196e9d480..03465fe0cd 100644
--- a/bin/pkcs11/openssl-1.0.0t-patch
+++ b/bin/pkcs11/openssl-1.0.0t-patch
@@ -15784,76 +15784,6 @@ diff -u /dev/null openssl/crypto/engine/pkcs11t.h:1.2
 +typedef CK_ARIA_CBC_ENCRYPT_DATA_PARAMS CK_PTR CK_ARIA_CBC_ENCRYPT_DATA_PARAMS_PTR;
 +
 +#endif
-Index: openssl/demos/easy_tls/easy-tls.c
-diff -u openssl/demos/easy_tls/easy-tls.c:1.1.1.1.74.1 openssl/demos/easy_tls/easy-tls.c:1.1.1.1.30.1
---- openssl/demos/easy_tls/easy-tls.c:1.1.1.1.74.1	Wed Dec 23 17:26:40 2015
-+++ openssl/demos/easy_tls/easy-tls.c	Wed Dec 23 17:41:47 2015
-@@ -1,7 +1,7 @@
- /* -*- Mode: C; c-file-style: "bsd" -*- */
- /*-
-  * easy-tls.c -- generic TLS proxy.
-- * $Id: easy-tls.c,v 1.1.1.1.74.1 2015-12-23 17:26:40 fdupont Exp $
-+ * $Id: easy-tls.c,v 1.1.1.1.30.1 2015-12-23 17:41:47 fdupont Exp $
-  */
- /*-
-  (c) Copyright 1999 Bodo Moeller.  All rights reserved.
-@@ -73,7 +73,7 @@
-  */
- 
- static char const rcsid[] =
--    "$Id: easy-tls.c,v 1.1.1.1.74.1 2015-12-23 17:26:40 fdupont Exp $";
-+    "$Id: easy-tls.c,v 1.1.1.1.30.1 2015-12-23 17:41:47 fdupont Exp $";
- 
- #include <assert.h>
- #include <errno.h>
-Index: openssl/demos/easy_tls/easy-tls.h
-diff -u openssl/demos/easy_tls/easy-tls.h:1.1.1.1.74.1 openssl/demos/easy_tls/easy-tls.h:1.1.1.1.30.1
---- openssl/demos/easy_tls/easy-tls.h:1.1.1.1.74.1	Wed Dec 23 17:26:40 2015
-+++ openssl/demos/easy_tls/easy-tls.h	Wed Dec 23 17:41:47 2015
-@@ -1,7 +1,7 @@
- /* -*- Mode: C; c-file-style: "bsd" -*- */
- /*-
-  * easy-tls.h -- generic TLS proxy.
-- * $Id: easy-tls.h,v 1.1.1.1.74.1 2015-12-23 17:26:40 fdupont Exp $
-+ * $Id: easy-tls.h,v 1.1.1.1.30.1 2015-12-23 17:41:47 fdupont Exp $
-  */
- /*
-  * (c) Copyright 1999 Bodo Moeller.  All rights reserved.
-Index: openssl/demos/easy_tls/test.c
-diff -u openssl/demos/easy_tls/test.c:1.1.1.1.74.1 openssl/demos/easy_tls/test.c:1.1.1.1.30.1
---- openssl/demos/easy_tls/test.c:1.1.1.1.74.1	Wed Dec 23 17:26:40 2015
-+++ openssl/demos/easy_tls/test.c	Wed Dec 23 17:41:47 2015
-@@ -1,5 +1,5 @@
- /* test.c */
--/* $Id: test.c,v 1.1.1.1.74.1 2015-12-23 17:26:40 fdupont Exp $ */
-+/* $Id: test.c,v 1.1.1.1.30.1 2015-12-23 17:41:47 fdupont Exp $ */
- 
- #define L_PORT 9999
- #define C_PORT 443
-Index: openssl/demos/easy_tls/test.h
-diff -u openssl/demos/easy_tls/test.h:1.1.1.1.74.1 openssl/demos/easy_tls/test.h:1.1.1.1.30.1
---- openssl/demos/easy_tls/test.h:1.1.1.1.74.1	Wed Dec 23 17:26:40 2015
-+++ openssl/demos/easy_tls/test.h	Wed Dec 23 17:41:48 2015
-@@ -1,5 +1,5 @@
- /* test.h */
--/* $Id: test.h,v 1.1.1.1.74.1 2015-12-23 17:26:40 fdupont Exp $ */
-+/* $Id: test.h,v 1.1.1.1.30.1 2015-12-23 17:41:48 fdupont Exp $ */
- 
- void test_process_init(int fd, int client_p, void *apparg);
- #define TLS_APP_PROCESS_INIT test_process_init
-Index: openssl/engines/vendor_defns/hwcryptohook.h
-diff -u openssl/engines/vendor_defns/hwcryptohook.h:1.1.1.1.74.1 openssl/engines/vendor_defns/hwcryptohook.h:1.1.1.1.30.1
---- openssl/engines/vendor_defns/hwcryptohook.h:1.1.1.1.74.1	Wed Dec 23 17:26:51 2015
-+++ openssl/engines/vendor_defns/hwcryptohook.h	Wed Dec 23 17:45:37 2015
-@@ -65,7 +65,7 @@
-  * please contact nCipher.
-  *
-  *
-- * $Id: hwcryptohook.h,v 1.1.1.1.74.1 2015-12-23 17:26:51 fdupont Exp $
-+ * $Id: hwcryptohook.h,v 1.1.1.1.30.1 2015-12-23 17:45:37 fdupont Exp $
-  */
- 
- #ifndef HWCRYPTOHOOK_H
 Index: openssl/util/libeay.num
 diff -u openssl/util/libeay.num:1.8.2.1.6.1.4.1.4.1.2.1 openssl/util/libeay.num:1.9.2.4
 --- openssl/util/libeay.num:1.8.2.1.6.1.4.1.4.1.2.1	Wed Dec 23 17:27:04 2015
diff --git a/bin/pkcs11/openssl-1.0.1q-patch b/bin/pkcs11/openssl-1.0.1q-patch
index c7772d2116..7852392345 100644
--- a/bin/pkcs11/openssl-1.0.1q-patch
+++ b/bin/pkcs11/openssl-1.0.1q-patch
@@ -15686,76 +15686,6 @@ diff -u /dev/null openssl/crypto/engine/pkcs11t.h:1.2
 +typedef CK_ARIA_CBC_ENCRYPT_DATA_PARAMS CK_PTR CK_ARIA_CBC_ENCRYPT_DATA_PARAMS_PTR;
 +
 +#endif
-Index: openssl/demos/easy_tls/easy-tls.c
-diff -u openssl/demos/easy_tls/easy-tls.c:1.1.1.1.76.1 openssl/demos/easy_tls/easy-tls.c:1.2
---- openssl/demos/easy_tls/easy-tls.c:1.1.1.1.76.1	Wed Dec 23 18:10:12 2015
-+++ openssl/demos/easy_tls/easy-tls.c	Wed Dec 23 18:27:33 2015
-@@ -1,7 +1,7 @@
- /* -*- Mode: C; c-file-style: "bsd" -*- */
- /*-
-  * easy-tls.c -- generic TLS proxy.
-- * $Id: easy-tls.c,v 1.1.1.1.76.1 2015-12-23 18:10:12 fdupont Exp $
-+ * $Id: easy-tls.c,v 1.2 2015-12-23 18:27:33 fdupont Exp $
-  */
- /*-
-  (c) Copyright 1999 Bodo Moeller.  All rights reserved.
-@@ -73,7 +73,7 @@
-  */
- 
- static char const rcsid[] =
--    "$Id: easy-tls.c,v 1.1.1.1.76.1 2015-12-23 18:10:12 fdupont Exp $";
-+    "$Id: easy-tls.c,v 1.2 2015-12-23 18:27:33 fdupont Exp $";
- 
- #include <assert.h>
- #include <errno.h>
-Index: openssl/demos/easy_tls/easy-tls.h
-diff -u openssl/demos/easy_tls/easy-tls.h:1.1.1.1.76.1 openssl/demos/easy_tls/easy-tls.h:1.2
---- openssl/demos/easy_tls/easy-tls.h:1.1.1.1.76.1	Wed Dec 23 18:10:12 2015
-+++ openssl/demos/easy_tls/easy-tls.h	Wed Dec 23 18:27:34 2015
-@@ -1,7 +1,7 @@
- /* -*- Mode: C; c-file-style: "bsd" -*- */
- /*-
-  * easy-tls.h -- generic TLS proxy.
-- * $Id: easy-tls.h,v 1.1.1.1.76.1 2015-12-23 18:10:12 fdupont Exp $
-+ * $Id: easy-tls.h,v 1.2 2015-12-23 18:27:34 fdupont Exp $
-  */
- /*
-  * (c) Copyright 1999 Bodo Moeller.  All rights reserved.
-Index: openssl/demos/easy_tls/test.c
-diff -u openssl/demos/easy_tls/test.c:1.1.1.1.76.1 openssl/demos/easy_tls/test.c:1.2
---- openssl/demos/easy_tls/test.c:1.1.1.1.76.1	Wed Dec 23 18:10:12 2015
-+++ openssl/demos/easy_tls/test.c	Wed Dec 23 18:27:34 2015
-@@ -1,5 +1,5 @@
- /* test.c */
--/* $Id: test.c,v 1.1.1.1.76.1 2015-12-23 18:10:12 fdupont Exp $ */
-+/* $Id: test.c,v 1.2 2015-12-23 18:27:34 fdupont Exp $ */
- 
- #define L_PORT 9999
- #define C_PORT 443
-Index: openssl/demos/easy_tls/test.h
-diff -u openssl/demos/easy_tls/test.h:1.1.1.1.76.1 openssl/demos/easy_tls/test.h:1.2
---- openssl/demos/easy_tls/test.h:1.1.1.1.76.1	Wed Dec 23 18:10:12 2015
-+++ openssl/demos/easy_tls/test.h	Wed Dec 23 18:27:34 2015
-@@ -1,5 +1,5 @@
- /* test.h */
--/* $Id: test.h,v 1.1.1.1.76.1 2015-12-23 18:10:12 fdupont Exp $ */
-+/* $Id: test.h,v 1.2 2015-12-23 18:27:34 fdupont Exp $ */
- 
- void test_process_init(int fd, int client_p, void *apparg);
- #define TLS_APP_PROCESS_INIT test_process_init
-Index: openssl/engines/vendor_defns/hwcryptohook.h
-diff -u openssl/engines/vendor_defns/hwcryptohook.h:1.1.1.1.76.1 openssl/engines/vendor_defns/hwcryptohook.h:1.2
---- openssl/engines/vendor_defns/hwcryptohook.h:1.1.1.1.76.1	Wed Dec 23 18:10:24 2015
-+++ openssl/engines/vendor_defns/hwcryptohook.h	Wed Dec 23 18:27:40 2015
-@@ -65,7 +65,7 @@
-  * please contact nCipher.
-  *
-  *
-- * $Id: hwcryptohook.h,v 1.1.1.1.76.1 2015-12-23 18:10:24 fdupont Exp $
-+ * $Id: hwcryptohook.h,v 1.2 2015-12-23 18:27:40 fdupont Exp $
-  */
- 
- #ifndef HWCRYPTOHOOK_H
 Index: openssl/util/libeay.num
 diff -u openssl/util/libeay.num:1.8.2.1.4.1.2.1.4.1.6.1.4.1 openssl/util/libeay.num:1.14
 --- openssl/util/libeay.num:1.8.2.1.4.1.2.1.4.1.6.1.4.1	Wed Dec 23 18:10:38 2015