Bump github.com/microsoft/vcpkg from master to 2025.08.27 (#6726)

* Bump github.com/microsoft/vcpkg from master to 2025.08.27

Bumps [github.com/microsoft/vcpkg](https://github.com/microsoft/vcpkg) from master to 2025.08.27. This release includes the previously tagged commit.
- [Release notes](https://github.com/microsoft/vcpkg/releases)
- [Commits](ef7dbf94b9...120deac306)

---
updated-dependencies:
- dependency-name: github.com/microsoft/vcpkg
  dependency-version: 2025.08.27
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

* Update corresponding files

* Stop using deprecated members from libxml2

* Clang-format

* Update use of opentelemetry deprecated include file

* Clang-format

* Another Opentelemetry breaking change

* Add include file

* NO_LINKER_OVERRIDE

* -framework Security on macOS

* Disable CurlTransportOptions.setCADirectory test on Mac

* disable -Wold-style-cast from external sources on mac

* Wrap all openssl includes to ignore -Wold-style-cast for clang

* Update cspell

* Wrap all usages of BIO_get_mem_data() macro to ignore -Wold-style-cast for clang

* Clang-format

* Clang-format

* Clang-format

* Wrap all usages of BIO_flush() macro to ignore -Wold-style-cast for clang

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Anton Kolesnyk <antkmsft@users.noreply.github.com>
This commit is contained in:
dependabot[bot] 2025-09-09 16:59:00 -07:00 committed by GitHub
parent 848a98da8e
commit fac93b7d35
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
20 changed files with 209 additions and 29 deletions

View File

@ -18,7 +18,7 @@ macro(az_vcpkg_integrate)
message("AZURE_SDK_DISABLE_AUTO_VCPKG is not defined. Fetch a local copy of vcpkg.")
# GET VCPKG FROM SOURCE
# User can set env var AZURE_SDK_VCPKG_COMMIT to pick the VCPKG commit to fetch
set(VCPKG_COMMIT_STRING ef7dbf94b9198bc58f45951adcf1f041fcbc5ea0) # default SDK tested commit
set(VCPKG_COMMIT_STRING 120deac3062162151622ca4860575a33844ba10b) # default SDK tested commit
if(DEFINED ENV{AZURE_SDK_VCPKG_COMMIT})
message("AZURE_SDK_VCPKG_COMMIT is defined. Using that instead of the default.")
set(VCPKG_COMMIT_STRING "$ENV{AZURE_SDK_VCPKG_COMMIT}") # default SDK tested commit

View File

@ -11,6 +11,7 @@
],
"words": [
"ECDS",
"Ecds",
"jwks",
"jwk",
"mrenclave",

View File

@ -13,11 +13,18 @@
#include <utility>
#include <vector>
#if defined(__clang__)
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wold-style-cast"
#endif // __clang__
#include <openssl/bio.h>
#include <openssl/err.h>
#include <openssl/evp.h>
#include <openssl/pem.h>
#include <openssl/x509.h>
#if defined(__clang__)
#pragma clang diagnostic pop
#endif // __clang__
/**
* @brief The Cryptography class provides a set of basic cryptographic primatives required
* by the attestation samples.
@ -84,7 +91,16 @@ std::string GetOpenSSLError(std::string const& what)
}
uint8_t* bioData;
#if defined(__clang__)
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wold-style-cast"
#endif // __clang__
long bufferSize = BIO_get_mem_data(bio.get(), &bioData);
#if defined(__clang__)
#pragma clang diagnostic pop
#endif // __clang__
std::string returnValue;
returnValue.resize(bufferSize);
memcpy(&returnValue[0], bioData, bufferSize);
@ -140,7 +156,16 @@ public:
// Now extract the data from the BIO and return it as a string.
uint8_t* base64data;
#if defined(__clang__)
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wold-style-cast"
#endif // __clang__
long bufferSize = BIO_get_mem_data(bio.get(), &base64data);
#if defined(__clang__)
#pragma clang diagnostic pop
#endif // __clang__
std::string returnValue;
returnValue.resize(bufferSize);
memcpy(&returnValue[0], base64data, bufferSize);

View File

@ -7,8 +7,15 @@
#include <type_traits>
#include <utility>
#if defined(__clang__)
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wold-style-cast"
#endif // __clang__
#include <openssl/bio.h>
#include <openssl/evp.h>
#if defined(__clang__)
#pragma clang diagnostic pop
#endif // __clang__
namespace Azure { namespace Security { namespace Attestation { namespace _detail {

View File

@ -24,6 +24,10 @@
#include <utility>
#include <vector>
#if defined(__clang__)
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wold-style-cast"
#endif // __clang__
#include <openssl/asn1.h>
#include <openssl/bio.h>
#include <openssl/ecdsa.h>
@ -32,6 +36,9 @@
#include <openssl/pem.h>
#include <openssl/rsa.h>
#include <openssl/x509v3.h>
#if defined(__clang__)
#pragma clang diagnostic pop
#endif // __clang__
// cspell: words OpenSSL X509 OpenSSLX509 keyid
@ -63,7 +70,16 @@ namespace Azure { namespace Security { namespace Attestation { namespace _detail
// Now extract the data from the BIO and return it as a string.
uint8_t* base64data;
#if defined(__clang__)
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wold-style-cast"
#endif // __clang__
long bufferSize = BIO_get_mem_data(bio.get(), &base64data);
#if defined(__clang__)
#pragma clang diagnostic pop
#endif // __clang__
std::string returnValue;
returnValue.resize(bufferSize);
memcpy(&returnValue[0], base64data, bufferSize);
@ -87,17 +103,34 @@ namespace Azure { namespace Security { namespace Attestation { namespace _detail
{
throw OpenSSLException("i2d_X509_bio");
}
#if defined(__clang__)
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wold-style-cast"
#endif // __clang__
if (BIO_flush(base64bio.get()) != 1)
{
throw OpenSSLException("BIO_flush");
}
#if defined(__clang__)
#pragma clang diagnostic pop
#endif // __clang__
// Now that we've written to the underlying bio, pop it back
// to the bio local so we can retrieve the base64 data which was written.
bio.reset(BIO_pop(base64bio.get()));
uint8_t* base64data;
#if defined(__clang__)
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wold-style-cast"
#endif // __clang__
long bufferSize = BIO_get_mem_data(bio.get(), &base64data);
#if defined(__clang__)
#pragma clang diagnostic pop
#endif // __clang__
std::string returnValue;
returnValue.resize(bufferSize);
memcpy(&returnValue[0], base64data, bufferSize);

View File

@ -21,11 +21,18 @@
#include <utility>
#include <vector>
#if defined(__clang__)
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wold-style-cast"
#endif // __clang__
#include <openssl/bio.h>
#include <openssl/evp.h>
#include <openssl/pem.h>
#include <openssl/rsa.h>
#include <openssl/x509.h>
#if defined(__clang__)
#pragma clang diagnostic pop
#endif // __clang__
// cspell::words OpenSSL X509 OpenSSLX509
@ -88,7 +95,16 @@ namespace Azure { namespace Security { namespace Attestation { namespace _detail
// Now extract the data from the BIO and return it as a string.
uint8_t* base64data;
#if defined(__clang__)
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wold-style-cast"
#endif // __clang__
long bufferSize = BIO_get_mem_data(bio.get(), &base64data);
#if defined(__clang__)
#pragma clang diagnostic pop
#endif // __clang__
std::string returnValue;
returnValue.resize(bufferSize);
memcpy(&returnValue[0], base64data, bufferSize);

View File

@ -23,12 +23,19 @@
#include <utility>
#include <vector>
#if defined(__clang__)
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wold-style-cast"
#endif // __clang__
#include <openssl/bio.h>
#include <openssl/ecdsa.h>
#include <openssl/err.h>
#include <openssl/evp.h>
#include <openssl/pem.h>
#include <openssl/rsa.h>
#if defined(__clang__)
#pragma clang diagnostic pop
#endif // __clang__
namespace Azure { namespace Security { namespace Attestation { namespace _detail {
@ -52,7 +59,16 @@ namespace Azure { namespace Security { namespace Attestation { namespace _detail
}
// Now extract the data from the BIO and return it as a string.
uint8_t* base64data;
#if defined(__clang__)
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wold-style-cast"
#endif // __clang__
long bufferSize = BIO_get_mem_data(bio.get(), &base64data);
#if defined(__clang__)
#pragma clang diagnostic pop
#endif // __clang__
std::string returnValue;
returnValue.resize(bufferSize);
memcpy(&returnValue[0], base64data, bufferSize);
@ -68,7 +84,16 @@ namespace Azure { namespace Security { namespace Attestation { namespace _detail
}
// Now extract the data from the BIO and return it as a string.
uint8_t* base64data;
#if defined(__clang__)
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wold-style-cast"
#endif // __clang__
long bufferSize = BIO_get_mem_data(bio.get(), &base64data);
#if defined(__clang__)
#pragma clang diagnostic pop
#endif // __clang__
std::string returnValue;
returnValue.resize(bufferSize);
memcpy(&returnValue[0], base64data, bufferSize);
@ -249,7 +274,16 @@ namespace Azure { namespace Security { namespace Attestation { namespace _detail
}
uint8_t* bioData;
#if defined(__clang__)
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wold-style-cast"
#endif // __clang__
long bufferSize = BIO_get_mem_data(bio.get(), &bioData);
#if defined(__clang__)
#pragma clang diagnostic pop
#endif // __clang__
std::string returnValue;
returnValue.resize(bufferSize);
memcpy(&returnValue[0], bioData, bufferSize);

View File

@ -19,10 +19,17 @@
#include <utility>
#include <vector>
#if defined(__clang__)
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wold-style-cast"
#endif // __clang__
#include <openssl/bio.h>
#include <openssl/evp.h>
#include <openssl/pem.h>
#include <openssl/rsa.h>
#if defined(__clang__)
#pragma clang diagnostic pop
#endif // __clang__
namespace Azure { namespace Security { namespace Attestation { namespace _detail {

View File

@ -110,29 +110,28 @@ if (USE_RUST_AMQP)
)
FetchContent_MakeAvailable(Corrosion)
if (NOT APPLE)
if(LINUX OR UNIX)
message(STATUS "Adding OpenSSL to target link libraries")
include(FindOpenSSL)
if (NOT APPLE)
if(LINUX OR UNIX)
message(STATUS "Adding OpenSSL to target link libraries")
include(FindOpenSSL)
get_cmake_property(_variableNames VARIABLES)
foreach (_variableName ${_variableNames})
if (${_variableName} MATCHES "OPENSSL")
message(STATUS "Found variable: ${_variableName} = ${${_variableName}}")
endif()
endforeach()
get_cmake_property(_variableNames VARIABLES)
foreach (_variableName ${_variableNames})
if (${_variableName} MATCHES "OPENSSL")
message(STATUS "Found variable: ${_variableName} = ${${_variableName}}")
endif()
endforeach()
message(STATUS "OPENSSL_FOUND: ${OPENSSL_FOUND}")
message(STATUS "OPENSSL_INCLUDE_DIR: ${OPENSSL_INCLUDE_DIR}")
message(STATUS "OPENSSL_LIBRARIES: ${OPENSSL_LIBRARIES}")
message(STATUS "OPENSSL_CRYPTO_LIBRARY: ${OPENSSL_CRYPTO_LIBRARY}")
message(STATUS "OPENSSL_SSL_LIBRARY: ${OPENSSL_SSL_LIBRARY}")
message(STATUS "OPENSSL_DIR: ${OPENSSL_DIR}")
message(STATUS "OPENSSL_ROOT_DIR: ${OPENSSL_ROOT_DIR}")
message(STATUS "OPENSSL_VERSION: ${OPENSSL_VERSION}")
message(STATUS "OPENSSL_VERSION_STRING: ${OPENSSL_VERSION_STRING}")
endif()
message(STATUS "OPENSSL_FOUND: ${OPENSSL_FOUND}")
message(STATUS "OPENSSL_INCLUDE_DIR: ${OPENSSL_INCLUDE_DIR}")
message(STATUS "OPENSSL_LIBRARIES: ${OPENSSL_LIBRARIES}")
message(STATUS "OPENSSL_CRYPTO_LIBRARY: ${OPENSSL_CRYPTO_LIBRARY}")
message(STATUS "OPENSSL_SSL_LIBRARY: ${OPENSSL_SSL_LIBRARY}")
message(STATUS "OPENSSL_DIR: ${OPENSSL_DIR}")
message(STATUS "OPENSSL_ROOT_DIR: ${OPENSSL_ROOT_DIR}")
message(STATUS "OPENSSL_VERSION: ${OPENSSL_VERSION}")
message(STATUS "OPENSSL_VERSION_STRING: ${OPENSSL_VERSION_STRING}")
endif()
endif()
@ -333,7 +332,8 @@ elseif(USE_RUST_AMQP)
message(STATUS "Assuming Windows crypto libraries")
target_link_libraries(azure-core-amqp PRIVATE Secur32 ncrypt RuntimeObject)
elseif (APPLE)
message(STATUS "Skipping library setting on macOS")
message(STATUS "Assuming Security framework on macOS")
target_link_libraries(azure-core-amqp PRIVATE "-framework Security")
elseif(LINUX OR UNIX)
message(STATUS "Assuming Linux crypto libraries.")
target_link_libraries(azure-core-amqp PRIVATE ${OPENSSL_LIBRARIES})

View File

@ -13,7 +13,14 @@
#include <bcrypt.h>
#elif defined(AZ_PLATFORM_POSIX)
#if defined(__clang__)
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wold-style-cast"
#endif // __clang__
#include <openssl/evp.h>
#if defined(__clang__)
#pragma clang diagnostic pop
#endif // __clang__
#endif
#include <stdexcept>

View File

@ -12,7 +12,14 @@
#include <bcrypt.h>
#elif defined(AZ_PLATFORM_POSIX)
#if defined(__clang__)
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wold-style-cast"
#endif // __clang__
#include <openssl/evp.h>
#if defined(__clang__)
#pragma clang diagnostic pop
#endif // __clang__
#endif
#include "azure/core/internal/cryptography/sha_hash.hpp"

View File

@ -26,6 +26,10 @@
#include "curl_session_private.hpp"
#if defined(AZ_PLATFORM_POSIX)
#if defined(__clang__)
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wold-style-cast"
#endif // __clang__
#include <openssl/opensslv.h>
#if OPENSSL_VERSION_NUMBER < 0x30000000L
#define USE_OPENSSL_1
@ -47,6 +51,9 @@
#include <openssl/x509.h>
#include <openssl/x509_vfy.h>
#include <openssl/x509v3.h>
#if defined(__clang__)
#pragma clang diagnostic pop
#endif // __clang__
#endif // AZ_PLATFORM_POSIX
#if defined(AZ_PLATFORM_POSIX)
@ -1631,7 +1638,16 @@ namespace Azure { namespace Core {
}
uint8_t* bioData;
#if defined(__clang__)
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wold-style-cast"
#endif // __clang__
long bufferSize = BIO_get_mem_data(bio.get(), &bioData);
#if defined(__clang__)
#pragma clang diagnostic pop
#endif // __clang__
std::string returnValue;
returnValue.resize(bufferSize);
memcpy(&returnValue[0], bioData, bufferSize);

View File

@ -12,7 +12,14 @@
#if defined(BUILD_CURL_HTTP_TRANSPORT_ADAPTER)
#include "azure/core/http/curl_transport.hpp"
#if defined(AZ_PLATFORM_POSIX)
#if defined(__clang__)
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wold-style-cast"
#endif // __clang__
#include <openssl/x509.h>
#if defined(__clang__)
#pragma clang diagnostic pop
#endif // __clang__
#endif
#endif
@ -243,6 +250,7 @@ namespace Azure { namespace Core { namespace Test {
.ConnectionPoolIndex.clear());
}
#if !defined(AZ_PLATFORM_MAC)
TEST(CurlTransportOptions, setCADirectory)
{
Azure::Core::Http::CurlTransportOptions curlOptions;
@ -302,6 +310,7 @@ namespace Azure { namespace Core { namespace Test {
}
#endif
}
#endif // !defined(AZ_PLATFORM_MAC)
#if _azure_DISABLE_HTTP_BIN_TESTS
TEST(CurlConnectionPool, DISABLED_httpsDefault)

View File

@ -27,8 +27,8 @@
#include <opentelemetry/logs/provider.h>
#include <opentelemetry/sdk/logs/logger.h>
#include <opentelemetry/sdk/trace/tracer.h>
#include <opentelemetry/semconv/url_attributes.h>
#include <opentelemetry/trace/provider.h>
#include <opentelemetry/trace/semantic_conventions.h>
#if defined(_MSC_VER)
#pragma warning(pop)

View File

@ -9,6 +9,8 @@
#include <azure/identity/default_azure_credential.hpp>
#include <azure/identity/environment_credential.hpp>
#include <opentelemetry/semconv/exception_attributes.h>
using namespace Azure::Messaging::EventHubs;
namespace trace_sdk = opentelemetry::sdk::trace;
@ -225,7 +227,7 @@ BatchStressTest::SendMessages()
catch (std::exception const& ex)
{
GetTracer()->GetCurrentSpan()->AddEvent(
"Exception received", {{trace::SemanticConventions::kExceptionMessage, ex.what()}});
"Exception received", {{opentelemetry::semconv::exception::kExceptionMessage, ex.what()}});
std::cerr << "Exception " << ex.what();
throw;
}
@ -266,7 +268,7 @@ void BatchStressTest::ReceiveMessages(
catch (std::exception const& ex)
{
GetTracer()->GetCurrentSpan()->AddEvent(
"Exception received", {{trace::SemanticConventions::kExceptionMessage, ex.what()}});
"Exception received", {{opentelemetry::semconv::exception::kExceptionMessage, ex.what()}});
std::cerr << "Exception " << ex.what();
throw;
}

View File

@ -40,12 +40,19 @@
#if !defined(AZ_PLATFORM_WINDOWS) \
|| (defined(WINAPI_PARTITION_DESKTOP) && !WINAPI_PARTITION_DESKTOP)
#if defined(__clang__)
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wold-style-cast"
#endif // __clang__
#include <openssl/bio.h>
#include <openssl/evp.h>
#include <openssl/ossl_typ.h>
#include <openssl/pem.h>
#include <openssl/rsa.h>
#include <openssl/x509.h>
#if defined(__clang__)
#pragma clang diagnostic pop
#endif // __clang__
#endif
using Azure::Identity::ClientCertificateCredential;

View File

@ -14,11 +14,18 @@
#include <bcrypt.h>
#elif defined(AZ_PLATFORM_POSIX)
#if defined(__clang__)
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wold-style-cast"
#endif // __clang__
#include <openssl/bio.h>
#include <openssl/buffer.h>
#include <openssl/evp.h>
#include <openssl/hmac.h>
#include <openssl/sha.h>
#if defined(__clang__)
#pragma clang diagnostic pop
#endif // __clang__
#endif
#include "azure/storage/common/storage_common.hpp"

View File

@ -615,7 +615,8 @@ namespace Azure { namespace Storage { namespace _internal {
std::string XmlWriter::GetDocument()
{
return std::string(
reinterpret_cast<const char*>(m_context->buffer->content), m_context->buffer->use);
reinterpret_cast<const char*>(xmlBufferContent(m_context->buffer.get())),
xmlBufferLength(m_context->buffer.get()));
}
#endif

View File

@ -617,7 +617,8 @@ namespace Azure { namespace Data { namespace Tables { namespace _detail { namesp
{
auto context = static_cast<XmlWriterContext*>(m_context);
xmlBufferPtr buffer = context->buffer;
return std::string(reinterpret_cast<const char*>(buffer->content), buffer->use);
return std::string(
reinterpret_cast<const char*>(xmlBufferContent(buffer)), xmlBufferLength(buffer));
}
#endif

View File

@ -1,7 +1,7 @@
{
"name": "azure-sdk-for-cpp",
"version": "1.5.0",
"builtin-baseline": "ef7dbf94b9198bc58f45951adcf1f041fcbc5ea0",
"builtin-baseline": "120deac3062162151622ca4860575a33844ba10b",
"dependencies": [
{
"name": "curl"