Skip to content

Commit e12bfbb

Browse files
committed
aes, MR-Kyber & prng update
1 parent dbeb2f5 commit e12bfbb

File tree

7 files changed

+10
-10
lines changed

7 files changed

+10
-10
lines changed

CMakePresets.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@
1313
"ENABLE_ALL_OT": true,
1414
"ENABLE_SSE": true,
1515
"ENABLE_AVX": true,
16-
"ENABLE_BOOST": true,
16+
"ENABLE_BOOST": false,
1717
"ENABLE_BITPOLYMUL": false,
1818
"ENABLE_CIRCUITS": true,
1919
"ENABLE_SIMPLESTOT": true,
2020
"ENABLE_MRR": true,
2121
"ENABLE_MR": true,
2222
"ENABLE_RELIC": false,
23-
"ENABLE_SODIUM": true,
23+
"ENABLE_SODIUM": false,
2424
"ENABLE_ASAN": true,
2525
"ENABLE_MOCK_OT": true,
2626
"LIBOTE_STD_VER": "20",
@@ -36,7 +36,7 @@
3636
"microsoft.com/VisualStudioRemoteSettings/CMake/1.0": {
3737
"sourceDir": "$env{HOME}/.vs/$ms{projectDirName}",
3838
"copySourcesOptions": {
39-
"exclusionList": [ ".vs", "out/build", "out/install", "out/boost*", "out/relic/build" ]
39+
"exclusionList": [ ".vs", "out/build", "out/install", "out/boost*", "out/relic/build", ".git" ]
4040
},
4141
"rsyncCommandArgs": [ "-t", "--delete", "--include=${sourceDir}/out/macoro/*", "--verbose" ]
4242
}

frontend/benchmark.h

-1
Original file line numberDiff line numberDiff line change
@@ -659,7 +659,6 @@ namespace osuCrypto
659659
};
660660

661661
oc::AlignedUnVector<block> x(n);
662-
auto n8 = n / 8;
663662
AES_ aes(block(42352345, 3245345234676534));
664663
Timer timer;
665664
timer.setTimePoint("begin");

libOTe/Base/BaseOT.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
#include "SimplestOT.h"
1111
#include "MasnyRindal.h"
1212
#include "McRosRoyTwist.h"
13+
#include "MasnyRindalKyber.h"
1314
#include "McRosRoy.h"
1415
#include "libOTe/Tools/Popf/EKEPopf.h"
1516
#include "libOTe/Tools/Popf/FeistelMulRistPopf.h"
@@ -26,7 +27,7 @@ namespace osuCrypto
2627
using DefaultBaseOT = MasnyRindal;
2728
#elif defined ENABLE_MRR
2829
using DefaultBaseOT = McRosRoy;
29-
#elif defined ENABLE_NP_KYBER
30+
#elif defined ENABLE_MR_KYBER
3031
using DefaultBaseOT = MasnyRindalKyber;
3132
#elif defined ENABLE_SIMPLESTOT
3233
using DefaultBaseOT = SimplestOT;

libOTe/Vole/Silent/SilentVoleReceiver.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ namespace osuCrypto
146146
using BaseOT = MasnyRindal;
147147
#elif defined ENABLE_MRR
148148
using BaseOT = McRosRoy;
149-
#elif defined ENABLE_NP_KYBER
149+
#elif defined ENABLE_MR_KYBER
150150
using BaseOT = MasnyRindalKyber;
151151
#else
152152
using BaseOT = DefaultBaseOT;

libOTe/Vole/Silent/SilentVoleSender.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ namespace osuCrypto
135135
using BaseOT = MasnyRindal;
136136
#elif defined ENABLE_MRR
137137
using BaseOT = McRosRoy;
138-
#elif defined ENABLE_NP_KYBER
138+
#elif defined ENABLE_MR_KYBER
139139
using BaseOT = MasnyRindalKyber;
140140
#else
141141
using BaseOT = DefaultBaseOT;

libOTe_Tests/Vole_Tests.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,7 @@ void Vole_Silent_Rounds_test(const oc::CLP& cmd)
320320
// using BaseOT = MasnyRindal;
321321
//#elif defined ENABLE_MRR
322322
// using BaseOT = McRosRoy;
323-
//#elif defined ENABLE_NP_KYBER
323+
//#elif defined ENABLE_MR_KYBER
324324

325325
#if defined ENABLE_MRR_TWIST && defined ENABLE_SSE
326326
u64 expRound = 3;
@@ -331,7 +331,7 @@ void Vole_Silent_Rounds_test(const oc::CLP& cmd)
331331
#elif defined ENABLE_MRR
332332
u64 expRound = 3;
333333
baseName = "using DefaultBaseOT = McRosRoy;";
334-
#elif defined ENABLE_NP_KYBER
334+
#elif defined ENABLE_MR_KYBER
335335
u64 expRound = 3;
336336
baseName = "using DefaultBaseOT = MasnyRindalKyber;";
337337
#elif defined ENABLE_SIMPLESTOT_ASM

0 commit comments

Comments
 (0)