From 299a542f10f1ed358d52a9113a55a25aa46ba945 Mon Sep 17 00:00:00 2001 From: Jacob Su Date: Mon, 22 Apr 2024 10:15:11 +0800 Subject: [PATCH] Support x509 certification chiain in single pem file. v5.0.211 (#4033) Fix #3967 There is an API `SSL_use_certificate_chain_file`, which can load the certification chain and also single certificate. --------- Co-authored-by: winlin --- trunk/doc/CHANGELOG.md | 1 + trunk/src/app/srs_app_conn.cpp | 2 +- trunk/src/core/srs_core_version5.hpp | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/trunk/doc/CHANGELOG.md b/trunk/doc/CHANGELOG.md index 62f182d7b..51472ba2e 100644 --- a/trunk/doc/CHANGELOG.md +++ b/trunk/doc/CHANGELOG.md @@ -7,6 +7,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/app/srs_app_conn.cpp b/trunk/src/app/srs_app_conn.cpp index 1543c6c5c..b897727ef 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()); } diff --git a/trunk/src/core/srs_core_version5.hpp b/trunk/src/core/srs_core_version5.hpp index bcea35f74..823100817 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