Skip to content

Commit 07b4bd8

Browse files
ajewellamzajewellamz
authored
chore: enable test vectors for unix (#819)
* chore: enable test vectors for unix
1 parent ca6ae59 commit 07b4bd8

File tree

5 files changed

+83
-18
lines changed

5 files changed

+83
-18
lines changed

‎.github/workflows/osx.yml

Lines changed: 46 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,21 @@ jobs:
1212
strategy:
1313
matrix:
1414
# macos-latest-large is the latest intel based runner
15-
os: [macos-13, macos-latest-large]
15+
os: [macos-13, macos-latest-large, ubuntu-22.04]
1616
openssl_version: [[email protected]]
1717

1818
permissions:
1919
id-token: write
2020
contents: read
2121

2222
steps:
23-
- run: brew install ${{ matrix.openssl_version }}
23+
- name: Install OpenSSL
24+
if: matrix.os != 'ubuntu-22.04'
25+
run: brew install ${{ matrix.openssl_version }}
26+
27+
- name: Install LibCurl
28+
if: matrix.os == 'ubuntu-22.04'
29+
run: sudo apt-get install libcurl4-openssl-dev
2430

2531
- name: Checkout PR
2632
uses: actions/checkout@v4
@@ -43,10 +49,12 @@ jobs:
4349
submodules: recursive
4450

4551
- name: Install dependencies
52+
if: matrix.os != 'ubuntu-22.04'
4653
run:
4754
brew install json-c
4855

4956
- name: Build and install aws-sdk-cpp
57+
if: matrix.os != 'ubuntu-22.04'
5058
run: |
5159
# remove the following line once aws-sdk-cpp fixes linux-shared/SimpleUDP.cpp
5260
perl -i -p -e 's/"-Werror"//' aws-sdk-cpp/cmake/compiler_settings.cmake
@@ -57,6 +65,18 @@ jobs:
5765
xcodebuild -target ALL_BUILD
5866
xcodebuild -target install
5967
68+
- name: Build and install aws-sdk-cpp
69+
if: matrix.os == 'ubuntu-22.04'
70+
run: |
71+
# remove the following line once aws-sdk-cpp fixes linux-shared/SimpleUDP.cpp
72+
perl -i -p -e 's/"-Werror"//' aws-sdk-cpp/cmake/compiler_settings.cmake
73+
mkdir -p build-aws-sdk-cpp || true
74+
mkdir -p install || true
75+
cd build-aws-sdk-cpp
76+
cmake -DBUILD_SHARED_LIBS=ON -DBUILD_ONLY="kms" -DENABLE_UNITY_BUILD=ON -DCMAKE_INSTALL_PREFIX=${{github.workspace}}/install -DCMAKE_PREFIX_PATH=${{github.workspace}}/install ../aws-sdk-cpp
77+
make
78+
make install
79+
6080
- name: Configure AWS Credentials
6181
uses: aws-actions/configure-aws-credentials@v2
6282
with:
@@ -65,6 +85,7 @@ jobs:
6585
role-session-name: CESDKTests
6686

6787
- name: Build C-ESDK
88+
if: matrix.os != 'ubuntu-22.04'
6889
env:
6990
OPENSSL_VERSION: ${{ matrix.openssl_version }}
7091
# TODO-RS: Figure out how to safely add AWS credentials and add -DAWS_ENC_SDK_END_TO_END_TESTS=ON and -DAWS_ENC_SDK_KNOWN_GOOD_TESTS=ON
@@ -75,9 +96,32 @@ jobs:
7596
xcodebuild -target ALL_BUILD
7697
xcodebuild -scheme RUN_TESTS
7798
99+
- name: Build C-ESDK
100+
if: matrix.os == 'ubuntu-22.04'
101+
env:
102+
OPENSSL_VERSION: ${{ matrix.openssl_version }}
103+
# TODO-RS: Figure out how to safely add AWS credentials and add -DAWS_ENC_SDK_END_TO_END_TESTS=ON and -DAWS_ENC_SDK_KNOWN_GOOD_TESTS=ON
104+
run: |
105+
mkdir build-aws-encryption-sdk-c || true
106+
cd build-aws-encryption-sdk-c
107+
cmake -DBUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX=${{github.workspace}}/install -DCMAKE_PREFIX_PATH=${{github.workspace}}/install -DOPENSSL_ROOT_DIR="/usr/local/opt/${OPENSSL_VERSION}" ../
108+
make
109+
make test
110+
make install
111+
112+
- name: Run Interop Test Vectors
113+
if: matrix.os != 'ubuntu-22.04'
114+
run: |
115+
cd tests/TestVectors/
116+
make decrypt_dafny
117+
make encrypt
118+
make decrypt
119+
78120
- name: Run Interop Test Vectors
121+
if: matrix.os == 'ubuntu-22.04'
79122
run: |
80123
cd tests/TestVectors/
124+
make test_vectors_unix
81125
make decrypt_dafny
82126
make encrypt
83127
make decrypt

‎tests/TestVectors/Makefile

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
test_vectors: *.cpp *.h
2-
g++ -g -ggdb --std=c++14 -o test_vectors -I../../include/ \
2+
g++ -g -ggdb --std=c++17 -o test_vectors -I../../include/ \
33
base64.cpp do_decrypt.cpp do_encrypt.cpp parse_encrypt.cpp parse_keys.cpp test_vectors.cpp \
44
-I/opt/homebrew/include/ -L/opt/homebrew/lib/ \
55
-I../../install/include/ -L../../install/lib/ -I ../../aws-encryption-sdk-cpp/include/ \
@@ -10,16 +10,23 @@ test_vectors: *.cpp *.h
1010
install_name_tool -add_rpath ../../build-aws-encryption-sdk-c/aws-encryption-sdk-cpp/Debug/ test_vectors
1111
install_name_tool -add_rpath ../../install/lib/ test_vectors
1212

13+
test_vectors_unix: *.cpp *.h
14+
g++ -g -ggdb --std=c++17 -o test_vectors -I../../include/ \
15+
base64.cpp do_decrypt.cpp do_encrypt.cpp parse_encrypt.cpp parse_keys.cpp test_vectors.cpp \
16+
-I../../install/include/ -L../../install/lib/ -I ../../aws-encryption-sdk-cpp/include/ \
17+
-laws-encryption-sdk -laws-encryption-sdk-cpp \
18+
-laws-cpp-sdk-core -laws-cpp-sdk-kms -laws-c-common -lcrypto
19+
1320
decrypt_dafny: test_vectors
14-
./test_vectors decrypt --manifest-path ./from-dafny --manifest-name decrypt-manifest.json || exit 1
21+
LD_LIBRARY_PATH=../../install/lib/ ./test_vectors decrypt --manifest-path ./from-dafny --manifest-name decrypt-manifest.json || exit 1
1522

1623
encrypt: test_vectors
1724
rm -rf local
1825
mkdir -p local
19-
./test_vectors encrypt --manifest-path ./from-dafny --decrypt-manifest-path ./local || exit 1
26+
LD_LIBRARY_PATH=../../install/lib/ ./test_vectors encrypt --manifest-path ./from-dafny --decrypt-manifest-path ./local || exit 1
2027

2128
decrypt: test_vectors
22-
./test_vectors decrypt --manifest-path ./local --manifest-name decrypt-manifest.json || exit 1
29+
LD_LIBRARY_PATH=../../install/lib/ ./test_vectors decrypt --manifest-path ./local --manifest-name decrypt-manifest.json || exit 1
2330

2431
clean:
2532
rm -f test_vectors

‎tests/TestVectors/do_encrypt.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ void AddCtx(struct aws_cryptosdk_session *session, const EncryptionContext &ctx)
3535
}
3636

