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 /include | |
| 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 'include')
| -rw-r--r-- | include/openssl/core_names.h | 7 | ||||
| -rw-r--r-- | include/openssl/sslerr.h | 4 |
2 files changed, 10 insertions, 1 deletions
diff --git a/include/openssl/core_names.h b/include/openssl/core_names.h index a8f875a59a..1d866368f7 100644 --- a/include/openssl/core_names.h +++ b/include/openssl/core_names.h @@ -555,6 +555,13 @@ extern "C" { /* OSSL_DECODER input type if a decoder is used by the store */ #define OSSL_STORE_PARAM_INPUT_TYPE "input-type" /* UTF8_STRING */ + +/* Libssl record layer */ + +#define OSSL_LIBSSL_RECORD_LAYER_PARAM_OPTIONS "options" +#define OSSL_LIBSSL_RECORD_LAYER_PARAM_MODE "mode" +#define OSSL_LIBSSL_RECORD_LAYER_PARAM_READ_AHEAD "read_ahead" + # ifdef __cplusplus } # endif diff --git a/include/openssl/sslerr.h b/include/openssl/sslerr.h index a4746d70b5..e984fe375e 100644 --- a/include/openssl/sslerr.h +++ b/include/openssl/sslerr.h @@ -1,6 +1,6 @@ /* * Generated by util/mkerr.pl DO NOT EDIT - * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -119,6 +119,7 @@ # define SSL_R_EXTENSION_NOT_RECEIVED 279 # define SSL_R_EXTRA_DATA_IN_MESSAGE 153 # define SSL_R_EXT_LENGTH_MISMATCH 163 +# define SSL_R_FAILED_TO_GET_PARAMETER 316 # define SSL_R_FAILED_TO_INIT_ASYNC 405 # define SSL_R_FRAGMENTED_CLIENT_HELLO 401 # define SSL_R_GOT_A_FIN_BEFORE_A_CCS 154 @@ -222,6 +223,7 @@ # define SSL_R_PSK_NO_SERVER_CB 225 # define SSL_R_READ_BIO_NOT_SET 211 # define SSL_R_READ_TIMEOUT_EXPIRED 312 +# define SSL_R_RECORD_LAYER_FAILURE 313 # define SSL_R_RECORD_LENGTH_MISMATCH 213 # define SSL_R_RECORD_TOO_SMALL 298 # define SSL_R_RENEGOTIATE_EXT_TOO_LONG 335 |