Commit 686cf15e authored by Matt Caswell's avatar Matt Caswell
Browse files

Fix merge error 



Commit 6140f036 added some new ctrl constants. However due to a
merge error one of these values was duplicated with an existing
value.

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
parent 6140f036

include/openssl/evp.h

+4 −4
Original line number Diff line number Diff line
@@ -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