diff options
| author | Christian Pointner <equinox@anytun.org> | 2009-03-17 12:28:56 +0000 |
|---|---|---|
| committer | Christian Pointner <equinox@anytun.org> | 2009-03-17 12:28:56 +0000 |
| commit | 3ace50d8eef058d378169c913d727bcb7d25a07e (patch) | |
| tree | 8b744858c5a7f4546cf3795d4e70e6f96d91be71 /src/cipher.cpp | |
| parent | added SIGERROR to signal Controller (diff) | |
removed key derivation rate entirely
added new role based label
updated configs and manpages
Diffstat (limited to 'src/cipher.cpp')
| -rw-r--r-- | src/cipher.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/cipher.cpp b/src/cipher.cpp index 3524052..15c9af2 100644 --- a/src/cipher.cpp +++ b/src/cipher.cpp @@ -140,7 +140,7 @@ u_int32_t AesIcmCipher::decipher(KeyDerivation& kd, u_int8_t* in, u_int32_t ilen void AesIcmCipher::calcCtr(KeyDerivation& kd, seq_nr_t seq_nr, sender_id_t sender_id, mux_t mux) { - kd.generate(dir_, LABEL_SATP_SALT, seq_nr, salt_); + kd.generate(dir_, LABEL_SALT, seq_nr, salt_); if(anytun02_compat_) { @@ -164,7 +164,7 @@ void AesIcmCipher::calc(KeyDerivation& kd, u_int8_t* in, u_int32_t ilen, u_int8_ return; #endif - kd.generate(dir_, LABEL_SATP_ENCRYPTION, seq_nr, key_); + kd.generate(dir_, LABEL_ENC, seq_nr, key_); #ifdef USE_SSL_CRYPTO int ret = AES_set_encrypt_key(key_.getBuf(), key_.getLength()*8, &aes_key_); if(ret) { |