summaryrefslogtreecommitdiff
path: root/src/keyDerivation.cpp
diff options
context:
space:
mode:
authorChristian Pointner <equinox@anytun.org>2009-01-15 12:54:07 +0000
committerChristian Pointner <equinox@anytun.org>2009-01-15 12:54:07 +0000
commitd49755d0a8d2131a43bac59644ce569834fcd944 (patch)
tree9f3e3bb1e910cf489481c36786280f1be0e225e5 /src/keyDerivation.cpp
parentfixed build (diff)
typename refactoring
Diffstat (limited to 'src/keyDerivation.cpp')
-rw-r--r--src/keyDerivation.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/keyDerivation.cpp b/src/keyDerivation.cpp
index fcb3001..fcb4070 100644
--- a/src/keyDerivation.cpp
+++ b/src/keyDerivation.cpp
@@ -51,7 +51,7 @@ void KeyDerivation::setLogKDRate(const int8_t log_rate)
//****** NullKeyDerivation ******
-bool NullKeyDerivation::generate(kd_dir dir, satp_prf_label label, seq_nr_t seq_nr, Buffer& key)
+bool NullKeyDerivation::generate(kd_dir_t dir, satp_prf_label_t label, seq_nr_t seq_nr, Buffer& key)
{
std::memset(key.getBuf(), 0, key.getLength());
return true;
@@ -168,7 +168,7 @@ std::string AesIcmKeyDerivation::printType()
return sstr.str();
}
-bool AesIcmKeyDerivation::calcCtr(kd_dir dir, seq_nr_t* r, satp_prf_label label, seq_nr_t seq_nr)
+bool AesIcmKeyDerivation::calcCtr(kd_dir_t dir, seq_nr_t* r, satp_prf_label_t label, seq_nr_t seq_nr)
{
*r = 0;
if(ld_kdr_ >= 0)
@@ -194,7 +194,7 @@ bool AesIcmKeyDerivation::calcCtr(kd_dir dir, seq_nr_t* r, satp_prf_label label,
return true;
}
-bool AesIcmKeyDerivation::generate(kd_dir dir, satp_prf_label label, seq_nr_t seq_nr, Buffer& key)
+bool AesIcmKeyDerivation::generate(kd_dir_t dir, satp_prf_label_t label, seq_nr_t seq_nr, Buffer& key)
{
ReadersLock lock(mutex_);