| Backport of: |
| |
| From 4bd0db1feaaf97fbc2bd31f54f1fbdeab80b2b1a Mon Sep 17 00:00:00 2001 |
| From: Richard Levitte <levitte@openssl.org> |
| Date: Sun, 9 Dec 2018 14:20:30 +0100 |
| Subject: [PATCH] make update |
| |
| Reviewed-by: Kurt Roeckx <kurt@roeckx.be> |
| Reviewed-by: Paul Dale <paul.dale@oracle.com> |
| (Merged from https://github.com/openssl/openssl/pull/7852) |
| |
| (cherry picked from commit f2f734d4f9e34643a1d3e5b79d2447cd643519f8) |
| --- |
| crypto/err/openssl.txt | 1 + |
| crypto/evp/evp_err.c | 2 ++ |
| include/openssl/evperr.h | 1 + |
| 3 files changed, 4 insertions(+) |
| |
| --- a/crypto/evp/evp_err.c |
| +++ b/crypto/evp/evp_err.c |
| @@ -94,6 +94,7 @@ static ERR_STRING_DATA EVP_str_functs[] |
| {ERR_FUNC(EVP_F_EVP_DECRYPTFINAL_EX), "EVP_DecryptFinal_ex"}, |
| {ERR_FUNC(EVP_F_EVP_DECRYPTUPDATE), "EVP_DecryptUpdate"}, |
| {ERR_FUNC(EVP_F_EVP_DIGESTINIT_EX), "EVP_DigestInit_ex"}, |
| + {ERR_FUNC(EVP_F_EVP_ENCRYPTDECRYPTUPDATE), "evp_EncryptDecryptUpdate"}, |
| {ERR_FUNC(EVP_F_EVP_ENCRYPTFINAL_EX), "EVP_EncryptFinal_ex"}, |
| {ERR_FUNC(EVP_F_EVP_ENCRYPTUPDATE), "EVP_EncryptUpdate"}, |
| {ERR_FUNC(EVP_F_EVP_MD_CTX_COPY_EX), "EVP_MD_CTX_copy_ex"}, |
| --- a/crypto/evp/evp.h |
| +++ b/crypto/evp/evp.h |
| @@ -1398,6 +1398,7 @@ void ERR_load_EVP_strings(void); |
| # define EVP_F_EVP_DECRYPTFINAL_EX 101 |
| # define EVP_F_EVP_DECRYPTUPDATE 166 |
| # define EVP_F_EVP_DIGESTINIT_EX 128 |
| +# define EVP_F_EVP_ENCRYPTDECRYPTUPDATE 219 |
| # define EVP_F_EVP_ENCRYPTFINAL_EX 127 |
| # define EVP_F_EVP_ENCRYPTUPDATE 167 |
| # define EVP_F_EVP_MD_CTX_COPY_EX 110 |
