QUIC SRT GEN: Minor updates

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22599)

diff --git a/ssl/quic/quic_srt_gen.c b/ssl/quic/quic_srt_gen.c
index e43a55b29e9d7e0a74f7b6869f6f710381592a7a..233e4aa628cb659a7ada529523812f6a0c7cb4f3 100644 (file)
--- a/ssl/quic/quic_srt_gen.c
+++ b/ssl/quic/quic_srt_gen.c
@@ -65,7 +65,7 @@ int ossl_quic_srt_gen_calculate_token(QUIC_SRT_GEN *srt_gen,
                                       QUIC_STATELESS_RESET_TOKEN *token)
 {
     size_t outl = 0;
-    unsigned char mac[32];
+    unsigned char mac[SHA256_DIGEST_LENGTH];
 
     if (!EVP_MAC_init(srt_gen->mac_ctx, NULL, 0, NULL))
         return 0;
@@ -78,6 +78,7 @@ int ossl_quic_srt_gen_calculate_token(QUIC_SRT_GEN *srt_gen,
         || outl != sizeof(mac))
         return 0;
 
-    memcpy(token, mac, sizeof(*token));
+    assert(sizeof(mac) >= sizeof(token->token));
+    memcpy(token->token, mac, sizeof(token->token));
     return 1;
 }

diff --git a/test/quic_srt_gen_test.c b/test/quic_srt_gen_test.c
index 6982f599c0afa64a8c14e3a0432a6ef40462125d..59f331d5af2e503510fcc6870a379da290529835 100644 (file)
--- a/test/quic_srt_gen_test.c
+++ b/test/quic_srt_gen_test.c
@@ -65,7 +65,7 @@ static int test_srt_gen(int idx)
                                                          &token)))
             goto err;
 
-        if (!TEST_mem_eq(&token, sizeof(token),
+        if (!TEST_mem_eq(token.token, sizeof(token.token),
                          &t->expected, sizeof(t->expected)))
             goto err;
     }