diff options
author | Matt Caswell <matt@openssl.org> | 2022-04-07 17:35:36 +0100 |
---|---|---|
committer | Matt Caswell <matt@openssl.org> | 2022-08-18 16:38:12 +0100 |
commit | e2d5742b1460c45bf39094ea08e4e85a8f507ea8 (patch) | |
tree | 67cfdbe193f5dff47d05460da589619a4eeb2a55 /ssl/ssl_local.h | |
parent | 0c974fc754e4b0525819ca9f6c3e124141b690ad (diff) |
Transfer the functionality from ssl3_read_n to the new record layer
This transfers the low level function ssl3_read_n to the new record layer.
We temporarily make the read_n function a top level record layer function.
Eventually, in later commits in this refactor, we will remove it as a top
level function and it will just be called from read_record.
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 'ssl/ssl_local.h')
-rw-r--r-- | ssl/ssl_local.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/ssl/ssl_local.h b/ssl/ssl_local.h index 76719f9e2c..3af39c8cc7 100644 --- a/ssl/ssl_local.h +++ b/ssl/ssl_local.h @@ -28,6 +28,7 @@ # include <openssl/symhacks.h> # include <openssl/ct.h> # include "record/record.h" +# include "record/recordmethod.h" # include "statem/statem.h" # include "internal/packet.h" # include "internal/dane.h" @@ -1762,7 +1763,16 @@ struct ssl_connection_st { * basis, depending on the chosen cipher. */ int (*not_resumable_session_cb) (SSL *ssl, int is_forward_secure); + + /* Old RECORD_LAYER structure - to be removed eventually */ RECORD_LAYER rlayer; + + /* New read direciton OSSL_RECORD_LAYER - to replace rlayer above */ + const OSSL_RECORD_METHOD *rrlmethod; + /* The read direction record layer */ + OSSL_RECORD_LAYER *rrl; + + /* Default password callback. */ pem_password_cb *default_passwd_callback; /* Default password callback user data. */ |