summaryrefslogtreecommitdiff
path: root/keyDerivation.h
diff options
context:
space:
mode:
authorChristian Pointner <equinox@anytun.org>2008-02-20 13:53:17 +0000
committerChristian Pointner <equinox@anytun.org>2008-02-20 13:53:17 +0000
commit5e14e11c3c21c7bd04b156f1df8e8c866509bc4a (patch)
tree544ef07c34811b7f1c927d4102a8b712e67ae0d8 /keyDerivation.h
parentfurther cleanups (diff)
cleanups
key derivation could work now
Diffstat (limited to 'keyDerivation.h')
-rw-r--r--keyDerivation.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/keyDerivation.h b/keyDerivation.h
index 88027ed..8776dd7 100644
--- a/keyDerivation.h
+++ b/keyDerivation.h
@@ -59,7 +59,7 @@ public:
void generate(satp_prf_label label, seq_nr_t seq_nr, Buffer& key);
private:
- void updateKey();
+ void updateMasterKey();
KeyDerivation(const KeyDerivation & src);
friend class boost::serialization::access;
@@ -70,7 +70,7 @@ private:
ar & ld_kdr_;
ar & master_salt_;
ar & master_key_;
- updateKey();
+ updateMasterKey();
}
protected: