Skip to content

Commit 978de05

Browse files
sec: remove generic ciphering engine
1 parent 235842e commit 978de05

File tree

5 files changed

+0
-158
lines changed

5 files changed

+0
-158
lines changed

lib/security/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99

1010
set(SOURCES
11-
ciphering_engine_generic.cpp
1211
ciphering_engine_nea1.cpp
1312
ciphering_engine_nea2.cpp
1413
ciphering_engine_nea3.cpp

lib/security/ciphering_engine_generic.cpp

Lines changed: 0 additions & 49 deletions
This file was deleted.

lib/security/ciphering_engine_generic.h

Lines changed: 0 additions & 40 deletions
This file was deleted.

lib/security/security_engine_impl.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
*/
1212

1313
#include "security_engine_impl.h"
14-
#include "ciphering_engine_generic.h"
1514
#include "ciphering_engine_nea1.h"
1615
#include "ciphering_engine_nea2.h"
1716
#include "ciphering_engine_nea3.h"

tests/unittests/security/ciphering_engine_test.cpp

Lines changed: 0 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
*
99
*/
1010

11-
#include "lib/security/ciphering_engine_generic.h"
1211
#include "lib/security/ciphering_engine_nea1.h"
1312
#include "lib/security/ciphering_engine_nea2.h"
1413
#include "lib/security/ciphering_engine_nea3.h"
@@ -165,72 +164,6 @@ TEST_P(fxt_nea3, ciphering_engine_nea3)
165164
EXPECT_EQ(result.buf.value(), ciphertext);
166165
}
167166

168-
TEST_P(fxt_nea1, ciphering_engine_generic_nea1)
169-
{
170-
nea_test_set param = GetParam();
171-
172-
// Pack hex strings into srsran types
173-
sec_128_key key = make_sec_128_key(param.key_cstr);
174-
auto dir = static_cast<security_direction>(param.direction);
175-
byte_buffer plaintext = make_byte_buffer(param.plaintext_cstr).value();
176-
byte_buffer ciphertext = make_byte_buffer(param.ciphertext_cstr).value();
177-
178-
// Create ciphering engine
179-
std::unique_ptr<ciphering_engine> nea =
180-
std::make_unique<ciphering_engine_generic>(key, param.bearer, dir, ciphering_algorithm::nea1);
181-
182-
// Apply ciphering and compare results
183-
security_result result = nea->apply_ciphering(plaintext.deep_copy().value(), 0, param.count);
184-
ASSERT_TRUE(result.buf.has_value());
185-
ASSERT_TRUE(trim_tail_to_bitlength(result.buf.value(), param.length));
186-
EXPECT_EQ(result.buf.value(), ciphertext);
187-
EXPECT_EQ(result.count, param.count);
188-
}
189-
190-
TEST_P(fxt_nea2, ciphering_engine_generic_nea2)
191-
{
192-
nea_test_set param = GetParam();
193-
194-
// Pack hex strings into srsran types
195-
sec_128_key key = make_sec_128_key(param.key_cstr);
196-
auto dir = static_cast<security_direction>(param.direction);
197-
byte_buffer plaintext = make_byte_buffer(param.plaintext_cstr).value();
198-
byte_buffer ciphertext = make_byte_buffer(param.ciphertext_cstr).value();
199-
200-
// Create ciphering engine
201-
std::unique_ptr<ciphering_engine> nea =
202-
std::make_unique<ciphering_engine_generic>(key, param.bearer, dir, ciphering_algorithm::nea2);
203-
204-
// Apply ciphering and compare results
205-
security_result result = nea->apply_ciphering(plaintext.deep_copy().value(), 0, param.count);
206-
ASSERT_TRUE(result.buf.has_value());
207-
ASSERT_TRUE(trim_tail_to_bitlength(result.buf.value(), param.length));
208-
EXPECT_EQ(result.buf.value(), ciphertext);
209-
EXPECT_EQ(result.count, param.count);
210-
}
211-
212-
TEST_P(fxt_nea3, ciphering_engine_generic_nea3)
213-
{
214-
nea_test_set param = GetParam();
215-
216-
// Pack hex strings into srsran types
217-
sec_128_key key = make_sec_128_key(param.key_cstr);
218-
auto dir = static_cast<security_direction>(param.direction);
219-
byte_buffer plaintext = make_byte_buffer(param.plaintext_cstr).value();
220-
byte_buffer ciphertext = make_byte_buffer(param.ciphertext_cstr).value();
221-
222-
// Create ciphering engine
223-
std::unique_ptr<ciphering_engine> nea =
224-
std::make_unique<ciphering_engine_generic>(key, param.bearer, dir, ciphering_algorithm::nea3);
225-
226-
// Apply ciphering and compare results
227-
security_result result = nea->apply_ciphering(plaintext.deep_copy().value(), 0, param.count);
228-
ASSERT_TRUE(result.buf.has_value());
229-
ASSERT_TRUE(trim_tail_to_bitlength(result.buf.value(), param.length));
230-
EXPECT_EQ(result.buf.value(), ciphertext);
231-
EXPECT_EQ(result.count, param.count);
232-
}
233-
234167
//////////////////////////////////////////////////////////
235168
// Finally, instantiate all testcases for each test set //
236169
//////////////////////////////////////////////////////////

0 commit comments

Comments
 (0)