diff options
author | Matt Caswell <matt@openssl.org> | 2022-05-24 16:00:50 +0100 |
---|---|---|
committer | Matt Caswell <matt@openssl.org> | 2022-08-18 16:38:12 +0100 |
commit | 0755722c28309a52f29573221e411a2b37175e37 (patch) | |
tree | b48bcb87cf60302581e5025e1f6162caa27f25c7 /test | |
parent | ffbd6e67874475e025e942e0ee9f51badfea42b5 (diff) | |
download | openssl-new-0755722c28309a52f29573221e411a2b37175e37.tar.gz |
Move the sequence number into the OSSL_RECORD_LAYER object
This removes some references to the SSL object from the record layer.
Reviewed-by: Hugo Landau <hlandau@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/18132)
Diffstat (limited to 'test')
-rw-r--r-- | test/sslapitest.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/test/sslapitest.c b/test/sslapitest.c index a12bb3e670..f470d91a7b 100644 --- a/test/sslapitest.c +++ b/test/sslapitest.c @@ -40,6 +40,7 @@ #include "internal/nelem.h" #include "internal/ktls.h" #include "../ssl/ssl_local.h" +#include "../ssl/record/methods/recmethod_local.h" #include "filterprov.h" #undef OSSL_NO_USABLE_TLS1_3 @@ -1087,9 +1088,9 @@ static int ping_pong_query(SSL *clientssl, SSL *serverssl) cbuf[0] = count++; memcpy(crec_wseq_before, &clientsc->rlayer.write_sequence, SEQ_NUM_SIZE); - memcpy(crec_rseq_before, &clientsc->rlayer.read_sequence, SEQ_NUM_SIZE); + memcpy(crec_rseq_before, &clientsc->rrl->sequence, SEQ_NUM_SIZE); memcpy(srec_wseq_before, &serversc->rlayer.write_sequence, SEQ_NUM_SIZE); - memcpy(srec_rseq_before, &serversc->rlayer.read_sequence, SEQ_NUM_SIZE); + memcpy(srec_rseq_before, &serversc->rrl->sequence, SEQ_NUM_SIZE); if (!TEST_true(SSL_write(clientssl, cbuf, sizeof(cbuf)) == sizeof(cbuf))) goto end; @@ -1110,9 +1111,9 @@ static int ping_pong_query(SSL *clientssl, SSL *serverssl) } memcpy(crec_wseq_after, &clientsc->rlayer.write_sequence, SEQ_NUM_SIZE); - memcpy(crec_rseq_after, &clientsc->rlayer.read_sequence, SEQ_NUM_SIZE); + memcpy(crec_rseq_after, &clientsc->rrl->sequence, SEQ_NUM_SIZE); memcpy(srec_wseq_after, &serversc->rlayer.write_sequence, SEQ_NUM_SIZE); - memcpy(srec_rseq_after, &serversc->rlayer.read_sequence, SEQ_NUM_SIZE); + memcpy(srec_rseq_after, &serversc->rrl->sequence, SEQ_NUM_SIZE); /* verify the payload */ if (!TEST_mem_eq(cbuf, sizeof(cbuf), sbuf, sizeof(sbuf))) |