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 <rsalz@openssl.org>

diff --git a/include/openssl/evp.h b/include/openssl/evp.h
index 611fd193cb0f895bdbce7b808fab1147343f54da..bc9fc8b7e31633e8b19e0373b19cb2d48dd399aa 100644 (file)
--- 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