diff options
| author | Matt Caswell <matt@openssl.org> | 2017-01-24 12:57:34 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2017-01-25 15:02:44 +0000 |
| commit | 7141ba31969d0b378d08104a51f8f99b9187b9d5 (patch) | |
| tree | 58735ecf1d4e9b266e2b928f13d018d2118f05c3 /include | |
| parent | 0b96d77a62d8ac9a45ac1dda47560ced676b5b8d (diff) | |
Fix the overlapping check for fragmented "Update" operations
When doing in place encryption the overlapping buffer check can fail
incorrectly where we have done a partial block "Update" operation. This
fixes things to take account of any pending partial blocks.
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2275)
Diffstat (limited to 'include')
| -rw-r--r-- | include/openssl/evp.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/openssl/evp.h b/include/openssl/evp.h index fda0713ce4..8252e25780 100644 --- a/include/openssl/evp.h +++ b/include/openssl/evp.h @@ -1467,11 +1467,14 @@ int ERR_load_EVP_strings(void); /* Function codes. */ # define EVP_F_AESNI_INIT_KEY 165 # define EVP_F_AES_INIT_KEY 133 +# define EVP_F_AES_OCB_CIPHER 169 # define EVP_F_AES_T4_INIT_KEY 178 +# define EVP_F_AES_WRAP_CIPHER 170 # define EVP_F_ALG_MODULE_INIT 177 # define EVP_F_CAMELLIA_INIT_KEY 159 # define EVP_F_CHACHA20_POLY1305_CTRL 182 # define EVP_F_CMLL_T4_INIT_KEY 179 +# define EVP_F_DES_EDE3_WRAP_CIPHER 171 # define EVP_F_DO_SIGVER_INIT 161 # define EVP_F_EVP_CIPHERINIT_EX 123 # define EVP_F_EVP_CIPHER_CTX_COPY 163 |