summaryrefslogtreecommitdiff
path: root/keyDerivation.h
diff options
context:
space:
mode:
authorErwin Nindl <nine@wirdorange.org>2007-08-23 16:29:13 +0000
committerErwin Nindl <nine@wirdorange.org>2007-08-23 16:29:13 +0000
commit23829340df43d8bb3b988acf05c522dca0261498 (patch)
treec1cec1ad5c90ffa9a1e29a6d773d9ca13b1f2fea /keyDerivation.h
parentchanged keyderivation fuction from 'aes_icm_output' to 'cipher_output' (diff)
* added KeyDerivation to anytun.cpp
* code cleanup
Diffstat (limited to 'keyDerivation.h')
-rw-r--r--keyDerivation.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/keyDerivation.h b/keyDerivation.h
index 9033d30..c65df0e 100644
--- a/keyDerivation.h
+++ b/keyDerivation.h
@@ -52,14 +52,14 @@ public:
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 init(Buffer key, Buffer salt);
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, uint32_t length);
+ err_status_t generate(satp_prf_label label, seq_nr_t seq_nr, Buffer& key, uint32_t length);
err_status_t clear();
protected:
int8_t ld_kdr_; // ld(key_derivation_rate)
- uint8_t salt_[14];
+ Buffer salt_;
cipher_t* cipher_;
};