summaryrefslogtreecommitdiff
path: root/keyDerivation.h
diff options
context:
space:
mode:
authorErwin Nindl <nine@wirdorange.org>2007-08-17 09:44:33 +0000
committerErwin Nindl <nine@wirdorange.org>2007-08-17 09:44:33 +0000
commit52d4dfefeb9704c5f5055b4f52b56c2649112308 (patch)
tree18f61a09a6f25798fb3acdf49ba7bbf22032653b /keyDerivation.h
parent* set cypher to aes_icm (diff)
changed keyderivation fuction from 'aes_icm_output' to 'cipher_output'
Diffstat (limited to 'keyDerivation.h')
-rw-r--r--keyDerivation.h7
1 files changed, 4 insertions, 3 deletions
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