projects
/
openssl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
735ebc2
)
evp.h: add flag to distinguish AEAD ciphers and pair of control codes...
author
Andy Polyakov
<appro@openssl.org>
Mon, 11 Jul 2011 13:54:53 +0000
(13:54 +0000)
committer
Andy Polyakov
<appro@openssl.org>
Mon, 11 Jul 2011 13:54:53 +0000
(13:54 +0000)
crypto/evp/evp.h
patch
|
blob
|
history
diff --git
a/crypto/evp/evp.h
b/crypto/evp/evp.h
index 2bfeb85e7d6526d103e0d7d1fb68ef60bd99a84f..157de07b04a89bc6f4a5aff1528c597cfb3cc24b 100644
(file)
--- a/
crypto/evp/evp.h
+++ b/
crypto/evp/evp.h
@@
-361,6
+361,7
@@
struct evp_cipher_st
* as finalisation.
*/
#define EVP_CIPH_FLAG_CUSTOM_CIPHER 0x100000
* as finalisation.
*/
#define EVP_CIPH_FLAG_CUSTOM_CIPHER 0x100000
+#define EVP_CIPH_FLAG_AEAD_CIPHER 0x200000
/* ctrl() values */
/* ctrl() values */
@@
-383,6
+384,13
@@
struct evp_cipher_st
#define EVP_CTRL_CCM_SET_TAG EVP_CTRL_GCM_SET_TAG
#define EVP_CTRL_CCM_SET_L 0x14
#define EVP_CTRL_CCM_SET_MSGLEN 0x15
#define EVP_CTRL_CCM_SET_TAG EVP_CTRL_GCM_SET_TAG
#define EVP_CTRL_CCM_SET_L 0x14
#define EVP_CTRL_CCM_SET_MSGLEN 0x15
+/* AEAD cipher deduces payload length and returns number of bytes
+ * required to store MAC and eventual padding. Subsequent call to
+ * EVP_Cipher even appends/verifies MAC.
+ */
+#define EVP_CTRL_AEAD_TLS1_AAD 0x16
+/* Used by composite AEAD ciphers, no-op in GCM, CCM... */
+#define EVP_CTRL_AEAD_SET_MAC_KEY 0x17
typedef struct evp_cipher_info_st
{
typedef struct evp_cipher_info_st
{