[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  3aabc1dd1c969e60bdea8f827d6645ff04c56b67 (commit)
      from  721c2ac0f427da7ac3c96c8996c8d4b7aeaa9912 (commit)


- Log -----------------------------------------------------------------
commit 3aabc1dd1c969e60bdea8f827d6645ff04c56b67
Author: Dmitry Belyavskiy <beldmit at gmail.com>
Date:   Wed Sep 30 22:42:57 2015 +0300

    Custom cipher constants
    
    Add some custom ctrls for Engine specific use.
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    Reviewed-by: Matt Caswell <matt at openssl.org>

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

Summary of changes:
 include/openssl/evp.h | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/include/openssl/evp.h b/include/openssl/evp.h
index c60d178..02a6f98 100644
--- a/include/openssl/evp.h
+++ b/include/openssl/evp.h
@@ -427,6 +427,18 @@ struct evp_cipher_st {
 # define         EVP_CTRL_TLS1_1_MULTIBLOCK_DECRYPT      0x1b
 # define         EVP_CTRL_TLS1_1_MULTIBLOCK_MAX_BUFSIZE  0x1c
 
+/* For engine-specific control values */
+# define         EVP_CTRL_ENGINE_CIPHER_CUSTOM0          0x1000
+# define         EVP_CTRL_ENGINE_CIPHER_CUSTOM1          0x1001
+# define         EVP_CTRL_ENGINE_CIPHER_CUSTOM2          0x1002
+# define         EVP_CTRL_ENGINE_CIPHER_CUSTOM3          0x1003
+# define         EVP_CTRL_ENGINE_CIPHER_CUSTOM4          0x1004
+# define         EVP_CTRL_ENGINE_CIPHER_CUSTOM5          0x1005
+# define         EVP_CTRL_ENGINE_CIPHER_CUSTOM6          0x1006
+# define         EVP_CTRL_ENGINE_CIPHER_CUSTOM7          0x1007
+# define         EVP_CTRL_ENGINE_CIPHER_CUSTOM8          0x1008
+# define         EVP_CTRL_ENGINE_CIPHER_CUSTOM9          0x1009
+
 /* RFC 5246 defines additional data to be 13 bytes in length */
 # define         EVP_AEAD_TLS1_AAD_LEN           13