Skip to content

XAES-256-GCM #2652

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

Draft
wants to merge 4 commits into
base: main
Choose a base branch
from
Draft

XAES-256-GCM #2652

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6c45115
Implementation of XAES-256-GCM with key commitment as a new AEAD.
nebeid Aug 6, 2024
6ad7e88
Added a mode that uses HMAC-SHA256 as PRF to derive a key for AES-GCM.
nebeid Apr 10, 2025
e352531
HMAC_CTX needs a larger state in EVP_AEAD_CTX.
nebeid Sep 3, 2025
04df8fd
Fixing the benchmarking tool when building for OpenSSL and older AWS-…
nebeid Sep 4, 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
32 changes: 31 additions & 1 deletion crypto/cipher_extra/aead_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1486,7 +1486,11 @@ static const EvpAeadCtxSerdeTestParams kEvpAeadCtxSerde[] = {
{"EVP_aead_aes_128_gcm_tls13", EVP_aead_aes_128_gcm_tls13(), kEvpAeadCtxKey,
16, 16, 23},
{"EVP_aead_aes_256_gcm_tls13", EVP_aead_aes_256_gcm_tls13(), kEvpAeadCtxKey,
32, 16, 24}};
32, 16, 24},
{"EVP_aead_xaes_256_gcm", EVP_aead_xaes_256_gcm(), kEvpAeadCtxKey, 32, 16,
29},
{"EVP_aead_hmac_aes_256_gcm", EVP_aead_hmac_aes_256_gcm(), kEvpAeadCtxKey, 32, 16,
30}};

INSTANTIATE_TEST_SUITE_P(
EvpAeadCtxSerdeTests, EvpAeadCtxSerdeTest,
Expand Down Expand Up @@ -1579,7 +1583,28 @@ TEST_P(EvpAeadCtxSerdeTest, FailUnknownCipherId) {
CIPHER_R_SERIALIZATION_INVALID_CIPHER_ID);
}
}
#if 0
struct aead_aes_gcm_ctx_2 {
union {
double align;
AES_KEY ks;
} ks;
GCM128_KEY gcm_key;
ctr128_f ctr;
};
#define XAES_KEY_COMMIT_SIZE (2*AES_BLOCK_SIZE)
struct aead_xaes_256_gcm_ctx_2 {
AES_KEY xaes_key; // Key K, used in CMAC and key commitment
uint8_t k1[AES_BLOCK_SIZE]; // only value needed from cmac_ctx_st
uint8_t kc[XAES_KEY_COMMIT_SIZE]; // key commitment
};

#include <openssl/hmac.h>
struct aead_hmac_aes_256_gcm_ctx_2 {
HMAC_CTX hmac_ctx;
uint8_t kc[XAES_KEY_COMMIT_SIZE]; // key commitment
};
#endif
TEST(EvpAeadCtxSerdeTest, ID) {
bool identifiers[AEAD_MAX_ID + 1] = {false};
for (EvpAeadCtxSerdeTestParams params : kEvpAeadCtxSerde) {
Expand All @@ -1594,6 +1619,11 @@ TEST(EvpAeadCtxSerdeTest, ID) {
identifiers[id] = true;
}

#if 0
// Finding out the sizes of the key committing AEAD structs, XAES and HMAC
EXPECT_EQ(sizeof(struct aead_xaes_256_gcm_ctx_2), (size_t)800);
EXPECT_EQ(sizeof(struct aead_hmac_aes_256_gcm_ctx_2), (size_t)800);
#endif
// Nothing should have the unknown identifier (0)
ASSERT_FALSE(identifiers[0]);

Expand Down
Loading
Loading