0
|
1 diff -urEb google-cloud-cpp-0.9.0.orig/google/cloud/storage/internal/curl_wrappers.h google-cloud-cpp-0.9.0/google/cloud/storage/internal/curl_wrappers.h
|
|
2 --- google-cloud-cpp-0.9.0.orig/google/cloud/storage/internal/curl_wrappers.h 2019-06-04 14:10:04.481406007 +0200
|
|
3 +++ google-cloud-cpp-0.9.0/google/cloud/storage/internal/curl_wrappers.h 2019-06-04 14:10:17.677405776 +0200
|
|
4 @@ -15,6 +15,8 @@
|
|
5 #ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_STORAGE_INTERNAL_CURL_WRAPPERS_H_
|
|
6 #define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_STORAGE_INTERNAL_CURL_WRAPPERS_H_
|
|
7
|
|
8 +#undef BUILDING_LIBCURL // Necessary for static linking against curl
|
|
9 +
|
|
10 #include "google/cloud/storage/internal/http_response.h"
|
|
11 #include "google/cloud/storage/version.h"
|
|
12 #include "google/cloud/storage/well_known_parameters.h"
|
|
13 diff -urEb google-cloud-cpp-0.9.0.orig/google/cloud/storage/internal/openssl_util.cc google-cloud-cpp-0.9.0/google/cloud/storage/internal/openssl_util.cc
|
|
14 --- google-cloud-cpp-0.9.0.orig/google/cloud/storage/internal/openssl_util.cc 2019-06-04 14:10:04.481406007 +0200
|
|
15 +++ google-cloud-cpp-0.9.0/google/cloud/storage/internal/openssl_util.cc 2019-06-04 14:12:44.469403209 +0200
|
|
16 @@ -141,7 +141,7 @@
|
|
17 }
|
|
18
|
|
19 std::unique_ptr<BIO, decltype(&BIO_free)> source(
|
|
20 - BIO_new_mem_buf(str.data(), static_cast<int>(str.size())), &BIO_free);
|
|
21 + BIO_new_mem_buf(const_cast<char*>(str.data()), static_cast<int>(str.size())), &BIO_free);
|
|
22 auto bio = PushBase64Transcoding(std::move(source));
|
|
23
|
|
24 // We could compute the exact buffer size by looking at the number of padding
|
|
25 @@ -205,7 +205,7 @@
|
|
26 }
|
|
27
|
|
28 auto pem_buffer = std::unique_ptr<BIO, decltype(&BIO_free)>(
|
|
29 - BIO_new_mem_buf(pem_contents.data(),
|
|
30 + BIO_new_mem_buf(const_cast<char*>(pem_contents.data()),
|
|
31 static_cast<int>(pem_contents.length())),
|
|
32 &BIO_free);
|
|
33 if (!pem_buffer) {
|