rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

changed unit test IVs so that \0 isn't used (logs look less confusing).

This commit is contained in:
Nick Bolton 2013-04-11 06:16:15 +00:00
parent 1dccfe6c53
commit e84f111f35
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/test/unittests/synergy/CCryptoStreamTests.cpp
View File

@ -28,7 +28,7 @@ using ::testing::NiceMock;
using namespace std; using namespace std;
const byte kIv[] = "aaaaaaaaaaaaaa"; // +\0, AES block size = 16 const byte kIv[] = "aaaaaaaaaaaaaaaa"; // AES block size = 16 (\0 not used)
UInt8 g_write_buffer[4]; UInt8 g_write_buffer[4];
void write_mockWrite(const void* in, UInt32 n); void write_mockWrite(const void* in, UInt32 n);
@ -75,10 +75,10 @@ TEST(CCryptoTests, write)
cs.setIv(kIv); cs.setIv(kIv);
cs.write(buffer, size); cs.write(buffer, size);
EXPECT_EQ(198, g_write_buffer[0]); EXPECT_EQ(95, g_write_buffer[0]);
EXPECT_EQ(62, g_write_buffer[1]); EXPECT_EQ(107, g_write_buffer[1]);
EXPECT_EQ(15, g_write_buffer[2]); EXPECT_EQ(152, g_write_buffer[2]);
EXPECT_EQ(87, g_write_buffer[3]); EXPECT_EQ(220, g_write_buffer[3]);
} }
TEST(CCryptoTests, read) TEST(CCryptoTests, read)
@ -92,10 +92,10 @@ TEST(CCryptoTests, read)
CCryptoStream cs(&eventQueue, &innerStream, options, false); CCryptoStream cs(&eventQueue, &innerStream, options, false);
cs.setIv(kIv); cs.setIv(kIv);
g_read_buffer[0] = 198; g_read_buffer[0] = 95;
g_read_buffer[1] = 62; g_read_buffer[1] = 107;
g_read_buffer[2] = 15; g_read_buffer[2] = 152;
g_read_buffer[3] = 87; g_read_buffer[3] = 220;
const UInt32 size = 4; const UInt32 size = 4;
UInt8* buffer = new UInt8[size]; UInt8* buffer = new UInt8[size];
@ -186,8 +186,9 @@ TEST(CCryptoTests, readWriteIvChanged)
ON_CALL(innerStream, write(_, _)).WillByDefault(Invoke(readWriteIvChanged_mockWrite)); ON_CALL(innerStream, write(_, _)).WillByDefault(Invoke(readWriteIvChanged_mockWrite));
ON_CALL(innerStream, read(_, _)).WillByDefault(Invoke(readWriteIvChanged_mockRead)); ON_CALL(innerStream, read(_, _)).WillByDefault(Invoke(readWriteIvChanged_mockRead));
const byte iv1[] = "bbbbbbbbbbbbbbb"; // AES block size = 16 (\0 not used)
const byte iv2[] = "ccccccccccccccc"; const byte iv1[] = "aaaaaaaaaaaaaaaa";
const byte iv2[] = "bbbbbbbbbbbbbbbb";
CCryptoStream cs1(&eventQueue, &innerStream, options, false); CCryptoStream cs1(&eventQueue, &innerStream, options, false);
cs1.setIv(iv1); cs1.setIv(iv1);