The branch master has been updated
via 6140f0365311e6d08cdde63932c56ee741d9a605 (commit)
from c376d170d184c037134005830e584e21f429dfb2 (commit)
- Log -----------------------------------------------------------------
commit 6140f0365311e6d08cdde63932c56ee741d9a605
Author: Dmitry Belyavskiy <[email protected]>
Date: Wed Sep 30 22:42:57 2015 +0300
Add some new cipher ctrl constants
These are needed for GOST
Reviewed-by: Richard Levitte <[email protected]>
Reviewed-by: Matt Caswell <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
include/openssl/evp.h | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
diff --git a/include/openssl/evp.h b/include/openssl/evp.h
index d8fbba1..611fd19 100644
--- a/include/openssl/evp.h
+++ b/include/openssl/evp.h
@@ -378,6 +378,27 @@ 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
+/*
+ * 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
+/* 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
+/* EVP_CTRL_BLOCK_PADDING_MODE takes the padding mode */
+# define EVP_CTRL_BLOCK_PADDING_MODE 0x20
+
+/* Padding modes */
+#define EVP_PADDING_PKCS7 1
+#define EVP_PADDING_ISO7816_4 2
+#define EVP_PADDING_ANSI923 3
+#define EVP_PADDING_ISO10126 4
+#define EVP_PADDING_ZERO 5
+
/* RFC 5246 defines additional data to be 13 bytes in length */
# define EVP_AEAD_TLS1_AAD_LEN 13
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
