Skip to content

Commit

Permalink
[TEST-ONLY] Mess with internal logic to test epoch data
Browse files Browse the repository at this point in the history
This rotates/invalidates keys extremely quickly and also jumps forward
1-8 keys instead of always one to test that part of the logic.

Change-Id: I7cdf992eb6031315c4978c6a1fbbecfa723fca91
Signed-off-by: Arne Schwabe <[email protected]>
  • Loading branch information
schwabe committed Nov 30, 2024
1 parent f2b39e7 commit a0d7714
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 4 deletions.
3 changes: 3 additions & 0 deletions src/openvpn/crypto.c
Original file line number Diff line number Diff line change
Expand Up @@ -352,6 +352,9 @@ openvpn_encrypt(struct buffer *buf, struct buffer work,
int64_t
cipher_get_aead_limits(const char *ciphername)
{
/* TESTING: Make AEAD key limits really really really small to force
* key rollever super quickly */
return 256;
if (!cipher_kt_mode_aead(ciphername))
{
return 0;
Expand Down
17 changes: 14 additions & 3 deletions src/openvpn/crypto_epoch.c
Original file line number Diff line number Diff line change
Expand Up @@ -414,8 +414,13 @@ epoch_check_send_iterate(struct crypto_options *opt)
if (aead_usage_limit_reached(opt->aead_usage_limit, &opt->key_ctx_bi.encrypt,
opt->packet_id.send.id))
{
/* Send key limit reached */
epoch_iterate_send_key(opt);
int forward = rand() % 8 + 1;
/* Send key limit reached, go one key forward or in this TEST
* gremlin mode, 1 to 8 to test the other side future key stuff */
for (int i = 0; i < forward; i++)
{
epoch_iterate_send_key(opt);
}
}
/* draft 8 of the aead usage limit still had but draft 9 complete
* dropped this statement:
Expand All @@ -437,7 +442,13 @@ epoch_check_send_iterate(struct crypto_options *opt)
/* Receive key limit reached. Increase our own send key to signal
* that we want to use a new epoch. Peer should then also move its
* key but is not required to do this */
epoch_iterate_send_key(opt);
int forward = rand() % 8 + 1;
/* gremlin mode, 1 to 8 to test the other side future key stuff */
for (int i = 0; i < forward; i++)
{
epoch_iterate_send_key(opt);
}

}
}

Expand Down
2 changes: 1 addition & 1 deletion tests/unit_tests/openvpn/test_ssl.c
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,7 @@ init_crypto_options(const char *cipher, const char *auth, bool epoch,
struct epoch_key e1 = { .epoch = 1, .epoch_key = { 0 }};
memcpy(e1.epoch_key, key2.keys[0].cipher, sizeof(e1.epoch_key));
co.flags |= CO_EPOCH_DATA_KEY_FORMAT;
epoch_init_key_ctx(&co, &kt, &e1, &e1, 5);
epoch_init_key_ctx(&co, &kt, &e1, &e1, 9);

/* Do a little of dancing for the epoch_send_key_iterate to test
* that this works too */
Expand Down

0 comments on commit a0d7714

Please sign in to comment.