From 670f9dd91aed7ac435b79c0e28e49fa7c256642c Mon Sep 17 00:00:00 2001 From: Adriaan de Jong Date: Thu, 23 Jun 2011 17:31:19 +0200 Subject: Refactored cipher key types Signed-off-by: Adriaan de Jong Acked-by: David Sommerseth Acked-by: James Yonan Signed-off-by: David Sommerseth --- crypto.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'crypto.h') diff --git a/crypto.h b/crypto.h index f300e3c..425c090 100644 --- a/crypto.h +++ b/crypto.h @@ -164,9 +164,9 @@ cipher_ok (const char* name) */ struct key_type { - uint8_t cipher_length; + uint8_t cipher_length; /**< Cipher length, in bytes */ uint8_t hmac_length; /**< HMAC length, in bytes */ - const EVP_CIPHER *cipher; + const cipher_kt_t *cipher; /**< Cipher static parameters */ const md_kt_t *digest; /**< Message digest static parameters */ }; @@ -309,8 +309,6 @@ int read_key (struct key *key, const struct key_type *kt, struct buffer *buf); bool cfb_ofb_mode (const struct key_type* kt); -const char *kt_cipher_name (const struct key_type *kt); -int kt_key_size (const struct key_type *kt); void init_key_type (struct key_type *kt, const char *ciphername, bool ciphername_defined, const char *authname, bool authname_defined, int keysize, bool cfb_ofb_allowed, bool warn); -- cgit