Skip to content

Commit 2fb036c

Browse files
authored
Merge pull request #2465 from mavlink/android-use-boringssl
Android use boringssl
2 parents abf0167 + 5d93383 commit 2fb036c

File tree

81 files changed

+203671
-153989
lines changed

Some content is hidden

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

81 files changed

+203671
-153989
lines changed

.github/workflows/main.yml

+5
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,11 @@ jobs:
110110
- uses: actions/checkout@v4
111111
with:
112112
submodules: recursive
113+
- name: Free Disk Space (Ubuntu)
114+
uses: jlumbroso/free-disk-space@main
115+
with:
116+
android: 'false'
117+
continue-on-error: true
113118
- uses: actions/cache@v4
114119
id: cache
115120
with:

src/mavsdk/core/curl_wrapper.cpp

+4
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ bool CurlWrapper::download_text(const std::string& url, std::string& content)
2929
curl_easy_setopt(curl.get(), CURLOPT_URL, url.c_str());
3030
curl_easy_setopt(curl.get(), CURLOPT_WRITEFUNCTION, write_callback);
3131
curl_easy_setopt(curl.get(), CURLOPT_WRITEDATA, &readBuffer);
32+
curl_easy_setopt(curl.get(), CURLOPT_SSL_VERIFYPEER, 1L);
33+
curl_easy_setopt(curl.get(), CURLOPT_FOLLOWLOCATION, 1L);
3234
res = curl_easy_perform(curl.get());
3335
content = readBuffer;
3436

@@ -108,6 +110,8 @@ bool CurlWrapper::download_file_to_path(
108110
curl_easy_setopt(curl.get(), CURLOPT_WRITEFUNCTION, NULL);
109111
curl_easy_setopt(curl.get(), CURLOPT_WRITEDATA, fp);
110112
curl_easy_setopt(curl.get(), CURLOPT_NOPROGRESS, 0L);
113+
curl_easy_setopt(curl.get(), CURLOPT_SSL_VERIFYPEER, 1L);
114+
curl_easy_setopt(curl.get(), CURLOPT_FOLLOWLOCATION, 1L);
111115
res = curl_easy_perform(curl.get());
112116
fclose(fp);
113117

src/mavsdk_server/src/generated/action/action.pb.cc

+5,836-3,630
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/mavsdk_server/src/generated/action/action.pb.h

+3,592-3,023
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/mavsdk_server/src/generated/action_server/action_server.pb.cc

+3,823-2,337
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/mavsdk_server/src/generated/action_server/action_server.pb.h

+2,329-1,973
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/mavsdk_server/src/generated/arm_authorizer_server/arm_authorizer_server.pb.cc

+1,004-668
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/mavsdk_server/src/generated/arm_authorizer_server/arm_authorizer_server.pb.h

+617-528
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/mavsdk_server/src/generated/calibration/calibration.pb.cc

+1,972-1,193
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/mavsdk_server/src/generated/calibration/calibration.pb.h

+1,246-1,078
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/mavsdk_server/src/generated/camera/camera.pb.cc

+11,392-7,601
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)