From 47ab617828d0fe080cc6bbe2c9b72dd575c5264f Mon Sep 17 00:00:00 2001 From: Jacob Su Date: Sun, 21 Apr 2024 17:03:18 +0800 Subject: [PATCH 1/2] issue #3967: support x509 certification chiain in single pem file. --- trunk/src/app/srs_app_conn.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/trunk/src/app/srs_app_conn.cpp b/trunk/src/app/srs_app_conn.cpp index ecbdb4b40c..7652be15b7 100644 --- a/trunk/src/app/srs_app_conn.cpp +++ b/trunk/src/app/srs_app_conn.cpp @@ -772,7 +772,7 @@ srs_error_t SrsSslConnection::handshake(string key_file, string crt_file) int r0, r1, size; // Setup the key and cert file for server. - if ((r0 = SSL_use_certificate_file(ssl, crt_file.c_str(), SSL_FILETYPE_PEM)) != 1) { + if ((r0 = SSL_use_certificate_chain_file(ssl, crt_file.c_str())) != 1) { return srs_error_new(ERROR_HTTPS_KEY_CRT, "use cert %s", crt_file.c_str()); } From 6f597f06e201fbeb7f22df288180934dff139384 Mon Sep 17 00:00:00 2001 From: winlin Date: Mon, 22 Apr 2024 08:55:37 +0800 Subject: [PATCH 2/2] Update release to v5.0.211 v6.0.122 --- trunk/doc/CHANGELOG.md | 2 ++ trunk/src/core/srs_core_version5.hpp | 2 +- trunk/src/core/srs_core_version6.hpp | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/trunk/doc/CHANGELOG.md b/trunk/doc/CHANGELOG.md index 116255185e..500af385f4 100644 --- a/trunk/doc/CHANGELOG.md +++ b/trunk/doc/CHANGELOG.md @@ -7,6 +7,7 @@ The changelog for SRS. ## SRS 6.0 Changelog +* v6.0, 2024-04-22, Merge [#4033](https://github.com/ossrs/srs/pull/4033): issue #3967: support x509 certification chiain in single pem file. v6.0.122 (#4033) * v6.0, 2024-03-26, Filter JSONP callback function name. v6.0.121 * v6.0, 2024-03-26, Merge [#3995](https://github.com/ossrs/srs/pull/3995): Build: Refine workflow for cygwin and remove scorecard. v6.0.120 (#3995) * v6.0, 2024-03-26, Merge [#4005](https://github.com/ossrs/srs/pull/4005): Build: Fix module failed for main_ingest_hls and mp4_parser. v6.0.119 (#4005) @@ -132,6 +133,7 @@ The changelog for SRS. ## SRS 5.0 Changelog +* v5.0, 2024-04-22, Merge [#4033](https://github.com/ossrs/srs/pull/4033): issue #3967: support x509 certification chiain in single pem file. v5.0.211 (#4033) * v5.0, 2024-03-26, Filter JSONP callback function name. v5.0.210 * v5.0, 2024-03-19, Merge [#3990](https://github.com/ossrs/srs/pull/3990): System: Disable feature that obtains versions and check features status. v5.0.209 (#3990) * v5.0, 2024-02-06, Merge [#3920](https://github.com/ossrs/srs/pull/3920): WHIP: Fix bug for converting WHIP to RTMP/HLS. v5.0.208 (#3920) diff --git a/trunk/src/core/srs_core_version5.hpp b/trunk/src/core/srs_core_version5.hpp index bbd2af29c9..9f30104b24 100644 --- a/trunk/src/core/srs_core_version5.hpp +++ b/trunk/src/core/srs_core_version5.hpp @@ -9,6 +9,6 @@ #define VERSION_MAJOR 5 #define VERSION_MINOR 0 -#define VERSION_REVISION 210 +#define VERSION_REVISION 211 #endif diff --git a/trunk/src/core/srs_core_version6.hpp b/trunk/src/core/srs_core_version6.hpp index e19b872bfe..c1e3072a3c 100644 --- a/trunk/src/core/srs_core_version6.hpp +++ b/trunk/src/core/srs_core_version6.hpp @@ -9,6 +9,6 @@ #define VERSION_MAJOR 6 #define VERSION_MINOR 0 -#define VERSION_REVISION 121 +#define VERSION_REVISION 122 #endif