diff options
| author | Matt Caswell <matt@openssl.org> | 2022-06-02 16:29:04 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2022-08-18 16:38:13 +0100 |
| commit | eddb067e2ce82bc2ea104b3ab5286fe334c0525d (patch) | |
| tree | 00b844f5b7f4e26963ac4115899989efe63d49ba /test/sslapitest.c | |
| parent | 8124ab56d4e8985151c5a0c4dca6af128fa89f2c (diff) | |
| download | openssl-eddb067e2ce82bc2ea104b3ab5286fe334c0525d.tar.gz | |
Move some DTLS read code into the read 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/sslapitest.c')
| -rw-r--r-- | test/sslapitest.c | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/test/sslapitest.c b/test/sslapitest.c index f470d91a7b..774728bbc1 100644 --- a/test/sslapitest.c +++ b/test/sslapitest.c @@ -1544,6 +1544,7 @@ static int execute_cleanse_plaintext(const SSL_METHOD *smeth, int testresult = 0; void *zbuf; SSL_CONNECTION *serversc; + TLS_RECORD *rr; static unsigned char cbuf[16000]; static unsigned char sbuf[16000]; @@ -1606,24 +1607,11 @@ static int execute_cleanse_plaintext(const SSL_METHOD *smeth, */ if (!TEST_ptr(serversc = SSL_CONNECTION_FROM_SSL_ONLY(serverssl))) goto end; + rr = serversc->rlayer.tlsrecs; - /* - * TODO(RECLAYER): This is temporary until DTLS is converted to use the new - * record layer code. - */ - if (!SSL_is_dtls(serverssl)) { - TLS_RECORD *rr = serversc->rlayer.tlsrecs; - - zbuf = &rr->data[rr->off]; - if (!TEST_int_eq(rr->length, sizeof(cbuf))) - goto end; - } else { - SSL3_RECORD *rr = serversc->rlayer.rrec; - - zbuf = &rr->data[rr->off]; - if (!TEST_int_eq(rr->length, sizeof(cbuf))) - goto end; - } + zbuf = &rr->data[rr->off]; + if (!TEST_int_eq(rr->length, sizeof(cbuf))) + goto end; /* * After SSL_peek() the plaintext must still be stored in the |