Skip to content

Commit ef221a8

Browse files
committed
ci debug
1 parent d9525ea commit ef221a8

File tree

2 files changed

+37
-13
lines changed

2 files changed

+37
-13
lines changed

libOTe/Vole/Silent/SilentVoleReceiver.h

+14-9
Original file line numberDiff line numberDiff line change
@@ -149,15 +149,7 @@ namespace osuCrypto
149149
#else
150150
using BaseOT = DefaultBaseOT;
151151
#endif
152-
153-
//auto choice = BitVector{};
154-
//auto bb = BitVector{};
155-
//auto msg = AlignedUnVector<block>{};
156-
//auto baseVole = std::vector<block>{};
157-
//auto baseOt = BaseOT{};
158-
//auto nv = NoisyVoleReceiver<F, G, Ctx>{};
159-
160-
152+
std::cout << "r gen 1" << std::endl;
161153
setTimePoint("SilentVoleReceiver.genSilent.begin");
162154
if (isConfigured() == false)
163155
throw std::runtime_error("configure must be called first");
@@ -186,6 +178,7 @@ namespace osuCrypto
186178
auto nv = NoisyVoleReceiver<F, G, Ctx>{};
187179
if (mTimer)
188180
nv.setTimer(*mTimer);
181+
std::cout << "r gen 2" << std::endl;
189182

190183
if (mBaseType == SilentBaseType::BaseExtend)
191184
{
@@ -202,6 +195,7 @@ namespace osuCrypto
202195
auto bb = BitVector{ mOtExtSender->baseOtCount() };
203196
bb.randomize(prng);
204197
choice.append(bb);
198+
std::cout << "r gen 3" << std::endl;
205199

206200
co_await(mOtExtRecver->receive(choice, msg, prng, chl));
207201

@@ -210,6 +204,7 @@ namespace osuCrypto
210204
msg.size() - mOtExtSender->baseOtCount(),
211205
mOtExtSender->baseOtCount()),
212206
bb);
207+
std::cout << "r gen 4" << std::endl;
213208

214209
msg.resize(msg.size() - mOtExtSender->baseOtCount());
215210
co_await(nv.receive(noiseVals, baseAs, prng, *mOtExtSender, chl, mCtx));
@@ -218,14 +213,19 @@ namespace osuCrypto
218213
{
219214
auto chl2 = chl.fork();
220215
auto prng2 = prng.fork();
216+
std::cout << "r gen 5" << std::endl;
221217

222218
co_await(
223219
macoro::when_all_ready(
224220
nv.receive(noiseVals, baseAs, prng2, *mOtExtSender, chl2, mCtx),
225221
mOtExtRecver->receive(choice, msg, prng, chl)
226222
));
223+
std::cout << "r gen 6" << std::endl;
224+
227225
}
228226
#else
227+
std::cout << "r gen 7" << std::endl;
228+
229229
throw std::runtime_error("soft spoken must be enabled");
230230
#endif
231231
}
@@ -234,17 +234,22 @@ namespace osuCrypto
234234
auto chl2 = chl.fork();
235235
auto prng2 = prng.fork();
236236
BaseOT baseOt;
237+
std::cout << "r gen 8" << std::endl;
237238

238239
co_await(
239240
macoro::when_all_ready(
240241
baseOt.receive(choice, msg, prng, chl),
241242
nv.receive(noiseVals, baseAs, prng2, baseOt, chl2, mCtx))
242243
);
244+
245+
std::cout << "r gen 8" << std::endl;
246+
243247
}
244248

245249
setSilentBaseOts(msg, baseAs);
246250
setTimePoint("SilentVoleReceiver.genSilent.done");
247251
#else
252+
std::cout << "r gen 9" << std::endl;
248253
throw std::runtime_error("LIBOTE_HAS_BASE_OT = false, must enable relic, sodium or simplest ot asm." LOCATION);
249254
co_return;
250255
#endif

libOTe/Vole/Silent/SilentVoleSender.h

+23-4
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ namespace osuCrypto
125125
// otherwise we perform a base OT protocol to
126126
// generate the needed OTs.
127127
task<> genSilentBaseOts(PRNG& prng, Socket& chl, F delta)
128-
{
128+
try {
129129
#ifdef LIBOTE_HAS_BASE_OT
130130

131131
#if defined ENABLE_MRR_TWIST && defined ENABLE_SSE
@@ -139,15 +139,17 @@ namespace osuCrypto
139139
#else
140140
using BaseOT = DefaultBaseOT;
141141
#endif
142+
std::cout << "s gen 1" << std::endl;
142143

143144
setTimePoint("SilentVoleSender.genSilent.begin");
144145

145146
if (isConfigured() == false)
146147
{
147-
chl.close();
148148
throw std::runtime_error("configure must be called first");
149149
}
150150

151+
std::cout << "s gen 2" << std::endl;
152+
151153
// compute the correlation for the noisy coordinates.
152154
auto b = VecF{};
153155
mCtx.resize(b, baseVoleCount());
@@ -166,6 +168,8 @@ namespace osuCrypto
166168

167169
if (mOtExtRecver->hasBaseOts() == false)
168170
{
171+
std::cout << "s gen 3" << std::endl;
172+
169173
msg.resize(msg.size() + mOtExtRecver->baseOtCount());
170174
co_await(mOtExtSender->send(msg, prng, chl));
171175

@@ -174,42 +178,57 @@ namespace osuCrypto
174178
msg.size() - mOtExtRecver->baseOtCount(),
175179
mOtExtRecver->baseOtCount()));
176180
msg.resize(msg.size() - mOtExtRecver->baseOtCount());
181+
std::cout << "s gen 4" << std::endl;
177182

178183
co_await(nv.send(delta, b, prng, *mOtExtRecver, chl, mCtx));
179184
}
180185
else
181186
{
182187
auto chl2 = chl.fork();
183188
auto prng2 = prng.fork();
184-
189+
std::cout << "s gen 5" << std::endl;
190+
185191
co_await(
186192
macoro::when_all_ready(
187193
nv.send(delta, b, prng2, *mOtExtRecver, chl2, mCtx),
188194
mOtExtSender->send(msg, prng, chl)));
195+
196+
std::cout << "s gen 6" << std::endl;
197+
189198
}
190199
#else
191-
throw RTE_LOC;
200+
std::cout << "s gen 7" << std::endl;
201+
throw std::runtime_error("ENABLE_SOFTSPOKEN_OT = false, must enable soft spoken ." LOCATION);
192202
#endif
193203
}
194204
else
195205
{
196206
auto chl2 = chl.fork();
197207
auto prng2 = prng.fork();
198208
auto baseOt = BaseOT{};
209+
std::cout << "s gen 7" << std::endl;
199210

200211
co_await(
201212
macoro::when_all_ready(
202213
nv.send(delta, b, prng2, baseOt, chl2, mCtx),
203214
baseOt.send(msg, prng, chl)));
215+
std::cout << "s gen 8" << std::endl;
216+
204217
}
205218

206219
setSilentBaseOts(msg, b);
207220
setTimePoint("SilentVoleSender.genSilent.done");
208221
#else
222+
std::cout << "s gen 9" << std::endl;
209223
throw std::runtime_error("LIBOTE_HAS_BASE_OT = false, must enable relic, sodium or simplest ot asm." LOCATION);
210224
co_return;
211225
#endif
212226
}
227+
catch (...)
228+
{
229+
chl.close();
230+
throw;
231+
}
213232

214233
// configure the silent OT extension. This sets
215234
// the parameters and figures out how many base OT

0 commit comments

Comments
 (0)