Skip to content
Merged
Show file tree
Hide file tree
Changes from 15 commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
7fe324a
perf test uuid
vhvb1989 Sep 3, 2021
7b19eb9
use win impl for uuid on linux
vhvb1989 Sep 3, 2021
91a40e5
use c99 base64 encode-decode
vhvb1989 Sep 4, 2021
91f05e4
make crypto optional
vhvb1989 Sep 7, 2021
3b2d411
Merge branch 'main' of github.com:Azure/azure-sdk-for-cpp into update…
vhvb1989 Sep 7, 2021
5f303ed
return empty vector for base64
vhvb1989 Sep 7, 2021
683bcdf
cl
vhvb1989 Sep 7, 2021
30d11df
cl
vhvb1989 Sep 7, 2021
5a5856d
win - compile - fixes
vhvb1989 Sep 7, 2021
7a99912
Merge branch 'main' of github.com:Azure/azure-sdk-for-cpp into update…
vhvb1989 Sep 8, 2021
a80be57
using 64-bit Mersenne Twister for rand gen
vhvb1989 Sep 9, 2021
35b79e9
comments
vhvb1989 Sep 9, 2021
f80b320
Merge branch 'update-uuid-without-openssl' of github.com:vhvb1989/azu…
vhvb1989 Sep 9, 2021
2d25f30
msvc compile fixes
vhvb1989 Sep 9, 2021
3291ce3
update
vhvb1989 Sep 9, 2021
fb2ba79
fix on cast
vhvb1989 Sep 9, 2021
a8a0703
Apply suggestions from code review
vhvb1989 Sep 27, 2021
53de278
Apply suggestions from code review
vhvb1989 Sep 27, 2021
70b5153
Merge branch 'main' of github.com:Azure/azure-sdk-for-cpp into update…
vhvb1989 Oct 25, 2021
d6642da
Merge branch 'update-uuid-without-openssl' of github.com:vhvb1989/azu…
vhvb1989 Oct 25, 2021
ffc484d
rever
vhvb1989 Oct 25, 2021
c03066e
rever
vhvb1989 Oct 25, 2021
3f8d987
update
vhvb1989 Oct 25, 2021
326b465
update
vhvb1989 Oct 25, 2021
71c2a30
update
vhvb1989 Oct 25, 2021
75e7020
update
vhvb1989 Oct 25, 2021
9864fd4
updates
vhvb1989 Oct 25, 2021
39b6342
avoid shrink
vhvb1989 Oct 27, 2021
77459a0
Merge branch 'main' of github.com:Azure/azure-sdk-for-cpp into update…
vhvb1989 Oct 27, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions sdk/core/azure-core/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@

### Other Changes

- Added option `BUILD_CRYPTO` to support building azure-core without the Cryptographic namespace (no hashing). ON by default.
- Updated `base64` implementation.
- Updated `Uuid` implementation for Linux.

## 1.2.1 (2021-09-02)

### Bugs Fixed
Expand Down
34 changes: 25 additions & 9 deletions sdk/core/azure-core/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@ az_vcpkg_integrate()

find_package(Threads REQUIRED)

# Allow building azure-core without OpenSSL dependency and hence without Crypto-functions
# This is a work-around for anyone consuming azure-core without a need for Crypto like the cognitive services.
option(BUILD_CRYPTO "Build the cryto namespace. Build will depend on OpenSSL." ON)

if(BUILD_TRANSPORT_CURL)
# min version for `CURLSSLOPT_NO_REVOKE`
# https://curl.haxx.se/libcurl/c/CURLOPT_SSL_OPTIONS.html
Expand All @@ -47,13 +51,25 @@ if(BUILD_TRANSPORT_WINHTTP)
SET(WIN_TRANSPORT_ADAPTER_INC inc/azure/core/http/win_http_transport.hpp)
endif()

if(BUILD_CRYPTO)
add_compile_definitions(AZURE_BUILD_CRYPTO)
SET(AZURE_SDK_CRYPTO_INC
inc/azure/core/cryptography/hash.hpp
inc/azure/core/internal/cryptography/sha_hash.hpp
)
SET(AZURE_SDK_CRYPTO_SRC
src/cryptography/md5.cpp
src/cryptography/sha_hash.cpp
)
endif()

set(
AZURE_CORE_HEADER
${CURL_TRANSPORT_ADAPTER_INC}
${WIN_TRANSPORT_ADAPTER_INC}
inc/azure/core/credentials/credentials.hpp
inc/azure/core/credentials/token_credential_options.hpp
inc/azure/core/cryptography/hash.hpp
${AZURE_SDK_CRYPTO_INC}
inc/azure/core/diagnostics/logger.hpp
inc/azure/core/http/http_status_code.hpp
inc/azure/core/http/http.hpp
Expand All @@ -62,7 +78,6 @@ set(
inc/azure/core/http/transport.hpp
inc/azure/core/internal/client_options.hpp
inc/azure/core/internal/contract.hpp
inc/azure/core/internal/cryptography/sha_hash.hpp
inc/azure/core/internal/diagnostics/log.hpp
inc/azure/core/internal/http/pipeline.hpp
inc/azure/core/internal/io/null_body_stream.hpp
Expand Down Expand Up @@ -96,8 +111,7 @@ set(
${CURL_TRANSPORT_ADAPTER_SRC}
${WIN_TRANSPORT_ADAPTER_SRC}
src/azure_assert.cpp
src/cryptography/md5.cpp
src/cryptography/sha_hash.cpp
${AZURE_SDK_CRYPTO_SRC}
src/http/bearer_token_authentication_policy.cpp
src/http/http.cpp
src/http/log_policy.cpp
Expand Down Expand Up @@ -140,11 +154,13 @@ create_code_coverage(core azure-core azure-core-test)

target_link_libraries(azure-core INTERFACE Threads::Threads)

if(WIN32)
target_link_libraries(azure-core PRIVATE bcrypt crypt32)
else()
find_package(OpenSSL REQUIRED)
target_link_libraries(azure-core PRIVATE OpenSSL::SSL)
if(BUILD_CRYPTO)
if(WIN32)
target_link_libraries(azure-core PRIVATE bcrypt crypt32)
else()
find_package(OpenSSL REQUIRED)
target_link_libraries(azure-core PRIVATE OpenSSL::SSL)
endif()
endif()

if(BUILD_TRANSPORT_CURL)
Expand Down
Loading