aboutsummaryrefslogtreecommitdiffstats
path: root/src/block
diff options
context:
space:
mode:
authorlloyd <[email protected]>2012-05-18 20:44:34 +0000
committerlloyd <[email protected]>2012-05-18 20:44:34 +0000
commit8383b0b503c812e45f2780217b048a19a8946853 (patch)
tree939403bad80ee2b1e13b69c82adc316422a9c7d6 /src/block
parentc691561f3198f481c13457433efbccc1c9fcd898 (diff)
Replace 0 and NULL pointer constants with nullptr. Also fix an old
style cast in secmem.h
Diffstat (limited to 'src/block')
-rw-r--r--src/block/aes_ssse3/aes_ssse3.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/block/aes_ssse3/aes_ssse3.cpp b/src/block/aes_ssse3/aes_ssse3.cpp
index 774ccbabb..a9ab29863 100644
--- a/src/block/aes_ssse3/aes_ssse3.cpp
+++ b/src/block/aes_ssse3/aes_ssse3.cpp
@@ -568,7 +568,7 @@ void AES_256_SSSE3::key_schedule(const byte keyb[], size_t)
_mm_storeu_si128(EK_mm + i, aes_schedule_mangle(key2, i % 4));
_mm_storeu_si128(DK_mm + (14-i), aes_schedule_mangle_dec(key2, (i+2) % 4));
- key2 = aes_schedule_round(NULL, _mm_shuffle_epi32(key2, 0xFF), k_t);
+ key2 = aes_schedule_round(nullptr, _mm_shuffle_epi32(key2, 0xFF), k_t);
_mm_storeu_si128(EK_mm + i + 1, aes_schedule_mangle(key2, (i - 1) % 4));
_mm_storeu_si128(DK_mm + (13-i), aes_schedule_mangle_dec(key2, (i+1) % 4));
}