[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  686cf15e9dfd3263ec05019f4b2b52253cdcf38e (commit)
      from  6140f0365311e6d08cdde63932c56ee741d9a605 (commit)


- Log -----------------------------------------------------------------
commit 686cf15e9dfd3263ec05019f4b2b52253cdcf38e
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Dec 8 13:00:59 2015 +0000

    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 at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 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 611fd19..bc9fc8b 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