Skip to content

Commit b401de3

Browse files
ldcsaaldcsaa
committed
20251015
1 parent 6c7a0e4 commit b401de3

File tree

132 files changed

+335
-184
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

132 files changed

+335
-184
lines changed

‎Linux/Change-APIs.txt‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,19 @@
11
# ======================================== #
2+
HP-Socket v6.0.7 API Update List:
3+
# ======================================== #
4+
--------------------
5+
1、Server:
6+
--------------------
7+
HP_Server_SetDualStack() (ADD)
8+
HP_Server_IsDualStack() (ADD)
9+
--------------------
10+
11+
2、UDP Node:
12+
--------------------
13+
HP_UdpNode_SetDualStack() (ADD)
14+
HP_UdpNode_IsDualStack() (ADD)
15+
16+
# ======================================== #
217
HP-Socket v6.0.1 API Update List:
318
# ======================================== #
419
--------------------

‎Linux/Change-Log.txt‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,16 @@
11
==========================================================================================
2+
v6.0.7 Update:
3+
==========================================================================================
4+
5+
> Major Upadate
6+
-----------------
7+
1. TcpServer/UdpServer/UdpNode add method SetDualStack() to setting whether use IPv4/IPv6 dual protocol stack.
8+
9+
> Third-party library Upadate
10+
-----------------
11+
1. openssl upgrade to version 3.0.18.
12+
13+
==========================================================================================
214
v6.0.6 Update:
315
==========================================================================================
416

‎Linux/dependent/android-ndk/arm64-v8a/include/openssl/opensslv.h‎

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* WARNING: do not edit!
33
* Generated by Makefile from include/openssl/opensslv.h.in
44
*
5-
* Copyright 1999-2020 The OpenSSL Project Authors. All Rights Reserved.
5+
* Copyright 1999-2025 The OpenSSL Project Authors. All Rights Reserved.
66
*
77
* Licensed under the Apache License 2.0 (the "License"). You may not use
88
* this file except in compliance with the License. You can obtain a copy
@@ -29,7 +29,7 @@ extern "C" {
2929
*/
3030
# define OPENSSL_VERSION_MAJOR 3
3131
# define OPENSSL_VERSION_MINOR 0
32-
# define OPENSSL_VERSION_PATCH 17
32+
# define OPENSSL_VERSION_PATCH 18
3333

3434
/*
3535
* Additional version information
@@ -74,33 +74,28 @@ extern "C" {
7474
* longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and
7575
* OPENSSL_VERSION_BUILD_METADATA_STR appended.
7676
*/
77-
# define OPENSSL_VERSION_STR "3.0.17"
78-
# define OPENSSL_FULL_VERSION_STR "3.0.17"
77+
# define OPENSSL_VERSION_STR "3.0.18"
78+
# define OPENSSL_FULL_VERSION_STR "3.0.18"
7979

8080
/*
8181
* SECTION 3: ADDITIONAL METADATA
8282
*
8383
* These strings are defined separately to allow them to be parsable.
8484
*/
85-
# define OPENSSL_RELEASE_DATE "1 Jul 2025"
85+
# define OPENSSL_RELEASE_DATE "30 Sep 2025"
8686

8787
/*
8888
* SECTION 4: BACKWARD COMPATIBILITY
8989
*/
9090

91-
# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.17 1 Jul 2025"
91+
# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.18 30 Sep 2025"
9292

93-
/* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */
94-
# ifdef OPENSSL_VERSION_PRE_RELEASE
95-
# define _OPENSSL_VERSION_PRE_RELEASE 0x0L
96-
# else
97-
# define _OPENSSL_VERSION_PRE_RELEASE 0xfL
98-
# endif
93+
/* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PP0L */
9994
# define OPENSSL_VERSION_NUMBER \
10095
( (OPENSSL_VERSION_MAJOR<<28) \
10196
|(OPENSSL_VERSION_MINOR<<20) \
10297
|(OPENSSL_VERSION_PATCH<<4) \
103-
|_OPENSSL_VERSION_PRE_RELEASE )
98+
|0x0L )
10499

105100
# ifdef __cplusplus
106101
}

