From 024f66e25e52c04f2445643f438f05e8230fde8e Mon Sep 17 00:00:00 2001 From: Nick Bolton Date: Fri, 30 Aug 2013 15:20:36 +0000 Subject: [PATCH] fixed unit tests, changed modes to cfb (other modes have been removed). --- src/test/unittests/server/CClientProxyTests.cpp | 2 +- src/test/unittests/synergy/CCryptoStreamTests.cpp | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/test/unittests/server/CClientProxyTests.cpp b/src/test/unittests/server/CClientProxyTests.cpp index b44721df..17b60dba 100644 --- a/src/test/unittests/server/CClientProxyTests.cpp +++ b/src/test/unittests/server/CClientProxyTests.cpp @@ -43,7 +43,7 @@ TEST(CClientProxyTests, cryptoIvWrite) NiceMock eventQueue; NiceMock innerStream; NiceMock server; - CCryptoOptions options("ctr", "mock"); + CCryptoOptions options("cfb", "mock"); IStreamEvents streamEvents; streamEvents.setEvents(&eventQueue); diff --git a/src/test/unittests/synergy/CCryptoStreamTests.cpp b/src/test/unittests/synergy/CCryptoStreamTests.cpp index 06d44b61..348194b8 100644 --- a/src/test/unittests/synergy/CCryptoStreamTests.cpp +++ b/src/test/unittests/synergy/CCryptoStreamTests.cpp @@ -70,7 +70,7 @@ TEST(CCryptoStreamTests, write) NiceMock eventQueue; NiceMock innerStream; - CCryptoOptions options("ctr", "mock"); + CCryptoOptions options("cfb", "mock"); ON_CALL(innerStream, write(_, _)).WillByDefault(Invoke(write_mockWrite)); @@ -88,7 +88,7 @@ TEST(CCryptoStreamTests, read) { NiceMock eventQueue; NiceMock innerStream; - CCryptoOptions options("ctr", "mock"); + CCryptoOptions options("cfb", "mock"); ON_CALL(innerStream, read(_, _)).WillByDefault(Invoke(read_mockRead)); @@ -117,7 +117,7 @@ TEST(CCryptoStreamTests, write4Read1) NiceMock eventQueue; NiceMock innerStream; - CCryptoOptions options("ctr", "mock"); + CCryptoOptions options("cfb", "mock"); ON_CALL(innerStream, write(_, _)).WillByDefault(Invoke(write4Read1_mockWrite)); ON_CALL(innerStream, read(_, _)).WillByDefault(Invoke(write4Read1_mockRead)); @@ -148,7 +148,7 @@ TEST(CCryptoStreamTests, write1Read4) NiceMock eventQueue; NiceMock innerStream; - CCryptoOptions options("ctr", "mock"); + CCryptoOptions options("cfb", "mock"); ON_CALL(innerStream, write(_, _)).WillByDefault(Invoke(write1Read4_mockWrite)); ON_CALL(innerStream, read(_, _)).WillByDefault(Invoke(write1Read4_mockRead)); @@ -185,7 +185,7 @@ TEST(CCryptoStreamTests, readWriteIvChanged) NiceMock eventQueue; NiceMock innerStream; - CCryptoOptions options("ctr", "mock"); + CCryptoOptions options("cfb", "mock"); ON_CALL(innerStream, write(_, _)).WillByDefault(Invoke(readWriteIvChanged_mockWrite)); ON_CALL(innerStream, read(_, _)).WillByDefault(Invoke(readWriteIvChanged_mockRead)); @@ -257,7 +257,7 @@ TEST(CCryptoStreamTests, newIvDoesNotChangeIv) { NiceMock eventQueue; NiceMock innerStream; - CCryptoOptions options("ctr", "mock"); + CCryptoOptions options("cfb", "mock"); ON_CALL(innerStream, write(_, _)).WillByDefault(Invoke(newIvDoesNotChangeIv_mockWrite));