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.

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

Adding Android Keystore Provider and Keyhandle by Team Netwatch (B) #5

Merged
merged 24 commits into from
Jun 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
7433ac0
feat: added internal work to fork
mark-beck May 27, 2024
87a6820
fix: added missing changes
mark-beck May 27, 2024
7706e0f
feat: implemented config
mark-beck May 27, 2024
46e7a95
fix: added lib cratetype
mark-beck May 27, 2024
9a2314b
fix: AndroidConfig has to be public
mark-beck May 27, 2024
f02d33f
fix: missing match in instance
mark-beck May 27, 2024
5d8fc21
fix: don't load java vm in initialize_module, as it will be called be…
mark-beck May 27, 2024
5f207d9
feat: added default logging implementation for android
mark-beck May 27, 2024
29ffdf2
feat: implemented symmetric algorithm for encryption, *not tested
markoisus May 27, 2024
ae1b69d
Merge branch 'main' of https://github.com/cep-sose2024/rust-crypto-ne…
markoisus May 27, 2024
9ceffcd
fix: change traits to use Box<dyn Any>
mark-beck May 27, 2024
03c9cc9
test(mod.rs): adding the tests again
DexterHK May 28, 2024
4d1ca53
feat: Add set_key_size and set_algorithm_parameter_spec methods to Bu…
markoisus May 28, 2024
0640fcc
fix: Update set_algorithm_parameter_spec method in Builder
markoisus May 28, 2024
788c40c
feat: docs for set_block_modes, set_key_size and set_algorithm_parame…
markoisus May 28, 2024
d540d05
fix: builder methods using wrong parameters
DexterHK May 28, 2024
c7b9ace
Merge branch 'main' of https://github.com/cep-sose2024/rust-crypto-ne…
DexterHK May 28, 2024
8b91d81
feat: wrapped KeyGenerator for symmetric encryption
markoisus May 28, 2024
ea233d3
feat: added symetrical encryption for android
mark-beck May 28, 2024
ec75bcd
fix: added more paddings
mark-beck May 28, 2024
b8ae3a6
fix: readded common tests
mark-beck May 28, 2024
4373a49
fix: readded other tests
mark-beck May 28, 2024
fca1a5b
fix: mod.rs
mark-beck May 28, 2024
301642a
fix: wrang hash names for signature
mark-beck May 31, 2024
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
225 changes: 225 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 5 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,9 @@ name = "crypto-layer"
version = "0.1.0"
edition = "2021"
license = "MIT"
crate-type = ["staticlib"]

[lib]
crate-type = ["cdylib"]
crate-type = ["cdylib", "lib"]

[profile.dev]
debug-assertions = true
Expand All @@ -24,7 +23,7 @@ debug = false
strip = "symbols"

[features]
android = []
android = ["robusta_jni", "libloading", "tracing-android"]
debug = []
hsm = []
ffi = []
Expand All @@ -50,6 +49,9 @@ tracing = { version = "0.1.40", features = ["std", "log"] }
tracing-subscriber = "0.3.18"
tracing-appender = "0.2.3"
yubikey = { version = "0.8.0", optional = true }
robusta_jni = { version = "0.2", optional = true }
libloading = { version = "0.8.3", optional = true}
tracing-android = { version = "0.2.0", optional = true }

[dev-dependencies]
test-case = "*"
Loading