20220410

ldcsaa · Apr 10, 2022 · b91c62b · b91c62b
1 parent e36fbd4
commit b91c62b
Show file tree

Hide file tree

Showing 186 changed files with 1,765 additions and 945 deletions.
diff --git a/DotNet/README.md b/DotNet/README.md
@@ -7,6 +7,7 @@ the C# SDK for [HP-Socket](https://github.com/ldcsaa/HP-Socket)
 * `.Net Framework 2.0+`
 * `.Net Core 2.0+`
 * `.Net 5.0`
+* `.Net 6.0`
 
 #### Platform supported
 * `Windows 7+ x86/x64`
@@ -42,7 +43,7 @@ Basic component is the original component provided by HP-Socket. For related usa
 + `ITcpPullClient`
 + `ITcpPackServer`
 + `ITcpPackAgent`
-+ `ITcpPacClient`
++ `ITcpPackClient`
 
 ##### UDP
 + `IUdpServer`
@@ -436,4 +437,12 @@ namespace TcpServerTestEchoAdapter.DataReceiveAdapter
         }
     }
 }
-```
+```
+
+
+## Contribute
+
+1.  Fork this Repository
+2.  Create a new Feat_xxx branch
+3.  Submit code
+4.  Create a new Pull Request
diff --git a/DotNet/README_zh.md b/DotNet/README_zh.md
@@ -7,6 +7,7 @@ the C# SDK for [HP-Socket](https://github.com/ldcsaa/HP-Socket)
 * `.Net Framework 2.0+`
 * `.Net Core 2.0+`
 * `.Net 5.0`
+* `.Net 6.0`
 
 #### 平台支持
 * `Windows 7+ x86/x64`
@@ -42,7 +43,7 @@ Nuget软件包中的`libhpsocket4c.dylib`编译自`HP-Socket`的`macOS分支`[HP
 + `ITcpPullClient`
 + `ITcpPackServer`
 + `ITcpPackAgent`
-+ `ITcpPacClient`
++ `ITcpPackClient`
 
 ##### UDP
 + `IUdpServer`
@@ -438,4 +439,12 @@ namespace TcpServerTestEchoAdapter.DataReceiveAdapter
         }
     }
 }
-```
+```
+
+
+## 参与贡献
+
+1.  Fork 本仓库
+2.  新建 Feat_xxx 分支
+3.  提交代码
+4.  新建 Pull Request
diff --git a/Linux/Change-APIs.txt b/Linux/Change-APIs.txt
@@ -1,4 +1,17 @@
 # ======================================== #
+HP-Socket v5.8.8 API Update List:
+# ======================================== #
+--------------------
+1、Global:
+--------------------
+SYS_GbkToUnicodeEx							(ADD)
+SYS_UnicodeToGbkEx							(ADD)
+SYS_Utf8ToUnicodeEx							(ADD)
+SYS_UnicodeToUtf8Ex							(ADD)
+SYS_GbkToUtf8Ex								(ADD)
+SYS_Utf8ToGbkEx								(ADD)
+
+# ======================================== #
 HP-Socket v5.8.6 API Update List:
 # ======================================== #
 --------------------

diff --git a/Linux/Change-Log.txt b/Linux/Change-Log.txt
@@ -1,4 +1,19 @@
 ==========================================================================================
+v5.8.8 Update:
+==========================================================================================
+
+> Major Upadate
+-----------------
+1. Client/Agent components supports specifying host name when connecting to remote server. The format is: '< hostaddress >[^< hostname >]', where '^< hostname >' is optional. One of scenario: pass SSL SNI hostname to target server through proxy server.
+2. Add a series of character encoding conversion functions (Reference: Chang-log.txt), which supports specifying the length of the source string.
+3. Fix the abnormal problem of SSL Pull/Pack Server/Agent components in the scenario of manual start SSL: 'SetSSLAutoStart(FALSE)'.
+
+> Third-party library Upadate
+-----------------
+1. zlib upgrade to version 1.2.12.
+2. openssl upgrade to version 1.1.1n.
+
+==========================================================================================
 v5.8.7 Update:
 ==========================================================================================
 

diff --git a/Linux/dependent/android-ndk/arm64-v8a/include/openssl/engine.h b/Linux/dependent/android-ndk/arm64-v8a/include/openssl/engine.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2018 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2000-2022 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
@@ -722,6 +722,7 @@ typedef int (*dynamic_bind_engine) (ENGINE *e, const char *id,
             CRYPTO_set_mem_functions(fns->mem_fns.malloc_fn, \
                                      fns->mem_fns.realloc_fn, \
                                      fns->mem_fns.free_fn); \
+            OPENSSL_init_crypto(OPENSSL_INIT_NO_ATEXIT, NULL); \
         skip_cbs: \
             if (!fn(e, id)) return 0; \
             return 1; }

