Star48
460
代码
代码
Issues87
Pull Requests50
项目讨论
Wiki
分析
Star48
460
已合并
流媒体 6.0安规整改 #8366
zhangxin020423创建于 4月17日
流媒体 6.0安规整改 #8366
已合并
zhangxin020423创建于 4月17日
从zhangxin020423/multimedia_av_codec60.release0417合入到openharmony/multimedia_av_codecOpenHarmony-6.0-Release
共 19 个文件变更+40-8
Mbundle.json+2-1
@@ -89,7 +89,8 @@
89 "bundle_framework",89 "bundle_framework",
90 "openmax",90 "openmax",
91 "memory_utils",91 "memory_utils",
92- "config_policy"92+ "config_policy",
93+ "certificate_manager"
93 ],94 ],
94 "third_party": []95 "third_party": []
95 },96 },
Mservices/media_engine/plugins/source/http_source/download/network_client/BUILD.gn+1-0
@@ -55,6 +55,7 @@ ohos_static_library("http_curl_client") {
55 55 
56 external_deps = [56 external_deps = [
57 "c_utils:utils",57 "c_utils:utils",
58+ "certificate_manager:cert_manager_sdk",
58 "curl:curl_shared",59 "curl:curl_shared",
59 "hilog:libhilog",60 "hilog:libhilog",
60 "media_foundation:media_foundation",61 "media_foundation:media_foundation",
Mservices/media_engine/plugins/source/http_source/download/network_client/http_curl_client.cpp+6-7
@@ -23,6 +23,7 @@
23#include "securec.h"23#include "securec.h"
24#include "net_conn_client.h"24#include "net_conn_client.h"
25#include <fcntl.h>25#include <fcntl.h>
26+#include "cm_type.h"
26 27 
27namespace {28namespace {
28constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, LOG_DOMAIN_STREAM_SOURCE, "HiStreamer" };29constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, LOG_DOMAIN_STREAM_SOURCE, "HiStreamer" };
@@ -327,13 +328,9 @@ void HttpCurlClient::InitCurlEnvironment(const std::string& url, int32_t timeout
327{328{
328 curl_easy_setopt(easyHandle_, CURLOPT_URL, UrlParse(url).c_str());329 curl_easy_setopt(easyHandle_, CURLOPT_URL, UrlParse(url).c_str());
329 curl_easy_setopt(easyHandle_, CURLOPT_CONNECTTIMEOUT, 5); // 5330 curl_easy_setopt(easyHandle_, CURLOPT_CONNECTTIMEOUT, 5); // 5
330- curl_easy_setopt(easyHandle_, CURLOPT_SSL_VERIFYPEER, 0L);331+ curl_easy_setopt(easyHandle_, CURLOPT_SSL_VERIFYPEER, 1L);
331- curl_easy_setopt(easyHandle_, CURLOPT_SSL_VERIFYHOST, 0L);332+ curl_easy_setopt(easyHandle_, CURLOPT_SSL_VERIFYHOST, 2L);
332-#ifndef CA_DIR333+ curl_easy_setopt(easyHandle_, CURLOPT_CAPATH, CA_STORE_PATH_SYSTEM);
333- curl_easy_setopt(easyHandle_, CURLOPT_CAINFO, "/etc/ssl/certs/" "cacert.pem");
334-#else
335- curl_easy_setopt(easyHandle_, CURLOPT_CAINFO, CA_DIR "cacert.pem");
336-#endif
337 curl_easy_setopt(easyHandle_, CURLOPT_HTTPGET, 1L);334 curl_easy_setopt(easyHandle_, CURLOPT_HTTPGET, 1L);
338 curl_easy_setopt(easyHandle_, CURLOPT_FORBID_REUSE, 0L);335 curl_easy_setopt(easyHandle_, CURLOPT_FORBID_REUSE, 0L);
339 curl_easy_setopt(easyHandle_, CURLOPT_FOLLOWLOCATION, 1L);336 curl_easy_setopt(easyHandle_, CURLOPT_FOLLOWLOCATION, 1L);
@@ -346,6 +343,8 @@ void HttpCurlClient::InitCurlEnvironment(const std::string& url, int32_t timeout
346 int32_t timeout = timeoutMs > 0 ? timeoutMs / MILLS_TO_SECOND : DEFAULT_LOW_SPEED_TIME;343 int32_t timeout = timeoutMs > 0 ? timeoutMs / MILLS_TO_SECOND : DEFAULT_LOW_SPEED_TIME;
347 curl_easy_setopt(easyHandle_, CURLOPT_LOW_SPEED_LIMIT, DEFAULT_LOW_SPEED_LIMIT);344 curl_easy_setopt(easyHandle_, CURLOPT_LOW_SPEED_LIMIT, DEFAULT_LOW_SPEED_LIMIT);
348 curl_easy_setopt(easyHandle_, CURLOPT_LOW_SPEED_TIME, timeout);345 curl_easy_setopt(easyHandle_, CURLOPT_LOW_SPEED_TIME, timeout);
346+ curl_easy_setopt(easyHandle_, CURLOPT_PROTOCOLS, CURLPROTO_HTTP | CURLPROTO_HTTPS);
347+ curl_easy_setopt(easyHandle_, CURLOPT_REDIR_PROTOCOLS, CURLPROTO_HTTP | CURLPROTO_HTTPS);
349 InitCurProxy(url);348 InitCurProxy(url);
350}349}
351 350 
Mtest/unittest/dash_media_downloader_unittest/BUILD.gn+1-0
@@ -103,6 +103,7 @@ ohos_unittest("dash_media_downloader_unittest") {
103 103 
104 external_deps = [104 external_deps = [
105 "c_utils:utils",105 "c_utils:utils",
106+ "certificate_manager:cert_manager_sdk",
106 "curl:curl_shared",107 "curl:curl_shared",
107 "googletest:gmock",108 "googletest:gmock",
108 "graphic_surface:surface",109 "graphic_surface:surface",
Mtest/unittest/dash_mpd_downloader_unittest/BUILD.gn+1-0
@@ -103,6 +103,7 @@ ohos_unittest("dash_mpd_downloader_unittest") {
103 103 
104 external_deps = [104 external_deps = [
105 "c_utils:utils",105 "c_utils:utils",
106+ "certificate_manager:cert_manager_sdk",
106 "curl:curl_shared",107 "curl:curl_shared",
107 "googletest:gmock",108 "googletest:gmock",
108 "graphic_surface:surface",109 "graphic_surface:surface",
Mtest/unittest/dash_mpd_manager_unittest/BUILD.gn+1-0
@@ -101,6 +101,7 @@ ohos_unittest("dash_mpd_manager_unittest") {
101 101 
102 external_deps = [102 external_deps = [
103 "c_utils:utils",103 "c_utils:utils",
104+ "certificate_manager:cert_manager_sdk",
104 "curl:curl_shared",105 "curl:curl_shared",
105 "googletest:gmock",106 "googletest:gmock",
106 "graphic_surface:surface",107 "graphic_surface:surface",
Mtest/unittest/dash_mpd_node_unittest/BUILD.gn+1-0
@@ -104,6 +104,7 @@ ohos_unittest("dash_mpd_node_unittest") {
104 104 
105 external_deps = [105 external_deps = [
106 "c_utils:utils",106 "c_utils:utils",
107+ "certificate_manager:cert_manager_sdk",
107 "curl:curl_shared",108 "curl:curl_shared",
108 "graphic_surface:surface",109 "graphic_surface:surface",
109 "googletest:gmock",110 "googletest:gmock",
Mtest/unittest/dash_mpd_parser_unittest/BUILD.gn+1-0
@@ -106,6 +106,7 @@ ohos_unittest("dash_mpd_parser_unittest") {
106 106 
107 external_deps = [107 external_deps = [
108 "c_utils:utils",108 "c_utils:utils",
109+ "certificate_manager:cert_manager_sdk",
109 "curl:curl_shared",110 "curl:curl_shared",
110 "graphic_surface:surface",111 "graphic_surface:surface",
111 "googletest:gmock",112 "googletest:gmock",
Mtest/unittest/dash_mpd_util_unittest/BUILD.gn+1-0
@@ -104,6 +104,7 @@ ohos_unittest("dash_mpd_util_unittest") {
104 104 
105 external_deps = [105 external_deps = [
106 "c_utils:utils",106 "c_utils:utils",
107+ "certificate_manager:cert_manager_sdk",
107 "curl:curl_shared",108 "curl:curl_shared",
108 "graphic_surface:surface",109 "graphic_surface:surface",
109 "googletest:gmock",110 "googletest:gmock",
Mtest/unittest/dash_mult_seg_base_node_unittest/BUILD.gn+1-0
@@ -104,6 +104,7 @@ ohos_unittest("dash_mult_seg_base_node_unittest") {
104 104 
105 external_deps = [105 external_deps = [
106 "c_utils:utils",106 "c_utils:utils",
107+ "certificate_manager:cert_manager_sdk",
107 "curl:curl_shared",108 "curl:curl_shared",
108 "graphic_surface:surface",109 "graphic_surface:surface",
109 "googletest:gmock",110 "googletest:gmock",
Mtest/unittest/dash_period_manager_unittest/BUILD.gn+1-0
@@ -104,6 +104,7 @@ ohos_unittest("dash_period_manager_unit_test") {
104 104 
105 external_deps = [105 external_deps = [
106 "c_utils:utils",106 "c_utils:utils",
107+ "certificate_manager:cert_manager_sdk",
107 "curl:curl_shared",108 "curl:curl_shared",
108 "graphic_surface:surface",109 "graphic_surface:surface",
109 "hilog:libhilog",110 "hilog:libhilog",
Mtest/unittest/dash_period_node_unittest/BUILD.gn+1-0
@@ -100,6 +100,7 @@ ohos_unittest("dash_period_node_unittest") {
100 100 
101 external_deps = [101 external_deps = [
102 "c_utils:utils",102 "c_utils:utils",
103+ "certificate_manager:cert_manager_sdk",
103 "curl:curl_shared",104 "curl:curl_shared",
104 "googletest:gmock",105 "googletest:gmock",
105 "graphic_surface:surface",106 "graphic_surface:surface",
Mtest/unittest/dash_representation_manager_unittest/BUILD.gn+1-0
@@ -101,6 +101,7 @@ ohos_unittest("dash_representation_manager_unittest") {
101 101 
102 external_deps = [102 external_deps = [
103 "c_utils:utils",103 "c_utils:utils",
104+ "certificate_manager:cert_manager_sdk",
104 "curl:curl_shared",105 "curl:curl_shared",
105 "googletest:gmock",106 "googletest:gmock",
106 "graphic_surface:surface",107 "graphic_surface:surface",
Mtest/unittest/dash_seg_list_node_unittest/BUILD.gn+1-0
@@ -100,6 +100,7 @@ ohos_unittest("dash_seg_list_node_unittest") {
100 100 
101 external_deps = [101 external_deps = [
102 "c_utils:utils",102 "c_utils:utils",
103+ "certificate_manager:cert_manager_sdk",
103 "curl:curl_shared",104 "curl:curl_shared",
104 "googletest:gmock",105 "googletest:gmock",
105 "graphic_surface:surface",106 "graphic_surface:surface",
Mtest/unittest/dash_seg_template_node_unittest/BUILD.gn+1-0
@@ -100,6 +100,7 @@ ohos_unittest("dash_seg_template_node_unittest") {
100 100 
101 external_deps = [101 external_deps = [
102 "c_utils:utils",102 "c_utils:utils",
103+ "certificate_manager:cert_manager_sdk",
103 "curl:curl_shared",104 "curl:curl_shared",
104 "googletest:gmock",105 "googletest:gmock",
105 "graphic_surface:surface",106 "graphic_surface:surface",
Mtest/unittest/dash_test/BUILD.gn+8-0
@@ -102,6 +102,7 @@ ohos_unittest("dash_xml_unit_test") {
102 102 
103 external_deps = [103 external_deps = [
104 "c_utils:utils",104 "c_utils:utils",
105+ "certificate_manager:cert_manager_sdk",
105 "curl:curl_shared",106 "curl:curl_shared",
106 "graphic_surface:surface",107 "graphic_surface:surface",
107 "hilog:libhilog",108 "hilog:libhilog",
@@ -128,6 +129,7 @@ ohos_unittest("dash_mpd_parser_unit_test") {
128 129 
129 external_deps = [130 external_deps = [
130 "c_utils:utils",131 "c_utils:utils",
132+ "certificate_manager:cert_manager_sdk",
131 "curl:curl_shared",133 "curl:curl_shared",
132 "graphic_surface:surface",134 "graphic_surface:surface",
133 "hilog:libhilog",135 "hilog:libhilog",
@@ -154,6 +156,7 @@ ohos_unittest("dash_media_downloader_unit_test") {
154 156 
155 external_deps = [157 external_deps = [
156 "c_utils:utils",158 "c_utils:utils",
159+ "certificate_manager:cert_manager_sdk",
157 "curl:curl_shared",160 "curl:curl_shared",
158 "graphic_surface:surface",161 "graphic_surface:surface",
159 "hilog:libhilog",162 "hilog:libhilog",
@@ -183,6 +186,7 @@ ohos_unittest("dash_mpd_downloader_unit_test") {
183 186 
184 external_deps = [187 external_deps = [
185 "c_utils:utils",188 "c_utils:utils",
189+ "certificate_manager:cert_manager_sdk",
186 "curl:curl_shared",190 "curl:curl_shared",
187 "graphic_surface:surface",191 "graphic_surface:surface",
188 "hilog:libhilog",192 "hilog:libhilog",
@@ -212,6 +216,7 @@ ohos_unittest("dash_segment_downloader_unit_test") {
212 216 
213 external_deps = [217 external_deps = [
214 "c_utils:utils",218 "c_utils:utils",
219+ "certificate_manager:cert_manager_sdk",
215 "curl:curl_shared",220 "curl:curl_shared",
216 "graphic_surface:surface",221 "graphic_surface:surface",
217 "hilog:libhilog",222 "hilog:libhilog",
@@ -241,6 +246,7 @@ ohos_unittest("dash_adpt_set_manager_unit_test") {
241 246 
242 external_deps = [247 external_deps = [
243 "c_utils:utils",248 "c_utils:utils",
249+ "certificate_manager:cert_manager_sdk",
244 "curl:curl_shared",250 "curl:curl_shared",
245 "graphic_surface:surface",251 "graphic_surface:surface",
246 "hilog:libhilog",252 "hilog:libhilog",
@@ -275,6 +281,7 @@ ohos_unittest("histream_dash_mpd_parser_unittest") {
275 281 
276 external_deps = [282 external_deps = [
277 "c_utils:utils",283 "c_utils:utils",
284+ "certificate_manager:cert_manager_sdk",
278 "curl:curl_shared",285 "curl:curl_shared",
279 "graphic_surface:surface",286 "graphic_surface:surface",
280 "hilog:libhilog",287 "hilog:libhilog",
@@ -309,6 +316,7 @@ ohos_unittest("sidx_box_parser_unittest") {
309 316 
310 external_deps = [317 external_deps = [
311 "c_utils:utils",318 "c_utils:utils",
319+ "certificate_manager:cert_manager_sdk",
312 "curl:curl_shared",320 "curl:curl_shared",
313 "graphic_surface:surface",321 "graphic_surface:surface",
314 "hilog:libhilog",322 "hilog:libhilog",
Mtest/unittest/dash_unittest/BUILD.gn+1-0
@@ -104,6 +104,7 @@ ohos_unittest("dash_segment_downloader_unittest") {
104 104 
105 external_deps = [105 external_deps = [
106 "c_utils:utils",106 "c_utils:utils",
107+ "certificate_manager:cert_manager_sdk",
107 "curl:curl_shared",108 "curl:curl_shared",
108 "googletest:gmock",109 "googletest:gmock",
109 "graphic_surface:surface",110 "graphic_surface:surface",
Mtest/unittest/hls_test/BUILD.gn+4-0
@@ -91,6 +91,7 @@ ohos_unittest("hls_media_downloader_unit_test") {
91 91 
92 external_deps = [92 external_deps = [
93 "c_utils:utils",93 "c_utils:utils",
94+ "certificate_manager:cert_manager_sdk",
94 "curl:curl_shared",95 "curl:curl_shared",
95 "graphic_surface:surface",96 "graphic_surface:surface",
96 "hilog:libhilog",97 "hilog:libhilog",
@@ -120,6 +121,7 @@ ohos_unittest("hls_playlist_downloader_unit_test") {
120 121 
121 external_deps = [122 external_deps = [
122 "c_utils:utils",123 "c_utils:utils",
124+ "certificate_manager:cert_manager_sdk",
123 "curl:curl_shared",125 "curl:curl_shared",
124 "graphic_surface:surface",126 "graphic_surface:surface",
125 "hilog:libhilog",127 "hilog:libhilog",
@@ -149,6 +151,7 @@ ohos_unittest("hls_tags_unit_test") {
149 151 
150 external_deps = [152 external_deps = [
151 "c_utils:utils",153 "c_utils:utils",
154+ "certificate_manager:cert_manager_sdk",
152 "curl:curl_shared",155 "curl:curl_shared",
153 "graphic_surface:surface",156 "graphic_surface:surface",
154 "hilog:libhilog",157 "hilog:libhilog",
@@ -178,6 +181,7 @@ ohos_unittest("m3u8_unit_test") {
178 181 
179 external_deps = [182 external_deps = [
180 "c_utils:utils",183 "c_utils:utils",
184+ "certificate_manager:cert_manager_sdk",
181 "curl:curl_shared",185 "curl:curl_shared",
182 "graphic_surface:surface",186 "graphic_surface:surface",
183 "hilog:libhilog",187 "hilog:libhilog",
Mtest/unittest/http_source_test/BUILD.gn+6-0
@@ -120,6 +120,7 @@ ohos_unittest("http_media_downloader_unit_test") {
120 120 
121 external_deps = [121 external_deps = [
122 "c_utils:utils",122 "c_utils:utils",
123+ "certificate_manager:cert_manager_sdk",
123 "curl:curl_shared",124 "curl:curl_shared",
124 "graphic_surface:surface",125 "graphic_surface:surface",
125 "hilog:libhilog",126 "hilog:libhilog",
@@ -149,6 +150,7 @@ ohos_unittest("downloader_unit_test") {
149 150 
150 external_deps = [151 external_deps = [
151 "c_utils:utils",152 "c_utils:utils",
153+ "certificate_manager:cert_manager_sdk",
152 "curl:curl_shared",154 "curl:curl_shared",
153 "graphic_surface:surface",155 "graphic_surface:surface",
154 "hilog:libhilog",156 "hilog:libhilog",
@@ -178,6 +180,7 @@ ohos_unittest("http_source_plugin_unit_test") {
178 180 
179 external_deps = [181 external_deps = [
180 "c_utils:utils",182 "c_utils:utils",
183+ "certificate_manager:cert_manager_sdk",
181 "curl:curl_shared",184 "curl:curl_shared",
182 "graphic_surface:surface",185 "graphic_surface:surface",
183 "hilog:libhilog",186 "hilog:libhilog",
@@ -207,6 +210,7 @@ ohos_unittest("xml_parser_unittest") {
207 210 
208 external_deps = [211 external_deps = [
209 "c_utils:utils",212 "c_utils:utils",
213+ "certificate_manager:cert_manager_sdk",
210 "curl:curl_shared",214 "curl:curl_shared",
211 "graphic_surface:surface",215 "graphic_surface:surface",
212 "hilog:libhilog",216 "hilog:libhilog",
@@ -236,6 +240,7 @@ ohos_unittest("xml_element_unittest") {
236 240 
237 external_deps = [241 external_deps = [
238 "c_utils:utils",242 "c_utils:utils",
243+ "certificate_manager:cert_manager_sdk",
239 "curl:curl_shared",244 "curl:curl_shared",
240 "graphic_surface:surface",245 "graphic_surface:surface",
241 "hilog:libhilog",246 "hilog:libhilog",
@@ -265,6 +270,7 @@ ohos_unittest("http_source_plugin_unittest") {
265 270 
266 external_deps = [271 external_deps = [
267 "c_utils:utils",272 "c_utils:utils",
273+ "certificate_manager:cert_manager_sdk",
268 "curl:curl_shared",274 "curl:curl_shared",
269 "graphic_surface:surface",275 "graphic_surface:surface",
270 "hilog:libhilog",276 "hilog:libhilog",