Skip to content

Commit a6537df

Browse files
committed
remove GCM cipher self test with 8 byte tag
SRTP does not support 8 byt tag length with GCM, it is not possible to configure in the api. When updating wolfssl ci, these tests failed as it requires tag length >= 12.
1 parent 6e23ad8 commit a6537df

4 files changed

Lines changed: 8 additions & 36 deletions

File tree

.github/workflows/autotools.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
run: |
3939
git clone https://github.com/wolfSSL/wolfssl
4040
cd wolfssl
41-
git checkout v5.7.0-stable
41+
git checkout v5.9.2-stable
4242
./autogen.sh
4343
./configure '--enable-srtp-kdf' '--enable-aesctr' '--enable-intelasm' '--enable-aesgcm-stream'
4444
make
@@ -60,7 +60,7 @@ jobs:
6060
brew install autoconf automake libtool
6161
git clone https://github.com/wolfSSL/wolfssl
6262
cd wolfssl
63-
git checkout v5.7.0-stable
63+
git checkout v5.9.2-stable
6464
./autogen.sh
6565
CPU=`sysctl -n machdep.cpu.brand_string`
6666
if [[ "$CPU" =~ Intel ]]; then

.github/workflows/cmake.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
run: |
5454
git clone https://github.com/wolfSSL/wolfssl
5555
cd wolfssl
56-
git checkout v5.7.0-stable
56+
git checkout v5.9.2-stable
5757
./autogen.sh
5858
./configure '--enable-srtp-kdf' '--enable-aesctr' '--enable-intelasm' '--enable-aesgcm-stream'
5959
make
@@ -94,7 +94,7 @@ jobs:
9494
brew install autoconf automake libtool
9595
git clone https://github.com/wolfSSL/wolfssl
9696
cd wolfssl
97-
git checkout v5.7.0-stable
97+
git checkout v5.9.2-stable
9898
./autogen.sh
9999
CPU=`sysctl -n machdep.cpu.brand_string`
100100
if [[ "$CPU" =~ Intel ]]; then

.github/workflows/meson.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ jobs:
7070
run: |
7171
git clone https://github.com/wolfSSL/wolfssl
7272
cd wolfssl
73-
git checkout v5.7.0-stable
73+
git checkout v5.9.2-stable
7474
./autogen.sh
7575
./configure '--enable-srtp-kdf' '--enable-aesctr' '--enable-intelasm' '--enable-aesgcm-stream'
7676
make
@@ -111,7 +111,7 @@ jobs:
111111
brew install autoconf automake libtool
112112
git clone https://github.com/wolfSSL/wolfssl
113113
cd wolfssl
114-
git checkout v5.7.0-stable
114+
git checkout v5.9.2-stable
115115
./autogen.sh
116116
CPU=`sysctl -n machdep.cpu.brand_string`
117117
if [[ "$CPU" =~ Intel ]]; then

crypto/cipher/cipher_test_cases.c

Lines changed: 2 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -253,20 +253,6 @@ static const uint8_t srtp_aes_gcm_128_test_case_0_ciphertext[76] = {
253253
};
254254
/* clang-format on */
255255

256-
static const srtp_cipher_test_case_t srtp_aes_gcm_128_test_case_0a = {
257-
SRTP_AES_GCM_128_KEY_LEN_WSALT, /* octets in key */
258-
srtp_aes_gcm_128_test_case_0_key, /* key */
259-
srtp_aes_gcm_128_test_case_0_iv, /* packet index */
260-
60, /* octets in plaintext */
261-
srtp_aes_gcm_128_test_case_0_plaintext, /* plaintext */
262-
68, /* octets in ciphertext */
263-
srtp_aes_gcm_128_test_case_0_ciphertext, /* ciphertext + tag */
264-
20, /* octets in AAD */
265-
srtp_aes_gcm_128_test_case_0_aad, /* AAD */
266-
8, /* */
267-
NULL /* pointer to next testcase */
268-
};
269-
270256
const srtp_cipher_test_case_t srtp_aes_gcm_128_test_case_0 = {
271257
SRTP_AES_GCM_128_KEY_LEN_WSALT, /* octets in key */
272258
srtp_aes_gcm_128_test_case_0_key, /* key */
@@ -278,7 +264,7 @@ const srtp_cipher_test_case_t srtp_aes_gcm_128_test_case_0 = {
278264
20, /* octets in AAD */
279265
srtp_aes_gcm_128_test_case_0_aad, /* AAD */
280266
16, /* */
281-
&srtp_aes_gcm_128_test_case_0a /* pointer to next testcase */
267+
NULL /* pointer to next testcase */
282268
};
283269

284270
/* clang-format off */
@@ -336,20 +322,6 @@ static const uint8_t srtp_aes_gcm_256_test_case_0_ciphertext[76] = {
336322
};
337323
/* clang-format on */
338324

339-
static const srtp_cipher_test_case_t srtp_aes_gcm_256_test_case_0a = {
340-
SRTP_AES_GCM_256_KEY_LEN_WSALT, /* octets in key */
341-
srtp_aes_gcm_256_test_case_0_key, /* key */
342-
srtp_aes_gcm_256_test_case_0_iv, /* packet index */
343-
60, /* octets in plaintext */
344-
srtp_aes_gcm_256_test_case_0_plaintext, /* plaintext */
345-
68, /* octets in ciphertext */
346-
srtp_aes_gcm_256_test_case_0_ciphertext, /* ciphertext + tag */
347-
20, /* octets in AAD */
348-
srtp_aes_gcm_256_test_case_0_aad, /* AAD */
349-
8, /* */
350-
NULL /* pointer to next testcase */
351-
};
352-
353325
const srtp_cipher_test_case_t srtp_aes_gcm_256_test_case_0 = {
354326
SRTP_AES_GCM_256_KEY_LEN_WSALT, /* octets in key */
355327
srtp_aes_gcm_256_test_case_0_key, /* key */
@@ -361,5 +333,5 @@ const srtp_cipher_test_case_t srtp_aes_gcm_256_test_case_0 = {
361333
20, /* octets in AAD */
362334
srtp_aes_gcm_256_test_case_0_aad, /* AAD */
363335
16, /* */
364-
&srtp_aes_gcm_256_test_case_0a /* pointer to next testcase */
336+
NULL /* pointer to next testcase */
365337
};

0 commit comments

Comments
 (0)