Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Android] Use Android SDK instead of OpenSSL where possible #43740

Merged
merged 23 commits into from
Nov 12, 2020
Merged

[Android] Use Android SDK instead of OpenSSL where possible #43740

Show file tree
Hide file tree
Changes from 22 commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
798813f
initial impl
EgorBo Oct 22, 2020
d8fc623
add more stuff
EgorBo Oct 22, 2020
3ebdfcd
tmp
EgorBo Oct 23, 2020
903ba35
implement async apis
EgorBo Oct 23, 2020
e22a5b8
Address feedback
EgorBo Nov 2, 2020
e73c298
Update System.Security.Cryptography.Algorithms.csproj
EgorBo Nov 2, 2020
211bde0
Refactoring
EgorBo Nov 2, 2020
45ea7f9
Introduce System.Security.Cryptography.Native.Android
EgorBo Nov 2, 2020
a6099f2
Update opensslshim.c
EgorBo Nov 2, 2020
4483fa7
Fix build
EgorBo Nov 2, 2020
19f1aba
Fix build
EgorBo Nov 2, 2020
a42371b
Add HMac
EgorBo Nov 2, 2020
699ee4e
Add stubs for AES/DES
EgorBo Nov 2, 2020
01c8964
Update CMakeLists.txt
EgorBo Nov 2, 2020
d9617a0
Implement AES
EgorBo Nov 2, 2020
85238f4
fix conflicts
EgorBo Nov 3, 2020
3a83a15
Fix crashes
EgorBo Nov 9, 2020
d3f93af
Clean up
EgorBo Nov 9, 2020
7824d05
Handle errors more gracefully
EgorBo Nov 10, 2020
40904dd
Merge branch 'master' of github.com:dotnet/runtime into droid-crypto
EgorBo Nov 10, 2020
7b6f02a
fix typo
EgorBo Nov 10, 2020
bf83fa2
restart CI
EgorBo Nov 11, 2020
653d9e2
Merge branch 'master' of github.com:dotnet/runtime into droid-crypto
EgorBo Nov 12, 2020
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
6 changes: 6 additions & 0 deletions src/libraries/Native/Unix/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,7 @@ elseif(CLR_CMAKE_TARGET_TVOS)
elseif(CLR_CMAKE_TARGET_ANDROID AND NOT CROSS_ROOTFS)
#add_subdirectory(System.Net.Security.Native) # TODO: reenable
if (NOT "$ENV{ANDROID_OPENSSL_AAR}" STREQUAL "")
set(PREFER_OPENSSL_ANDROID 1)
add_subdirectory(System.Security.Cryptography.Native)
endif()
else()
Expand All @@ -237,3 +238,8 @@ endif()
if(CLR_CMAKE_TARGET_OSX OR CLR_CMAKE_TARGET_IOS OR CLR_CMAKE_TARGET_TVOS)
add_subdirectory(System.Security.Cryptography.Native.Apple)
endif()

# if ANDROID_OPENSSL_AAR is not set - use Android Native Crypto (it's going to replace openssl eventually)
if(CLR_CMAKE_TARGET_ANDROID AND NOT PREFER_OPENSSL_ANDROID)
add_subdirectory(System.Security.Cryptography.Native.Android)
endif()
32 changes: 32 additions & 0 deletions src/libraries/Native/Unix/System.Security.Cryptography.Native.Android/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
project(System.Security.Cryptography.Native.Android C)

add_compile_options(-Wno-gnu-zero-variadic-macro-arguments)
add_compile_options(-Wno-unused-parameter)
add_compile_options(-Wno-unused-variable)

set(NATIVECRYPTO_SOURCES
android_security.c
)

add_library(System.Security.Cryptography.Native.Android
SHARED
${NATIVECRYPTO_SOURCES}
${VERSION_FILE_PATH}
)

add_library(System.Security.Cryptography.Native.Android-Static
STATIC
${NATIVECRYPTO_SOURCES}
)

set_target_properties(System.Security.Cryptography.Native.Android-Static PROPERTIES OUTPUT_NAME System.Security.Cryptography.Native.Android CLEAN_DIRECT_OUTPUT 1)

target_link_libraries(System.Security.Cryptography.Native.Android
-llog
)

# TODO: Use "System.Security.Cryptography.Native.Android" name (will require a lot of csproj changes here and there)
set_target_properties(System.Security.Cryptography.Native.Android PROPERTIES OUTPUT_NAME "System.Security.Cryptography.Native.OpenSsl")

install_with_stripped_symbols (System.Security.Cryptography.Native.Android PROGRAMS .)
install (TARGETS System.Security.Cryptography.Native.Android-Static DESTINATION .)
Loading