Commit 7ab24d95 authored by Richard Levitte's avatar Richard Levitte
Browse files

make update 



Reviewed-by: default avatarMatthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
(Merged from https://github.com/openssl/openssl/pull/7856)
parent cfa9a7cd

crypto/evp/evp.h

+2 −0
Original line number Diff line number Diff line
@@ -1489,8 +1489,10 @@ void ERR_load_EVP_strings(void); 
# define EVP_F_EVP_CIPHER_CTX_CTRL                        124

# define EVP_F_EVP_CIPHER_CTX_SET_KEY_LENGTH              122

# define EVP_F_EVP_DECRYPTFINAL_EX                        101

# define EVP_F_EVP_DECRYPTUPDATE                          181

# define EVP_F_EVP_DIGESTINIT_EX                          128

# define EVP_F_EVP_ENCRYPTFINAL_EX                        127

# define EVP_F_EVP_ENCRYPTUPDATE                          180

# define EVP_F_EVP_MD_CTX_COPY_EX                         110

# define EVP_F_EVP_MD_SIZE                                162

# define EVP_F_EVP_OPENINIT                               102

crypto/evp/evp_err.c

+3 −1
Original line number Diff line number Diff line 
/* crypto/evp/evp_err.c */

/* ====================================================================

 * Copyright (c) 1999-2016 The OpenSSL Project.  All rights reserved.

 * Copyright (c) 1999-2018 The OpenSSL Project.  All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without

 * modification, are permitted provided that the following conditions
@@ -92,8 +92,10 @@ static ERR_STRING_DATA EVP_str_functs[] = { 
    {ERR_FUNC(EVP_F_EVP_CIPHER_CTX_SET_KEY_LENGTH),

     "EVP_CIPHER_CTX_set_key_length"},

    {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_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"},

    {ERR_FUNC(EVP_F_EVP_MD_SIZE), "EVP_MD_size"},

    {ERR_FUNC(EVP_F_EVP_OPENINIT), "EVP_OpenInit"},