From 52d4dfefeb9704c5f5055b4f52b56c2649112308 Mon Sep 17 00:00:00 2001 From: Erwin Nindl Date: Fri, 17 Aug 2007 09:44:33 +0000 Subject: changed keyderivation fuction from 'aes_icm_output' to 'cipher_output' --- keyDerivation.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'keyDerivation.h') diff --git a/keyDerivation.h b/keyDerivation.h index a625342..9033d30 100644 --- a/keyDerivation.h +++ b/keyDerivation.h @@ -49,18 +49,19 @@ typedef enum { class KeyDerivation { public: - KeyDerivation() : ld_kdr_(-1) {}; + KeyDerivation() : ld_kdr_(-1), cipher_(NULL) {}; virtual ~KeyDerivation() {}; err_status_t init(const uint8_t key[30], const uint8_t salt[14]); err_status_t setLogKDRate(const uint8_t ld_rate); - err_status_t generate(satp_prf_label label, seq_nr_t seq_nr, uint8_t *key, int length); + err_status_t generate(satp_prf_label label, seq_nr_t seq_nr, uint8_t *key, uint32_t length); err_status_t clear(); protected: - aes_icm_ctx_t kdf_; int8_t ld_kdr_; // ld(key_derivation_rate) uint8_t salt_[14]; + + cipher_t* cipher_; }; #endif -- cgit v1.2.3