diff options
| author | Tomas Mraz <tomas@openssl.org> | 2022-06-20 17:11:28 +0200 |
|---|---|---|
| committer | Hugo Landau <hlandau@openssl.org> | 2022-07-28 10:04:28 +0100 |
| commit | 38b051a1fedc79ebf24a96de2e9a326ad3665baf (patch) | |
| tree | e32fa2a0a5cf8572b48b3cb8a1aac2a20d0b439f /ssl/record/ssl3_buffer.c | |
| parent | ce602bb0a20589e5a84c48a55ce13219ab881e84 (diff) | |
SSL object refactoring using SSL_CONNECTION object
Make the SSL object polymorphic based on whether this is
a traditional SSL connection, QUIC connection, or later
to be implemented a QUIC stream.
It requires adding if after every SSL_CONNECTION_FROM_SSL() call
which itself has to be added to almost every public SSL_ API call.
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Hugo Landau <hlandau@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/18612)
Diffstat (limited to 'ssl/record/ssl3_buffer.c')
| -rw-r--r-- | ssl/record/ssl3_buffer.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/ssl/record/ssl3_buffer.c b/ssl/record/ssl3_buffer.c index 01c553ebff..95149bfc05 100644 --- a/ssl/record/ssl3_buffer.c +++ b/ssl/record/ssl3_buffer.c @@ -34,7 +34,7 @@ void SSL3_BUFFER_release(SSL3_BUFFER *b) b->buf = NULL; } -int ssl3_setup_read_buffer(SSL *s) +int ssl3_setup_read_buffer(SSL_CONNECTION *s) { unsigned char *p; size_t len, align = 0, headerlen; @@ -42,7 +42,7 @@ int ssl3_setup_read_buffer(SSL *s) b = RECORD_LAYER_get_rbuf(&s->rlayer); - if (SSL_IS_DTLS(s)) + if (SSL_CONNECTION_IS_DTLS(s)) headerlen = DTLS1_RT_HEADER_LENGTH; else headerlen = SSL3_RT_HEADER_LENGTH; @@ -76,7 +76,8 @@ int ssl3_setup_read_buffer(SSL *s) return 1; } -int ssl3_setup_write_buffer(SSL *s, size_t numwpipes, size_t len) +int ssl3_setup_write_buffer(SSL_CONNECTION *s, size_t numwpipes, + size_t len) { unsigned char *p; size_t align = 0, headerlen; @@ -86,7 +87,7 @@ int ssl3_setup_write_buffer(SSL *s, size_t numwpipes, size_t len) s->rlayer.numwpipes = numwpipes; if (len == 0) { - if (SSL_IS_DTLS(s)) + if (SSL_CONNECTION_IS_DTLS(s)) headerlen = DTLS1_RT_HEADER_LENGTH + 1; else headerlen = SSL3_RT_HEADER_LENGTH; @@ -139,7 +140,7 @@ int ssl3_setup_write_buffer(SSL *s, size_t numwpipes, size_t len) return 1; } -int ssl3_setup_buffers(SSL *s) +int ssl3_setup_buffers(SSL_CONNECTION *s) { if (!ssl3_setup_read_buffer(s)) { /* SSLfatal() already called */ @@ -152,7 +153,7 @@ int ssl3_setup_buffers(SSL *s) return 1; } -int ssl3_release_write_buffer(SSL *s) +int ssl3_release_write_buffer(SSL_CONNECTION *s) { SSL3_BUFFER *wb; size_t pipes; @@ -172,7 +173,7 @@ int ssl3_release_write_buffer(SSL *s) return 1; } -int ssl3_release_read_buffer(SSL *s) +int ssl3_release_read_buffer(SSL_CONNECTION *s) { SSL3_BUFFER *b; |