diff --git a/Linux/dependent/android-ndk/arm64-v8a/include/openssl/obj_mac.h b/Linux/dependent/android-ndk/arm64-v8a/include/openssl/obj_mac.h
@@ -2,7 +2,7 @@
  * WARNING: do not edit!
  * Generated by crypto/objects/objects.pl
  *
- * Copyright 2000-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2000-2022 The OpenSSL Project Authors. All Rights Reserved.
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
  * in the file LICENSE in the source distribution or at

diff --git a/Linux/dependent/android-ndk/arm64-v8a/include/openssl/opensslv.h b/Linux/dependent/android-ndk/arm64-v8a/include/openssl/opensslv.h
@@ -39,8 +39,8 @@ extern "C" {
  * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for
  *  major minor fix final patch/beta)
  */
-# define OPENSSL_VERSION_NUMBER  0x101010dfL
-# define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.1m  14 Dec 2021"
+# define OPENSSL_VERSION_NUMBER  0x101010efL
+# define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.1n  15 Mar 2022"
 
 /*-
  * The macros below are to be used for shared library (.so, .dll, ...)

diff --git a/Linux/dependent/android-ndk/arm64-v8a/lib/libcrypto.a b/Linux/dependent/android-ndk/arm64-v8a/lib/libcrypto.a
diff --git a/Linux/dependent/android-ndk/arm64-v8a/lib/libssl.a b/Linux/dependent/android-ndk/arm64-v8a/lib/libssl.a
diff --git a/Linux/dependent/android-ndk/armeabi-v7a/include/openssl/engine.h b/Linux/dependent/android-ndk/armeabi-v7a/include/openssl/engine.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2018 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2000-2022 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
@@ -722,6 +722,7 @@ typedef int (*dynamic_bind_engine) (ENGINE *e, const char *id,
             CRYPTO_set_mem_functions(fns->mem_fns.malloc_fn, \
                                      fns->mem_fns.realloc_fn, \
                                      fns->mem_fns.free_fn); \
+            OPENSSL_init_crypto(OPENSSL_INIT_NO_ATEXIT, NULL); \
         skip_cbs: \
             if (!fn(e, id)) return 0; \
             return 1; }

diff --git a/Linux/dependent/android-ndk/armeabi-v7a/include/openssl/obj_mac.h b/Linux/dependent/android-ndk/armeabi-v7a/include/openssl/obj_mac.h
@@ -2,7 +2,7 @@
  * WARNING: do not edit!
  * Generated by crypto/objects/objects.pl
  *
- * Copyright 2000-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2000-2022 The OpenSSL Project Authors. All Rights Reserved.
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
  * in the file LICENSE in the source distribution or at

diff --git a/Linux/dependent/android-ndk/armeabi-v7a/include/openssl/opensslv.h b/Linux/dependent/android-ndk/armeabi-v7a/include/openssl/opensslv.h
@@ -39,8 +39,8 @@ extern "C" {
  * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for
  *  major minor fix final patch/beta)
  */
-# define OPENSSL_VERSION_NUMBER  0x101010dfL
-# define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.1m  14 Dec 2021"
+# define OPENSSL_VERSION_NUMBER  0x101010efL
+# define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.1n  15 Mar 2022"
 
 /*-
  * The macros below are to be used for shared library (.so, .dll, ...)

diff --git a/Linux/dependent/android-ndk/armeabi-v7a/lib/libcrypto.a b/Linux/dependent/android-ndk/armeabi-v7a/lib/libcrypto.a
diff --git a/Linux/dependent/android-ndk/armeabi-v7a/lib/libssl.a b/Linux/dependent/android-ndk/armeabi-v7a/lib/libssl.a
diff --git a/Linux/dependent/android-ndk/x86/include/openssl/engine.h b/Linux/dependent/android-ndk/x86/include/openssl/engine.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2018 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2000-2022 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
@@ -722,6 +722,7 @@ typedef int (*dynamic_bind_engine) (ENGINE *e, const char *id,
             CRYPTO_set_mem_functions(fns->mem_fns.malloc_fn, \
                                      fns->mem_fns.realloc_fn, \
                                      fns->mem_fns.free_fn); \
+            OPENSSL_init_crypto(OPENSSL_INIT_NO_ATEXIT, NULL); \
         skip_cbs: \
             if (!fn(e, id)) return 0; \
             return 1; }

diff --git a/Linux/dependent/android-ndk/x86/include/openssl/obj_mac.h b/Linux/dependent/android-ndk/x86/include/openssl/obj_mac.h
@@ -2,7 +2,7 @@
  * WARNING: do not edit!
  * Generated by crypto/objects/objects.pl
  *
- * Copyright 2000-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2000-2022 The OpenSSL Project Authors. All Rights Reserved.
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
  * in the file LICENSE in the source distribution or at

diff --git a/Linux/dependent/android-ndk/x86/include/openssl/opensslv.h b/Linux/dependent/android-ndk/x86/include/openssl/opensslv.h
@@ -39,8 +39,8 @@ extern "C" {
  * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for
  *  major minor fix final patch/beta)
  */
