From 686cf15e9dfd3263ec05019f4b2b52253cdcf38e Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Tue, 8 Dec 2015 13:00:59 +0000 Subject: [PATCH] Fix merge error Commit 6140f0365 added some new ctrl constants. However due to a merge error one of these values was duplicated with an existing value. Reviewed-by: Rich Salz --- include/openssl/evp.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/openssl/evp.h b/include/openssl/evp.h index 611fd193cb..bc9fc8b7e3 100644 --- a/include/openssl/evp.h +++ b/include/openssl/evp.h @@ -379,18 +379,18 @@ struct evp_cipher_st { # define EVP_CTRL_SSL3_MASTER_SECRET 0x1d /* EVP_CTRL_SET_SBOX takes the char * specifying S-boxes */ -# define EVP_CTRL_SET_SBOX 0x1d +# define EVP_CTRL_SET_SBOX 0x1e /* * EVP_CTRL_SBOX_USED takes a 'size_t' and 'char *', pointing at a * pre-allocated buffer with specified size */ -# define EVP_CTRL_SBOX_USED 0x1e +# define EVP_CTRL_SBOX_USED 0x1f /* EVP_CTRL_KEY_MESH takes 'size_t' number of bytes to mesh the key after, * 0 switches meshing off */ -# define EVP_CTRL_KEY_MESH 0x1f +# define EVP_CTRL_KEY_MESH 0x20 /* EVP_CTRL_BLOCK_PADDING_MODE takes the padding mode */ -# define EVP_CTRL_BLOCK_PADDING_MODE 0x20 +# define EVP_CTRL_BLOCK_PADDING_MODE 0x21 /* Padding modes */ #define EVP_PADDING_PKCS7 1 -- 2.34.1