Skip to content

Online encryption feature #330

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

Merged
MathieuMorrissette merged 21 commits into from
Jan 15, 2025
Merged

Online encryption feature #330

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
6fd67c1
[STREAM] WIP commit
pdugre Dec 2, 2024
fbc5599
[STREAM] WIP commit
pdugre Dec 6, 2024
59e4c5a
[STREAM] Initial V1 implementation
pdugre Dec 9, 2024
9d45af2
[STREAM] Generic bindings
pdugre Dec 9, 2024
b72d16b
[STREAM] Fix warnings
pdugre Dec 9, 2024
7b77316
[STREAM] Remove useless info in encryptor/decryptor structs
pdugre Dec 9, 2024
98b8774
[STREAM] Write macro to remove code duplication
pdugre Dec 9, 2024
3eaf116
[STREAM] WIP make use of generics
pdugre Dec 11, 2024
f27933b
[STREAM] temporarly fix the trait system with a downcast
pdugre Dec 12, 2024
428692d
[STREAM] revert symmetric/asymmetric trait to be dynamic
pdugre Dec 16, 2024
e0bf39d
[STREAM] FFI bindings
pdugre Dec 18, 2024
de7326d
[STREAM] C# EncryptionStream
pdugre Dec 18, 2024
eeb55ca
[STREAM] Attempt to fix segfault
pdugre Dec 20, 2024
eee35c7
[WIP] Fix last chunk size
MathieuMorrissette Jan 14, 2025
8b96898
[WIP] Cargo fmt
MathieuMorrissette Jan 14, 2025
de9e6d0
dotnet format
MathieuMorrissette Jan 14, 2025
e2c0e06
Decrypt Stream Test C#
MathieuMorrissette Jan 14, 2025
d1bc39f
test
MathieuMorrissette Jan 15, 2025
2c21c7d
changelog
MathieuMorrissette Jan 15, 2025
47b11ac
fix nuget
MathieuMorrissette Jan 15, 2025
60de902
update crates
MathieuMorrissette Jan 15, 2025
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
18 changes: 14 additions & 4 deletions .github/workflows/kotlin/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,16 +57,16 @@ runs:

echo "
[target.aarch64-linux-android]
ar = \"$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android-ar\"
ar = \"$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ar\"
linker = \"$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android21-clang\"
[target.armv7-linux-androideabi]
ar = \"$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/arm-linux-androideabi-ar\"
ar = \"$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ar\"
linker = \"$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/armv7a-linux-androideabi21-clang\"
[target.i686-linux-android]
ar = \"$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/i686-linux-android-ar\"
ar = \"$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ar\"
linker = \"$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/i686-linux-android21-clang\"
[target.x86_64-linux-android]
ar = \"$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android-ar\"
ar = \"$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ar\"
linker = \"$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android21-clang\"" >> ./.cargo/config.toml

- name: Build
Expand All @@ -78,6 +78,16 @@ runs:
export ANDROID_NDK=$ANDROID_SDK_ROOT/ndk-bundle
ln -sfn $ANDROID_SDK_ROOT/ndk/27.2.12479018 $ANDROID_NDK

# Set environment variables for blake3 custom build script
export CC_aarch64_linux_android="$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android21-clang"
export AR_aarch64_linux_android="$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ar"
export CC_armv7_linux_androideabi="$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/armv7a-linux-androideabi21-clang"
export AR_armv7_linux_androideabi="$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ar"
export CC_i686_linux_android="$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/i686-linux-android21-clang"
export AR_i686_linux_android="$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ar"
export CC_x86_64_linux_android="$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android21-clang"
export AR_x86_64_linux_android="$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ar"

make release RELEASE=1

chmod +x gradlew
Expand Down
21 changes: 17 additions & 4 deletions .github/workflows/native/native-build-linux/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,16 +68,16 @@ runs:

echo "
[target.aarch64-linux-android]
ar = \"$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android-ar\"
ar = \"$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ar\"
linker = \"$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android21-clang\"
[target.armv7-linux-androideabi]
ar = \"$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/arm-linux-androideabi-ar\"
ar = \"$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ar\"
linker = \"$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/armv7a-linux-androideabi21-clang\"
[target.i686-linux-android]
ar = \"$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/i686-linux-android-ar\"
ar = \"$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ar\"
linker = \"$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/i686-linux-android21-clang\"
[target.x86_64-linux-android]
ar = \"$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android-ar\"
ar = \"$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ar\"
linker = \"$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android21-clang\"" >> ./.cargo/config.toml


Expand All @@ -89,7 +89,20 @@ runs:
export ANDROID_SDK_ROOT="${ANDROID_ROOT}/sdk"
export ANDROID_NDK=$ANDROID_SDK_ROOT/ndk-bundle
ln -sfn $ANDROID_SDK_ROOT/ndk/27.2.12479018 $ANDROID_NDK

ls $ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/
cat ../../.cargo/config.toml

# Set environment variables for blake3 custom build script
export CC_aarch64_linux_android="$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android21-clang"
export AR_aarch64_linux_android="$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ar"
export CC_armv7_linux_androideabi="$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/armv7a-linux-androideabi21-clang"
export AR_armv7_linux_androideabi="$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ar"
export CC_i686_linux_android="$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/i686-linux-android21-clang"
export AR_i686_linux_android="$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ar"
export CC_x86_64_linux_android="$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android21-clang"
export AR_x86_64_linux_android="$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ar"

cargo build -p devolutions-crypto-ffi --release --target=aarch64-linux-android
cargo build -p devolutions-crypto-ffi --release --target=armv7-linux-androideabi
cargo build -p devolutions-crypto-ffi --release --target=i686-linux-android
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.

The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)

## [0.9.2] - 2025-01-20
- Online encryption feature

## [0.9.1] - 2024-06-21
- AAD feature

## [0.9.0] - 2023-10-23
- Removes the `derive_keypair` function as it was not used and was broken.
- Added `constant_time_equals` in the utils.
Expand Down
Loading