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

Jump to bottom

AES-CBC #380

Merged
merged 6 commits into from
May 8, 2024
Merged

AES-CBC #380

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
60cf9f7
AES-CBC
amirhosv Mar 19, 2024
056ea78
Addressing first round of comments:
amirhosv May 2, 2024
eef8b64
Tests for in-place operations
amirhosv May 3, 2024
3bff6ab
Address PR comments
amirhosv May 7, 2024
b3c3a7e
Zero memory for SimpleBuffer using OPENSSL_cleanse
amirhosv May 7, 2024
d855a69
Use OPENSSL_malloc and free for SimpleBuffer
amirhosv May 8, 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
27 changes: 9 additions & 18 deletions .github/workflows/macos_ci_jobs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,9 @@ jobs:
- uses: actions/checkout@v3
with:
submodules: true
- name: Install lcov
- name: Install dependencies from brew
run: |
env HOMEBREW_NO_AUTO_UPDATE=1 brew install lcov
- name: Install clang-format
run: |
env HOMEBREW_NO_AUTO_UPDATE=1 brew install clang-format
env HOMEBREW_NO_AUTO_UPDATE=1 brew install lcov golang clang-format
- name: Setup pip
uses: actions/setup-python@v4
with:
Expand Down Expand Up @@ -70,12 +67,9 @@ jobs:
- uses: actions/checkout@v3
with:
submodules: true
- name: Install lcov
run: |
env HOMEBREW_NO_AUTO_UPDATE=1 brew install lcov
- name: Install clang-format
- name: Install dependencies from brew
run: |
env HOMEBREW_NO_AUTO_UPDATE=1 brew install clang-format
env HOMEBREW_NO_AUTO_UPDATE=1 brew install lcov golang clang-format
- name: Setup pip
uses: actions/setup-python@v4
with:
Expand Down Expand Up @@ -107,12 +101,9 @@ jobs:
- uses: actions/checkout@v3
with:
submodules: true
- name: Install lcov
run: |
env HOMEBREW_NO_AUTO_UPDATE=1 brew install lcov
- name: Install clang-format
- name: Install dependencies from brew
run: |
env HOMEBREW_NO_AUTO_UPDATE=1 brew install clang-format
env HOMEBREW_NO_AUTO_UPDATE=1 brew install lcov golang clang-format
- name: Setup pip
uses: actions/setup-python@v4
with:
Expand Down Expand Up @@ -142,7 +133,7 @@ jobs:
- uses: actions/checkout@v3
with:
submodules: true
- name: Install lcov clang-format golang
- name: Install dependencies from brew
run: |
env HOMEBREW_NO_AUTO_UPDATE=1 brew install lcov clang-format golang
- name: Setup pip
Expand Down Expand Up @@ -187,7 +178,7 @@ jobs:
- uses: actions/checkout@v3
with:
submodules: true
- name: Install lcov clang-format golang
- name: Install dependencies from brew
run: |
env HOMEBREW_NO_AUTO_UPDATE=1 brew install lcov clang-format golang
- name: Setup pip
Expand Down Expand Up @@ -221,7 +212,7 @@ jobs:
- uses: actions/checkout@v3
with:
submodules: true
- name: Install lcov clang-format golang
- name: Install lcov dependencies from brew
run: |
env HOMEBREW_NO_AUTO_UPDATE=1 brew install lcov clang-format golang
- name: Setup pip
Expand Down
14 changes: 9 additions & 5 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,7 @@ add_library(
amazonCorrettoCryptoProvider SHARED
csrc/aes_gcm.cpp
csrc/aes_xts.cpp
csrc/aes_cbc.cpp
csrc/aes_kwp.cpp
csrc/agreement.cpp
csrc/bn.cpp
Expand Down Expand Up @@ -682,16 +683,18 @@ add_custom_target(check-junit-SecurityManager

DEPENDS accp-jar tests-jar)

add_custom_target(check-junit-AesGcmLazy
add_custom_target(check-junit-AesLazy
COMMAND ${TEST_JAVA_EXECUTABLE}
-Dcom.amazon.corretto.crypto.provider.nativeContextReleaseStrategy=LAZY
${TEST_RUNNER_ARGUMENTS}
--select-class=com.amazon.corretto.crypto.provider.test.AesTest
--select-class=com.amazon.corretto.crypto.provider.test.AesGcmKatTest
--select-class=com.amazon.corretto.crypto.provider.test.AesCbcTest
--select-class=com.amazon.corretto.crypto.provider.test.AesCbcNistTest

DEPENDS accp-jar tests-jar)

add_custom_target(check-junit-AesGcmEager
add_custom_target(check-junit-AesEager
COMMAND ${TEST_JAVA_EXECUTABLE}
-Dcom.amazon.corretto.crypto.provider.nativeContextReleaseStrategy=EAGER
${TEST_RUNNER_ARGUMENTS}
Expand Down Expand Up @@ -807,9 +810,10 @@ add_custom_target(check
check-junit
check-junit-SecurityManager
check-external-lib
check-junit-AesGcmLazy
check-junit-AesGcmEager
check-junit-DifferentTempDir)
check-junit-AesLazy
check-junit-AesEager
check-junit-DifferentTempDir
)

if(ENABLE_NATIVE_TEST_HOOKS)
add_custom_target(check-keyutils
Expand Down
8 changes: 6 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,14 @@ Mac algorithms:

Cipher algorithms:
* AES/GCM/NoPadding
* AES_128/GCM/NoPadding
* AES_256/GCM/NoPadding
* AES_\<n\>/GCM/NoPadding, where n can be 128, or 256
* AES/KWP/NoPadding
* AES/XTS/NoPadding
* AES/CBC/NoPadding
* AES_\<n\>/CBC/NoPadding, where n can be 128, 192, or 256
* AES/CBC/PKCS5Padding
* AES_\<n\>/CBC/PKCS5Padding, where n can be 128, 192, or 256
* PKCS7Padding is also accepted with AES/CBC and it is treated the same as PKCS5.
* RSA/ECB/NoPadding
* RSA/ECB/PKCS1Padding
* RSA/ECB/OAEPPadding
Expand Down
Loading
Loading