diff options
| author | Christian Pointner <equinox@anytun.org> | 2009-01-16 22:59:45 +0000 |
|---|---|---|
| committer | Christian Pointner <equinox@anytun.org> | 2009-01-16 22:59:45 +0000 |
| commit | c658d303e580849fa77f669c4ece78bfc0ddd74b (patch) | |
| tree | 68e782c47915ce37fa83db9c4e879f271c5dc0b8 /src/keyDerivation.cpp | |
| parent | added Log to stdout (diff) | |
got rid of NOPACKED (struct alignment works now under Windows)
crypto works now under windows using openssl crypto
Diffstat (limited to 'src/keyDerivation.cpp')
| -rw-r--r-- | src/keyDerivation.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/keyDerivation.cpp b/src/keyDerivation.cpp index 5b4f7a6..dbe5dee 100644 --- a/src/keyDerivation.cpp +++ b/src/keyDerivation.cpp @@ -225,7 +225,7 @@ bool AesIcmKeyDerivation::generate(kd_dir_t dir, satp_prf_label_t label, seq_nr_ cLog.msg(Log::PRIO_ERR) << "AesIcmCipher: Failed to set cipher CTR: size don't fits"; return false; } - u_int32_t num = 0; + unsigned int num = 0; std::memset(ecount_buf_[dir], 0, AES_BLOCK_SIZE); std::memset(key.getBuf(), 0, key.getLength()); AES_ctr128_encrypt(key.getBuf(), key.getBuf(), key.getLength(), &aes_key_[dir], ctr_[dir].buf_, ecount_buf_[dir], &num); |