diff options
| author | Daniel Neus <[email protected]> | 2016-01-09 12:37:13 +0100 |
|---|---|---|
| committer | Daniel Neus <[email protected]> | 2016-01-09 12:37:13 +0100 |
| commit | f391635f202cf6f83539bd69688975a30f5f874f (patch) | |
| tree | 206459e94ab379ba18a8e8035b1855327aa02126 /src/lib/block/twofish/twofish.h | |
| parent | 52afcc69d97621e5a3880798d7814a474e71c03b (diff) | |
| parent | 791b3dc9947a94d35e6d54b274b0512fb0ebd09c (diff) | |
Merge remote-tracking branch 'remotes/github/master' into noreturn
# Conflicts:
# src/build-data/cc/gcc.txt
Diffstat (limited to 'src/lib/block/twofish/twofish.h')
| -rw-r--r-- | src/lib/block/twofish/twofish.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/block/twofish/twofish.h b/src/lib/block/twofish/twofish.h index c6af1a030..c3dd7fec0 100644 --- a/src/lib/block/twofish/twofish.h +++ b/src/lib/block/twofish/twofish.h @@ -39,7 +39,7 @@ class BOTAN_DLL Twofish : public Block_Cipher_Fixed_Params<16, 16, 32, 8> static const byte EXP_TO_POLY[255]; static const byte POLY_TO_EXP[255]; - secure_vector<u32bit> SB, RK; + secure_vector<u32bit> m_SB, m_RK; }; } |