-# define OPENSSL_VERSION_NUMBER  0x101010dfL
-# define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.1m  14 Dec 2021"
+# define OPENSSL_VERSION_NUMBER  0x101010efL
+# define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.1n  15 Mar 2022"
 
 /*-
  * The macros below are to be used for shared library (.so, .dll, ...)

diff --git a/Linux/dependent/android-ndk/x86/lib/libcrypto.a b/Linux/dependent/android-ndk/x86/lib/libcrypto.a
diff --git a/Linux/dependent/android-ndk/x86/lib/libssl.a b/Linux/dependent/android-ndk/x86/lib/libssl.a
diff --git a/Linux/dependent/android-ndk/x86_64/include/openssl/engine.h b/Linux/dependent/android-ndk/x86_64/include/openssl/engine.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2018 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2000-2022 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
@@ -722,6 +722,7 @@ typedef int (*dynamic_bind_engine) (ENGINE *e, const char *id,
             CRYPTO_set_mem_functions(fns->mem_fns.malloc_fn, \
                                      fns->mem_fns.realloc_fn, \
                                      fns->mem_fns.free_fn); \
+            OPENSSL_init_crypto(OPENSSL_INIT_NO_ATEXIT, NULL); \
         skip_cbs: \
             if (!fn(e, id)) return 0; \
             return 1; }

diff --git a/Linux/dependent/android-ndk/x86_64/include/openssl/obj_mac.h b/Linux/dependent/android-ndk/x86_64/include/openssl/obj_mac.h
@@ -2,7 +2,7 @@
  * WARNING: do not edit!
  * Generated by crypto/objects/objects.pl
  *
- * Copyright 2000-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2000-2022 The OpenSSL Project Authors. All Rights Reserved.
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
  * in the file LICENSE in the source distribution or at

diff --git a/Linux/dependent/android-ndk/x86_64/include/openssl/opensslv.h b/Linux/dependent/android-ndk/x86_64/include/openssl/opensslv.h
@@ -39,8 +39,8 @@ extern "C" {
  * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for
  *  major minor fix final patch/beta)
  */
-# define OPENSSL_VERSION_NUMBER  0x101010dfL
-# define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.1m  14 Dec 2021"
+# define OPENSSL_VERSION_NUMBER  0x101010efL
+# define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.1n  15 Mar 2022"
 
 /*-
  * The macros below are to be used for shared library (.so, .dll, ...)

diff --git a/Linux/dependent/android-ndk/x86_64/lib/libcrypto.a b/Linux/dependent/android-ndk/x86_64/lib/libcrypto.a
diff --git a/Linux/dependent/android-ndk/x86_64/lib/libssl.a b/Linux/dependent/android-ndk/x86_64/lib/libssl.a
diff --git a/Linux/dependent/arm/lib/libjemalloc_pic.a b/Linux/dependent/arm/lib/libjemalloc_pic.a
diff --git a/Linux/dependent/arm64/lib/libjemalloc_pic.a b/Linux/dependent/arm64/lib/libjemalloc_pic.a
diff --git a/Linux/dependent/x64/include/openssl/engine.h b/Linux/dependent/x64/include/openssl/engine.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2018 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2000-2022 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
@@ -722,6 +722,7 @@ typedef int (*dynamic_bind_engine) (ENGINE *e, const char *id,
             CRYPTO_set_mem_functions(fns->mem_fns.malloc_fn, \
                                      fns->mem_fns.realloc_fn, \
                                      fns->mem_fns.free_fn); \
+            OPENSSL_init_crypto(OPENSSL_INIT_NO_ATEXIT, NULL); \
         skip_cbs: \
             if (!fn(e, id)) return 0; \
             return 1; }

diff --git a/Linux/dependent/x64/include/openssl/obj_mac.h b/Linux/dependent/x64/include/openssl/obj_mac.h
@@ -2,7 +2,7 @@
  * WARNING: do not edit!
  * Generated by crypto/objects/objects.pl
  *
- * Copyright 2000-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2000-2022 The OpenSSL Project Authors. All Rights Reserved.
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
  * in the file LICENSE in the source distribution or at

diff --git a/Linux/dependent/x64/include/openssl/opensslv.h b/Linux/dependent/x64/include/openssl/opensslv.h
@@ -39,8 +39,8 @@ extern "C" {
  * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for
  *  major minor fix final patch/beta)
  */
-# define OPENSSL_VERSION_NUMBER  0x101010dfL
-# define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.1m  14 Dec 2021"
+# define OPENSSL_VERSION_NUMBER  0x101010efL
+# define OPENSSL_VERSION_TEXT    "OpenSSL 1.1.1n  15 Mar 2022"
 
 /*-
  * The macros below are to be used for shared library (.so, .dll, ...)