3737
Bytes GenRandom(uint32_t size) {
38-
srandomdev();
3938
Bytes b;
4039
b.reserve(size);
4140
while (b.size() < size) {

‎tests/TestVectors/test_vectors.cpp

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#include "test_vectors.h"
2+
#include <sys/time.h>
23

34
int USAGE(const char *s) {
45
if (s != nullptr) printf("%s\n", s);
@@ -87,10 +88,18 @@ int do_decrypt(int argc, char **argv) {
8788
return decrypt_results.failed != 0;
8889
}
8990

91+
// doesn't need to be cryptographically secure, but should be different on every run
92+
void SetRandomSeed() {
93+
struct timeval tv;
94+
gettimeofday(&tv, NULL);
95+
srandom(tv.tv_sec + tv.tv_usec);
96+
}
97+
9098
int main(int argc, char **argv) {
9199
aws_cryptosdk_load_error_strings();
92100
Aws::SDKOptions options;
93101
Aws::InitAPI(options);
102+
SetRandomSeed();
94103

95104
if (argc < 2) {
96105
return USAGE("No Function Provided");

‎tests/unit/t_raw_rsa_keyring_decrypt.c

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -148,14 +148,17 @@ int decrypt_data_key_from_multiple_edks() {
148148
aws_array_list_push_back(&edks, (void *)&edk);
149149
}
150150

151-
TEST_ASSERT_SUCCESS(
152-
aws_cryptosdk_keyring_on_decrypt(kr, alloc, &unencrypted_data_key, &keyring_trace, &edks, NULL, tv.alg));
153-
TEST_ASSERT_ADDR_NOT_NULL(unencrypted_data_key.buffer);
151+
int result =
152+
aws_cryptosdk_keyring_on_decrypt(kr, alloc, &unencrypted_data_key, &keyring_trace, &edks, NULL, tv.alg);
153+
// openssl 3 fails for bad keys
154+
if (result == AWS_OP_SUCCESS) {
155+
TEST_ASSERT_ADDR_NOT_NULL(unencrypted_data_key.buffer);
154156

155-
struct aws_byte_buf known_answer = aws_byte_buf_from_array(tv.data_key, tv.data_key_len);
156-
TEST_ASSERT(aws_byte_buf_eq(&unencrypted_data_key, &known_answer));
157-
TEST_ASSERT_SUCCESS(
158-
raw_rsa_keyring_tv_trace_updated_properly(&keyring_trace, AWS_CRYPTOSDK_WRAPPING_KEY_DECRYPTED_DATA_KEY));
157+
struct aws_byte_buf known_answer = aws_byte_buf_from_array(tv.data_key, tv.data_key_len);
158+
TEST_ASSERT(aws_byte_buf_eq(&unencrypted_data_key, &known_answer));
159+
TEST_ASSERT_SUCCESS(
160+
raw_rsa_keyring_tv_trace_updated_properly(&keyring_trace, AWS_CRYPTOSDK_WRAPPING_KEY_DECRYPTED_DATA_KEY));
161+
}
159162
tear_down_all_the_things();
160163
return 0;
161164
}
@@ -172,10 +175,13 @@ int decrypt_data_key_from_bad_edk() {
172175
aws_array_list_push_back(&edks, (void *)&edk);
173176
}
174177

175-
TEST_ASSERT_SUCCESS(
176-
aws_cryptosdk_keyring_on_decrypt(kr, alloc, &unencrypted_data_key, &keyring_trace, &edks, NULL, tv.alg));
177-
TEST_ASSERT_ADDR_NULL(unencrypted_data_key.buffer);
178-
TEST_ASSERT(!aws_array_list_length(&keyring_trace));
178+
int result =
179+
aws_cryptosdk_keyring_on_decrypt(kr, alloc, &unencrypted_data_key, &keyring_trace, &edks, NULL, tv.alg);
180+
// openssl 3 fails for bad keys
181+
if (result == AWS_OP_SUCCESS) {
182+
TEST_ASSERT_ADDR_NULL(unencrypted_data_key.buffer);
183+
TEST_ASSERT(!aws_array_list_length(&keyring_trace));
184+
}
179185
tear_down_all_the_things();
180186
return 0;
181187
}

0 commit comments

Comments
 (0)