‎Linux/dependent/android-ndk/arm64-v8a/include/openssl/pem.h‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
2+
* Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved.
33
*
44
* Licensed under the Apache License 2.0 (the "License"). You may not use
55
* this file except in compliance with the License. You can obtain a copy
@@ -54,6 +54,8 @@ extern "C" {
5454
# define PEM_STRING_ECPRIVATEKEY "EC PRIVATE KEY"
5555
# define PEM_STRING_PARAMETERS "PARAMETERS"
5656
# define PEM_STRING_CMS "CMS"
57+
# define PEM_STRING_SM2PRIVATEKEY "SM2 PRIVATE KEY"
58+
# define PEM_STRING_SM2PARAMETERS "SM2 PARAMETERS"
5759

5860
# define PEM_TYPE_ENCRYPTED 10
5961
# define PEM_TYPE_MIC_ONLY 20

‎Linux/dependent/android-ndk/arm64-v8a/lib/libcrypto.a‎

4.86 KB
Binary file not shown.

‎Linux/dependent/android-ndk/armeabi-v7a/include/openssl/opensslv.h‎

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* WARNING: do not edit!
33
* Generated by Makefile from include/openssl/opensslv.h.in
44
*
5-
* Copyright 1999-2020 The OpenSSL Project Authors. All Rights Reserved.
5+
* Copyright 1999-2025 The OpenSSL Project Authors. All Rights Reserved.
66
*
77
* Licensed under the Apache License 2.0 (the "License"). You may not use
88
* this file except in compliance with the License. You can obtain a copy
@@ -29,7 +29,7 @@ extern "C" {
2929
*/
3030
# define OPENSSL_VERSION_MAJOR 3
3131
# define OPENSSL_VERSION_MINOR 0
32-
# define OPENSSL_VERSION_PATCH 17
32+
# define OPENSSL_VERSION_PATCH 18
3333

3434
/*
3535
* Additional version information
@@ -74,33 +74,28 @@ extern "C" {
7474
* longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and
7575
* OPENSSL_VERSION_BUILD_METADATA_STR appended.
7676
*/
77-
# define OPENSSL_VERSION_STR "3.0.17"
78-
# define OPENSSL_FULL_VERSION_STR "3.0.17"
77+
# define OPENSSL_VERSION_STR "3.0.18"
78+
# define OPENSSL_FULL_VERSION_STR "3.0.18"
7979

8080
/*
8181
* SECTION 3: ADDITIONAL METADATA
8282
*
8383
* These strings are defined separately to allow them to be parsable.
8484
*/
85-
# define OPENSSL_RELEASE_DATE "1 Jul 2025"
85+
# define OPENSSL_RELEASE_DATE "30 Sep 2025"
8686

8787
/*
8888
* SECTION 4: BACKWARD COMPATIBILITY
8989
*/
9090

91-
# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.17 1 Jul 2025"
91+
# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.18 30 Sep 2025"
9292

93-
/* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */
94-
# ifdef OPENSSL_VERSION_PRE_RELEASE
95-
# define _OPENSSL_VERSION_PRE_RELEASE 0x0L
96-
# else
97-
# define _OPENSSL_VERSION_PRE_RELEASE 0xfL
98-
# endif
93+
/* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PP0L */
9994
# define OPENSSL_VERSION_NUMBER \
10095
( (OPENSSL_VERSION_MAJOR<<28) \
10196
|(OPENSSL_VERSION_MINOR<<20) \
10297
|(OPENSSL_VERSION_PATCH<<4) \
103-
|_OPENSSL_VERSION_PRE_RELEASE )
98+
|0x0L )
10499

105100
# ifdef __cplusplus
106101
}

‎Linux/dependent/android-ndk/armeabi-v7a/include/openssl/pem.h‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
2+
* Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved.
33
*
44
* Licensed under the Apache License 2.0 (the "License"). You may not use
55
* this file except in compliance with the License. You can obtain a copy
@@ -54,6 +54,8 @@ extern "C" {
5454
# define PEM_STRING_ECPRIVATEKEY "EC PRIVATE KEY"
5555
# define PEM_STRING_PARAMETERS "PARAMETERS"
5656
# define PEM_STRING_CMS "CMS"
57+
# define PEM_STRING_SM2PRIVATEKEY "SM2 PRIVATE KEY"
58+
# define PEM_STRING_SM2PARAMETERS "SM2 PARAMETERS"
5759

5860
# define PEM_TYPE_ENCRYPTED 10
5961
# define PEM_TYPE_MIC_ONLY 20

‎Linux/dependent/android-ndk/armeabi-v7a/lib/libcrypto.a‎

3.53 KB
Binary file not shown.

‎Linux/dependent/android-ndk/x86/include/openssl/opensslv.h‎

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* WARNING: do not edit!
33
* Generated by Makefile from include/openssl/opensslv.h.in
44
*
5-
* Copyright 1999-2020 The OpenSSL Project Authors. All Rights Reserved.
5+
* Copyright 1999-2025 The OpenSSL Project Authors. All Rights Reserved.
66
*
77
* Licensed under the Apache License 2.0 (the "License"). You may not use
88
* this file except in compliance with the License. You can obtain a copy
@@ -29,7 +29,7 @@ extern "C" {
2929
*/
3030
# define OPENSSL_VERSION_MAJOR 3
3131
# define OPENSSL_VERSION_MINOR 0
32-
# define OPENSSL_VERSION_PATCH 17
32+
# define OPENSSL_VERSION_PATCH 18
3333

3434
/*
3535
* Additional version information
@@ -74,33 +74,28 @@ extern "C" {
7474
* longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and
7575
* OPENSSL_VERSION_BUILD_METADATA_STR appended.
7676
*/
77-
# define OPENSSL_VERSION_STR "3.0.17"
78-
# define OPENSSL_FULL_VERSION_STR "3.0.17"
77+
# define OPENSSL_VERSION_STR "3.0.18"
78+
# define OPENSSL_FULL_VERSION_STR "3.0.18"
7979

8080
/*
8181
* SECTION 3: ADDITIONAL METADATA
8282
*
8383
* These strings are defined separately to allow them to be parsable.
8484
*/
85-
# define OPENSSL_RELEASE_DATE "1 Jul 2025"
85+
# define OPENSSL_RELEASE_DATE "30 Sep 2025"
8686

8787
/*
8888
* SECTION 4: BACKWARD COMPATIBILITY
8989
*/
9090

91-
# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.17 1 Jul 2025"
91+
# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.18 30 Sep 2025"
9292

93-
/* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */
94-
# ifdef OPENSSL_VERSION_PRE_RELEASE
95-
# define _OPENSSL_VERSION_PRE_RELEASE 0x0L
96-
# else
97-
# define _OPENSSL_VERSION_PRE_RELEASE 0xfL
98-
# endif
93+
/* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PP0L */
9994
# define OPENSSL_VERSION_NUMBER \
10095
( (OPENSSL_VERSION_MAJOR<<28) \
10196
|(OPENSSL_VERSION_MINOR<<20) \
10297
|(OPENSSL_VERSION_PATCH<<4) \
103-
|_OPENSSL_VERSION_PRE_RELEASE )
98+
|0x0L )
10499

105100
# ifdef __cplusplus
106101
}

‎Linux/dependent/android-ndk/x86/include/openssl/pem.h‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
2+
* Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved.
33
*
44
* Licensed under the Apache License 2.0 (the "License"). You may not use
55
* this file except in compliance with the License. You can obtain a copy
@@ -54,6 +54,8 @@ extern "C" {
5454
# define PEM_STRING_ECPRIVATEKEY "EC PRIVATE KEY"
5555
# define PEM_STRING_PARAMETERS "PARAMETERS"
5656
# define PEM_STRING_CMS "CMS"
57+
# define PEM_STRING_SM2PRIVATEKEY "SM2 PRIVATE KEY"
58+
# define PEM_STRING_SM2PARAMETERS "SM2 PARAMETERS"
5759

5860
# define PEM_TYPE_ENCRYPTED 10
5961
# define PEM_TYPE_MIC_ONLY 20

0 commit comments

Comments
 (0)