1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
|
## cryptest-data-files-location.diff by Jens Peter Secher <jps@debian.org>
##
## Prefix data file names by PACKAGE_DATA_DIR which is set during build.
Index: libcrypto++/bench2.cpp
===================================================================
--- libcrypto++.orig/bench2.cpp 2010-08-11 17:25:57.000000000 +0200
+++ libcrypto++/bench2.cpp 2010-08-11 17:26:03.000000000 +0200
@@ -237,44 +237,44 @@
cout << "<THEAD><TR><TH>Operation<TH>Milliseconds/Operation" << (g_hertz ? "<TH>Megacycles/Operation" : "") << endl;
cout << "\n<TBODY style=\"background: yellow\">";
- BenchMarkCrypto<RSAES<OAEP<SHA> > >("TestData/rsa1024.dat", "RSA 1024", t);
- BenchMarkCrypto<LUCES<OAEP<SHA> > >("TestData/luc1024.dat", "LUC 1024", t);
- BenchMarkCrypto<DLIES<> >("TestData/dlie1024.dat", "DLIES 1024", t);
- BenchMarkCrypto<LUC_IES<> >("TestData/lucc512.dat", "LUCELG 512", t);
+ BenchMarkCrypto<RSAES<OAEP<SHA> > >(PACKAGE_DATA_DIR "TestData/rsa1024.dat", "RSA 1024", t);
+ BenchMarkCrypto<LUCES<OAEP<SHA> > >(PACKAGE_DATA_DIR "TestData/luc1024.dat", "LUC 1024", t);
+ BenchMarkCrypto<DLIES<> >(PACKAGE_DATA_DIR "TestData/dlie1024.dat", "DLIES 1024", t);
+ BenchMarkCrypto<LUC_IES<> >(PACKAGE_DATA_DIR "TestData/lucc512.dat", "LUCELG 512", t);
cout << "\n<TBODY style=\"background: white\">";
- BenchMarkCrypto<RSAES<OAEP<SHA> > >("TestData/rsa2048.dat", "RSA 2048", t);
- BenchMarkCrypto<LUCES<OAEP<SHA> > >("TestData/luc2048.dat", "LUC 2048", t);
- BenchMarkCrypto<DLIES<> >("TestData/dlie2048.dat", "DLIES 2048", t);
- BenchMarkCrypto<LUC_IES<> >("TestData/lucc1024.dat", "LUCELG 1024", t);
+ BenchMarkCrypto<RSAES<OAEP<SHA> > >(PACKAGE_DATA_DIR "TestData/rsa2048.dat", "RSA 2048", t);
+ BenchMarkCrypto<LUCES<OAEP<SHA> > >(PACKAGE_DATA_DIR "TestData/luc2048.dat", "LUC 2048", t);
+ BenchMarkCrypto<DLIES<> >(PACKAGE_DATA_DIR "TestData/dlie2048.dat", "DLIES 2048", t);
+ BenchMarkCrypto<LUC_IES<> >(PACKAGE_DATA_DIR "TestData/lucc1024.dat", "LUCELG 1024", t);
cout << "\n<TBODY style=\"background: yellow\">";
- BenchMarkSignature<RSASS<PSSR, SHA> >("TestData/rsa1024.dat", "RSA 1024", t);
- BenchMarkSignature<RWSS<PSSR, SHA> >("TestData/rw1024.dat", "RW 1024", t);
- BenchMarkSignature<LUCSS<PSSR, SHA> >("TestData/luc1024.dat", "LUC 1024", t);
- BenchMarkSignature<NR<SHA> >("TestData/nr1024.dat", "NR 1024", t);
- BenchMarkSignature<DSA>("TestData/dsa1024.dat", "DSA 1024", t);
- BenchMarkSignature<LUC_HMP<SHA> >("TestData/lucs512.dat", "LUC-HMP 512", t);
- BenchMarkSignature<ESIGN<SHA> >("TestData/esig1023.dat", "ESIGN 1023", t);
- BenchMarkSignature<ESIGN<SHA> >("TestData/esig1536.dat", "ESIGN 1536", t);
+ BenchMarkSignature<RSASS<PSSR, SHA> >(PACKAGE_DATA_DIR "TestData/rsa1024.dat", "RSA 1024", t);
+ BenchMarkSignature<RWSS<PSSR, SHA> >(PACKAGE_DATA_DIR "TestData/rw1024.dat", "RW 1024", t);
+ BenchMarkSignature<LUCSS<PSSR, SHA> >(PACKAGE_DATA_DIR "TestData/luc1024.dat", "LUC 1024", t);
+ BenchMarkSignature<NR<SHA> >(PACKAGE_DATA_DIR "TestData/nr1024.dat", "NR 1024", t);
+ BenchMarkSignature<DSA>(PACKAGE_DATA_DIR "TestData/dsa1024.dat", "DSA 1024", t);
+ BenchMarkSignature<LUC_HMP<SHA> >(PACKAGE_DATA_DIR "TestData/lucs512.dat", "LUC-HMP 512", t);
+ BenchMarkSignature<ESIGN<SHA> >(PACKAGE_DATA_DIR "TestData/esig1023.dat", "ESIGN 1023", t);
+ BenchMarkSignature<ESIGN<SHA> >(PACKAGE_DATA_DIR "TestData/esig1536.dat", "ESIGN 1536", t);
cout << "\n<TBODY style=\"background: white\">";
- BenchMarkSignature<RSASS<PSSR, SHA> >("TestData/rsa2048.dat", "RSA 2048", t);
- BenchMarkSignature<RWSS<PSSR, SHA> >("TestData/rw2048.dat", "RW 2048", t);
- BenchMarkSignature<LUCSS<PSSR, SHA> >("TestData/luc2048.dat", "LUC 2048", t);
- BenchMarkSignature<NR<SHA> >("TestData/nr2048.dat", "NR 2048", t);
- BenchMarkSignature<LUC_HMP<SHA> >("TestData/lucs1024.dat", "LUC-HMP 1024", t);
- BenchMarkSignature<ESIGN<SHA> >("TestData/esig2046.dat", "ESIGN 2046", t);
+ BenchMarkSignature<RSASS<PSSR, SHA> >(PACKAGE_DATA_DIR "TestData/rsa2048.dat", "RSA 2048", t);
+ BenchMarkSignature<RWSS<PSSR, SHA> >(PACKAGE_DATA_DIR "TestData/rw2048.dat", "RW 2048", t);
+ BenchMarkSignature<LUCSS<PSSR, SHA> >(PACKAGE_DATA_DIR "TestData/luc2048.dat", "LUC 2048", t);
+ BenchMarkSignature<NR<SHA> >(PACKAGE_DATA_DIR "TestData/nr2048.dat", "NR 2048", t);
+ BenchMarkSignature<LUC_HMP<SHA> >(PACKAGE_DATA_DIR "TestData/lucs1024.dat", "LUC-HMP 1024", t);
+ BenchMarkSignature<ESIGN<SHA> >(PACKAGE_DATA_DIR "TestData/esig2046.dat", "ESIGN 2046", t);
cout << "\n<TBODY style=\"background: yellow\">";
- BenchMarkKeyAgreement<XTR_DH>("TestData/xtrdh171.dat", "XTR-DH 171", t);
- BenchMarkKeyAgreement<XTR_DH>("TestData/xtrdh342.dat", "XTR-DH 342", t);
- BenchMarkKeyAgreement<DH>("TestData/dh1024.dat", "DH 1024", t);
- BenchMarkKeyAgreement<DH>("TestData/dh2048.dat", "DH 2048", t);
- BenchMarkKeyAgreement<LUC_DH>("TestData/lucd512.dat", "LUCDIF 512", t);
- BenchMarkKeyAgreement<LUC_DH>("TestData/lucd1024.dat", "LUCDIF 1024", t);
- BenchMarkKeyAgreement<MQV>("TestData/mqv1024.dat", "MQV 1024", t);
- BenchMarkKeyAgreement<MQV>("TestData/mqv2048.dat", "MQV 2048", t);
+ BenchMarkKeyAgreement<XTR_DH>(PACKAGE_DATA_DIR "TestData/xtrdh171.dat", "XTR-DH 171", t);
+ BenchMarkKeyAgreement<XTR_DH>(PACKAGE_DATA_DIR "TestData/xtrdh342.dat", "XTR-DH 342", t);
+ BenchMarkKeyAgreement<DH>(PACKAGE_DATA_DIR "TestData/dh1024.dat", "DH 1024", t);
+ BenchMarkKeyAgreement<DH>(PACKAGE_DATA_DIR "TestData/dh2048.dat", "DH 2048", t);
+ BenchMarkKeyAgreement<LUC_DH>(PACKAGE_DATA_DIR "TestData/lucd512.dat", "LUCDIF 512", t);
+ BenchMarkKeyAgreement<LUC_DH>(PACKAGE_DATA_DIR "TestData/lucd1024.dat", "LUCDIF 1024", t);
+ BenchMarkKeyAgreement<MQV>(PACKAGE_DATA_DIR "TestData/mqv1024.dat", "MQV 1024", t);
+ BenchMarkKeyAgreement<MQV>(PACKAGE_DATA_DIR "TestData/mqv2048.dat", "MQV 2048", t);
cout << "\n<TBODY style=\"background: white\">";
{
Index: libcrypto++/test.cpp
===================================================================
--- libcrypto++.orig/test.cpp 2010-08-11 17:25:57.000000000 +0200
+++ libcrypto++/test.cpp 2010-08-11 17:26:20.000000000 +0200
@@ -251,7 +251,7 @@
{
std::string fname = argv[2];
if (fname.find(".txt") == std::string::npos)
- fname = "TestVectors/" + fname + ".txt";
+ fname = PACKAGE_DATA_DIR "TestVectors/" + fname + ".txt";
return !RunTestDataFile(fname.c_str());
}
else if (command == "t")
@@ -337,7 +337,7 @@
AES_CTR_Encrypt(argv[2], argv[3], argv[4], argv[5]);
else if (command == "h")
{
- FileSource usage("TestData/usage.dat", true, new FileSink(cout));
+ FileSource usage(PACKAGE_DATA_DIR "TestData/usage.dat", true, new FileSink(cout));
return 1;
}
else if (command == "V")
Index: libcrypto++/validat1.cpp
===================================================================
--- libcrypto++.orig/validat1.cpp 2010-08-11 17:25:57.000000000 +0200
+++ libcrypto++/validat1.cpp 2010-08-11 17:26:03.000000000 +0200
@@ -55,7 +55,7 @@
pass=ValidateMD2() && pass;
pass=ValidateMD5() && pass;
pass=ValidateSHA() && pass;
- pass=RunTestDataFile("TestVectors/sha3.txt") && pass;
+ pass=RunTestDataFile(PACKAGE_DATA_DIR "TestVectors/sha3.txt") && pass;
pass=ValidateTiger() && pass;
pass=ValidateRIPEMD() && pass;
pass=ValidatePanama() && pass;
@@ -94,8 +94,8 @@
pass=ValidateCCM() && pass;
pass=ValidateGCM() && pass;
pass=ValidateCMAC() && pass;
- pass=RunTestDataFile("TestVectors/eax.txt") && pass;
- pass=RunTestDataFile("TestVectors/seed.txt") && pass;
+ pass=RunTestDataFile(PACKAGE_DATA_DIR "TestVectors/eax.txt") && pass;
+ pass=RunTestDataFile(PACKAGE_DATA_DIR "TestVectors/seed.txt") && pass;
pass=ValidateBBS() && pass;
pass=ValidateDH() && pass;
@@ -511,12 +511,12 @@
{
cout << "\nDES validation suite running...\n\n";
- FileSource valdata("TestData/descert.dat", true, new HexDecoder);
+ FileSource valdata(PACKAGE_DATA_DIR "TestData/descert.dat", true, new HexDecoder);
bool pass = BlockTransformationTest(FixedRoundsCipherFactory<DESEncryption, DESDecryption>(), valdata);
cout << "\nTesting EDE2, EDE3, and XEX3 variants...\n\n";
- FileSource valdata1("TestData/3desval.dat", true, new HexDecoder);
+ FileSource valdata1(PACKAGE_DATA_DIR "TestData/3desval.dat", true, new HexDecoder);
pass = BlockTransformationTest(FixedRoundsCipherFactory<DES_EDE2_Encryption, DES_EDE2_Decryption>(), valdata1, 1) && pass;
pass = BlockTransformationTest(FixedRoundsCipherFactory<DES_EDE3_Encryption, DES_EDE3_Decryption>(), valdata1, 1) && pass;
pass = BlockTransformationTest(FixedRoundsCipherFactory<DES_XEX3_Encryption, DES_XEX3_Decryption>(), valdata1, 1) && pass;
@@ -858,7 +858,7 @@
{
cout << "\nIDEA validation suite running...\n\n";
- FileSource valdata("TestData/ideaval.dat", true, new HexDecoder);
+ FileSource valdata(PACKAGE_DATA_DIR "TestData/ideaval.dat", true, new HexDecoder);
return BlockTransformationTest(FixedRoundsCipherFactory<IDEAEncryption, IDEADecryption>(), valdata);
}
@@ -866,7 +866,7 @@
{
cout << "\nSAFER validation suite running...\n\n";
- FileSource valdata("TestData/saferval.dat", true, new HexDecoder);
+ FileSource valdata(PACKAGE_DATA_DIR "TestData/saferval.dat", true, new HexDecoder);
bool pass = true;
pass = BlockTransformationTest(VariableRoundsCipherFactory<SAFER_K_Encryption, SAFER_K_Decryption>(8,6), valdata, 4) && pass;
pass = BlockTransformationTest(VariableRoundsCipherFactory<SAFER_K_Encryption, SAFER_K_Decryption>(16,12), valdata, 4) && pass;
@@ -879,7 +879,7 @@
{
cout << "\nRC2 validation suite running...\n\n";
- FileSource valdata("TestData/rc2val.dat", true, new HexDecoder);
+ FileSource valdata(PACKAGE_DATA_DIR "TestData/rc2val.dat", true, new HexDecoder);
HexEncoder output(new FileSink(cout));
SecByteBlock plain(RC2Encryption::BLOCKSIZE), cipher(RC2Encryption::BLOCKSIZE), out(RC2Encryption::BLOCKSIZE), outplain(RC2Encryption::BLOCKSIZE);
SecByteBlock key(128);
@@ -1089,7 +1089,7 @@
{
cout << "\nRC5 validation suite running...\n\n";
- FileSource valdata("TestData/rc5val.dat", true, new HexDecoder);
+ FileSource valdata(PACKAGE_DATA_DIR "TestData/rc5val.dat", true, new HexDecoder);
return BlockTransformationTest(VariableRoundsCipherFactory<RC5Encryption, RC5Decryption>(16, 12), valdata);
}
@@ -1097,7 +1097,7 @@
{
cout << "\nRC6 validation suite running...\n\n";
- FileSource valdata("TestData/rc6val.dat", true, new HexDecoder);
+ FileSource valdata(PACKAGE_DATA_DIR "TestData/rc6val.dat", true, new HexDecoder);
bool pass = true;
pass = BlockTransformationTest(FixedRoundsCipherFactory<RC6Encryption, RC6Decryption>(16), valdata, 2) && pass;
pass = BlockTransformationTest(FixedRoundsCipherFactory<RC6Encryption, RC6Decryption>(24), valdata, 2) && pass;
@@ -1109,7 +1109,7 @@
{
cout << "\nMARS validation suite running...\n\n";
- FileSource valdata("TestData/marsval.dat", true, new HexDecoder);
+ FileSource valdata(PACKAGE_DATA_DIR "TestData/marsval.dat", true, new HexDecoder);
bool pass = true;
pass = BlockTransformationTest(FixedRoundsCipherFactory<MARSEncryption, MARSDecryption>(16), valdata, 4) && pass;
pass = BlockTransformationTest(FixedRoundsCipherFactory<MARSEncryption, MARSDecryption>(24), valdata, 3) && pass;
@@ -1121,12 +1121,12 @@
{
cout << "\nRijndael (AES) validation suite running...\n\n";
- FileSource valdata("TestData/rijndael.dat", true, new HexDecoder);
+ FileSource valdata(PACKAGE_DATA_DIR "TestData/rijndael.dat", true, new HexDecoder);
bool pass = true;
pass = BlockTransformationTest(FixedRoundsCipherFactory<RijndaelEncryption, RijndaelDecryption>(16), valdata, 4) && pass;
pass = BlockTransformationTest(FixedRoundsCipherFactory<RijndaelEncryption, RijndaelDecryption>(24), valdata, 3) && pass;
pass = BlockTransformationTest(FixedRoundsCipherFactory<RijndaelEncryption, RijndaelDecryption>(32), valdata, 2) && pass;
- pass = RunTestDataFile("TestVectors/aes.txt") && pass;
+ pass = RunTestDataFile(PACKAGE_DATA_DIR "TestVectors/aes.txt") && pass;
return pass;
}
@@ -1134,7 +1134,7 @@
{
cout << "\nTwofish validation suite running...\n\n";
- FileSource valdata("TestData/twofishv.dat", true, new HexDecoder);
+ FileSource valdata(PACKAGE_DATA_DIR "TestData/twofishv.dat", true, new HexDecoder);
bool pass = true;
pass = BlockTransformationTest(FixedRoundsCipherFactory<TwofishEncryption, TwofishDecryption>(16), valdata, 4) && pass;
pass = BlockTransformationTest(FixedRoundsCipherFactory<TwofishEncryption, TwofishDecryption>(24), valdata, 3) && pass;
@@ -1147,7 +1147,7 @@
{
cout << "\nSerpent validation suite running...\n\n";
- FileSource valdata("TestData/serpentv.dat", true, new HexDecoder);
+ FileSource valdata(PACKAGE_DATA_DIR "TestData/serpentv.dat", true, new HexDecoder);
bool pass = true;
pass = BlockTransformationTest(FixedRoundsCipherFactory<SerpentEncryption, SerpentDecryption>(16), valdata, 5) && pass;
pass = BlockTransformationTest(FixedRoundsCipherFactory<SerpentEncryption, SerpentDecryption>(24), valdata, 4) && pass;
@@ -1193,7 +1193,7 @@
{
cout << "\n3-WAY validation suite running...\n\n";
- FileSource valdata("TestData/3wayval.dat", true, new HexDecoder);
+ FileSource valdata(PACKAGE_DATA_DIR "TestData/3wayval.dat", true, new HexDecoder);
return BlockTransformationTest(FixedRoundsCipherFactory<ThreeWayEncryption, ThreeWayDecryption>(), valdata);
}
@@ -1200,7 +1200,7 @@
{
cout << "\nGOST validation suite running...\n\n";
- FileSource valdata("TestData/gostval.dat", true, new HexDecoder);
+ FileSource valdata(PACKAGE_DATA_DIR "TestData/gostval.dat", true, new HexDecoder);
return BlockTransformationTest(FixedRoundsCipherFactory<GOSTEncryption, GOSTDecryption>(), valdata);
}
@@ -1208,7 +1208,7 @@
{
cout << "\nSHARK validation suite running...\n\n";
- FileSource valdata("TestData/sharkval.dat", true, new HexDecoder);
+ FileSource valdata(PACKAGE_DATA_DIR "TestData/sharkval.dat", true, new HexDecoder);
return BlockTransformationTest(FixedRoundsCipherFactory<SHARKEncryption, SHARKDecryption>(), valdata);
}
@@ -1218,14 +1218,14 @@
cout << "\nCAST-128 validation suite running...\n\n";
- FileSource val128("TestData/cast128v.dat", true, new HexDecoder);
+ FileSource val128(PACKAGE_DATA_DIR "TestData/cast128v.dat", true, new HexDecoder);
pass = BlockTransformationTest(FixedRoundsCipherFactory<CAST128Encryption, CAST128Decryption>(16), val128, 1) && pass;
pass = BlockTransformationTest(FixedRoundsCipherFactory<CAST128Encryption, CAST128Decryption>(10), val128, 1) && pass;
pass = BlockTransformationTest(FixedRoundsCipherFactory<CAST128Encryption, CAST128Decryption>(5), val128, 1) && pass;
cout << "\nCAST-256 validation suite running...\n\n";
- FileSource val256("TestData/cast256v.dat", true, new HexDecoder);
+ FileSource val256(PACKAGE_DATA_DIR "TestData/cast256v.dat", true, new HexDecoder);
pass = BlockTransformationTest(FixedRoundsCipherFactory<CAST256Encryption, CAST256Decryption>(16), val256, 1) && pass;
pass = BlockTransformationTest(FixedRoundsCipherFactory<CAST256Encryption, CAST256Decryption>(24), val256, 1) && pass;
pass = BlockTransformationTest(FixedRoundsCipherFactory<CAST256Encryption, CAST256Decryption>(32), val256, 1) && pass;
@@ -1237,7 +1237,7 @@
{
cout << "\nSquare validation suite running...\n\n";
- FileSource valdata("TestData/squareva.dat", true, new HexDecoder);
+ FileSource valdata(PACKAGE_DATA_DIR "TestData/squareva.dat", true, new HexDecoder);
return BlockTransformationTest(FixedRoundsCipherFactory<SquareEncryption, SquareDecryption>(), valdata);
}
@@ -1245,7 +1245,7 @@
{
cout << "\nSKIPJACK validation suite running...\n\n";
- FileSource valdata("TestData/skipjack.dat", true, new HexDecoder);
+ FileSource valdata(PACKAGE_DATA_DIR "TestData/skipjack.dat", true, new HexDecoder);
return BlockTransformationTest(FixedRoundsCipherFactory<SKIPJACKEncryption, SKIPJACKDecryption>(), valdata);
}
@@ -1349,7 +1349,7 @@
cout << "\nSHACAL-2 validation suite running...\n\n";
bool pass = true;
- FileSource valdata("TestData/shacal2v.dat", true, new HexDecoder);
+ FileSource valdata(PACKAGE_DATA_DIR "TestData/shacal2v.dat", true, new HexDecoder);
pass = BlockTransformationTest(FixedRoundsCipherFactory<SHACAL2Encryption, SHACAL2Decryption>(16), valdata, 4) && pass;
pass = BlockTransformationTest(FixedRoundsCipherFactory<SHACAL2Encryption, SHACAL2Decryption>(64), valdata, 10) && pass;
return pass;
@@ -1360,7 +1360,7 @@
cout << "\nCamellia validation suite running...\n\n";
bool pass = true;
- FileSource valdata("TestData/camellia.dat", true, new HexDecoder);
+ FileSource valdata(PACKAGE_DATA_DIR "TestData/camellia.dat", true, new HexDecoder);
pass = BlockTransformationTest(FixedRoundsCipherFactory<CamelliaEncryption, CamelliaDecryption>(16), valdata, 15) && pass;
pass = BlockTransformationTest(FixedRoundsCipherFactory<CamelliaEncryption, CamelliaDecryption>(24), valdata, 15) && pass;
pass = BlockTransformationTest(FixedRoundsCipherFactory<CamelliaEncryption, CamelliaDecryption>(32), valdata, 15) && pass;
@@ -1371,38 +1371,38 @@
{
cout << "\nSalsa validation suite running...\n";
- return RunTestDataFile("TestVectors/salsa.txt");
+ return RunTestDataFile(PACKAGE_DATA_DIR "TestVectors/salsa.txt");
}
bool ValidateSosemanuk()
{
cout << "\nSosemanuk validation suite running...\n";
- return RunTestDataFile("TestVectors/sosemanuk.txt");
+ return RunTestDataFile(PACKAGE_DATA_DIR "TestVectors/sosemanuk.txt");
}
bool ValidateVMAC()
{
cout << "\nVMAC validation suite running...\n";
- return RunTestDataFile("TestVectors/vmac.txt");
+ return RunTestDataFile(PACKAGE_DATA_DIR "TestVectors/vmac.txt");
}
bool ValidateCCM()
{
cout << "\nAES/CCM validation suite running...\n";
- return RunTestDataFile("TestVectors/ccm.txt");
+ return RunTestDataFile(PACKAGE_DATA_DIR "TestVectors/ccm.txt");
}
bool ValidateGCM()
{
cout << "\nAES/GCM validation suite running...\n";
cout << "\n2K tables:";
- bool pass = RunTestDataFile("TestVectors/gcm.txt", MakeParameters(Name::TableSize(), (int)2048));
+ bool pass = RunTestDataFile(PACKAGE_DATA_DIR "TestVectors/gcm.txt", MakeParameters(Name::TableSize(), (int)2048));
cout << "\n64K tables:";
- return RunTestDataFile("TestVectors/gcm.txt", MakeParameters(Name::TableSize(), (int)64*1024)) && pass;
+ return RunTestDataFile(PACKAGE_DATA_DIR "TestVectors/gcm.txt", MakeParameters(Name::TableSize(), (int)64*1024)) && pass;
}
bool ValidateCMAC()
{
cout << "\nCMAC validation suite running...\n";
- return RunTestDataFile("TestVectors/cmac.txt");
+ return RunTestDataFile(PACKAGE_DATA_DIR "TestVectors/cmac.txt");
}
Index: libcrypto++/validat2.cpp
===================================================================
--- libcrypto++.orig/validat2.cpp 2010-08-11 17:25:57.000000000 +0200
+++ libcrypto++/validat2.cpp 2010-08-11 17:26:03.000000000 +0200
@@ -268,7 +268,7 @@
"\x69\x94\xac\x04\xf3\x41\xb5\x7d\x05\x20\x2d\x42\x8f\xb2\xa2\x7b"
"\x5c\x77\xdf\xd9\xb1\x5b\xfc\x3d\x55\x93\x53\x50\x34\x10\xc1\xe1";
- FileSource keys("TestData/rsa512a.dat", true, new HexDecoder);
+ FileSource keys(PACKAGE_DATA_DIR "TestData/rsa512a.dat", true, new HexDecoder);
Weak::RSASSA_PKCS1v15_MD2_Signer rsaPriv(keys);
Weak::RSASSA_PKCS1v15_MD2_Verifier rsaPub(rsaPriv);
@@ -293,7 +293,7 @@
cout << "invalid signature verification\n";
}
{
- FileSource keys("TestData/rsa1024.dat", true, new HexDecoder);
+ FileSource keys(PACKAGE_DATA_DIR "TestData/rsa1024.dat", true, new HexDecoder);
RSAES_PKCS1v15_Decryptor rsaPriv(keys);
RSAES_PKCS1v15_Encryptor rsaPub(rsaPriv);
@@ -320,8 +320,8 @@
bq.Put(oaepSeed, 20);
FixedRNG rng(bq);
- FileSource privFile("TestData/rsa400pv.dat", true, new HexDecoder);
- FileSource pubFile("TestData/rsa400pb.dat", true, new HexDecoder);
+ FileSource privFile(PACKAGE_DATA_DIR "TestData/rsa400pv.dat", true, new HexDecoder);
+ FileSource pubFile(PACKAGE_DATA_DIR "TestData/rsa400pb.dat", true, new HexDecoder);
RSAES_OAEP_SHA_Decryptor rsaPriv;
rsaPriv.AccessKey().BERDecodePrivateKey(privFile, false, 0);
RSAES_OAEP_SHA_Encryptor rsaPub(pubFile);
@@ -344,7 +344,7 @@
{
cout << "\nDH validation suite running...\n\n";
- FileSource f("TestData/dh1024.dat", true, new HexDecoder());
+ FileSource f(PACKAGE_DATA_DIR "TestData/dh1024.dat", true, new HexDecoder());
DH dh(f);
return SimpleKeyAgreementValidate(dh);
}
@@ -353,7 +353,7 @@
{
cout << "\nMQV validation suite running...\n\n";
- FileSource f("TestData/mqv1024.dat", true, new HexDecoder());
+ FileSource f(PACKAGE_DATA_DIR "TestData/mqv1024.dat", true, new HexDecoder());
MQV mqv(f);
return AuthenticatedKeyAgreementValidate(mqv);
}
@@ -362,7 +362,7 @@
{
cout << "\nLUC-DH validation suite running...\n\n";
- FileSource f("TestData/lucd512.dat", true, new HexDecoder());
+ FileSource f(PACKAGE_DATA_DIR "TestData/lucd512.dat", true, new HexDecoder());
LUC_DH dh(f);
return SimpleKeyAgreementValidate(dh);
}
@@ -371,7 +371,7 @@
{
cout << "\nXTR-DH validation suite running...\n\n";
- FileSource f("TestData/xtrdh171.dat", true, new HexDecoder());
+ FileSource f(PACKAGE_DATA_DIR "TestData/xtrdh171.dat", true, new HexDecoder());
XTR_DH dh(f);
return SimpleKeyAgreementValidate(dh);
}
@@ -381,7 +381,7 @@
cout << "\nElGamal validation suite running...\n\n";
bool pass = true;
{
- FileSource fc("TestData/elgc1024.dat", true, new HexDecoder);
+ FileSource fc(PACKAGE_DATA_DIR "TestData/elgc1024.dat", true, new HexDecoder);
ElGamalDecryptor privC(fc);
ElGamalEncryptor pubC(privC);
privC.AccessKey().Precompute();
@@ -399,7 +399,7 @@
cout << "\nDLIES validation suite running...\n\n";
bool pass = true;
{
- FileSource fc("TestData/dlie1024.dat", true, new HexDecoder);
+ FileSource fc(PACKAGE_DATA_DIR "TestData/dlie1024.dat", true, new HexDecoder);
DLIES<>::Decryptor privC(fc);
DLIES<>::Encryptor pubC(privC);
pass = CryptoSystemValidate(privC, pubC) && pass;
@@ -422,7 +422,7 @@
cout << "\nNR validation suite running...\n\n";
bool pass = true;
{
- FileSource f("TestData/nr2048.dat", true, new HexDecoder);
+ FileSource f(PACKAGE_DATA_DIR "TestData/nr2048.dat", true, new HexDecoder);
NR<SHA>::Signer privS(f);
privS.AccessKey().Precompute();
NR<SHA>::Verifier pubS(privS);
@@ -444,14 +444,14 @@
cout << "\nDSA validation suite running...\n\n";
bool pass = true;
- FileSource fs1("TestData/dsa1024.dat", true, new HexDecoder());
+ FileSource fs1(PACKAGE_DATA_DIR "TestData/dsa1024.dat", true, new HexDecoder());
DSA::Signer priv(fs1);
DSA::Verifier pub(priv);
- FileSource fs2("TestData/dsa1024b.dat", true, new HexDecoder());
+ FileSource fs2(PACKAGE_DATA_DIR "TestData/dsa1024b.dat", true, new HexDecoder());
DSA::Verifier pub1(fs2);
assert(pub.GetKey() == pub1.GetKey());
pass = SignatureValidate(priv, pub, thorough) && pass;
- pass = RunTestDataFile("TestVectors/dsa.txt", g_nullNameValuePairs, thorough) && pass;
+ pass = RunTestDataFile(PACKAGE_DATA_DIR "TestVectors/dsa.txt", g_nullNameValuePairs, thorough) && pass;
return pass;
}
@@ -461,7 +461,7 @@
bool pass=true;
{
- FileSource f("TestData/luc1024.dat", true, new HexDecoder);
+ FileSource f(PACKAGE_DATA_DIR "TestData/luc1024.dat", true, new HexDecoder);
LUCSSA_PKCS1v15_SHA_Signer priv(f);
LUCSSA_PKCS1v15_SHA_Verifier pub(priv);
pass = SignatureValidate(priv, pub) && pass;
@@ -520,14 +520,14 @@
{
cout << "\nLUC-HMP validation suite running...\n\n";
- FileSource f("TestData/lucs512.dat", true, new HexDecoder);
+ FileSource f(PACKAGE_DATA_DIR "TestData/lucs512.dat", true, new HexDecoder);
LUC_HMP<SHA>::Signer privS(f);
LUC_HMP<SHA>::Verifier pubS(privS);
bool pass = SignatureValidate(privS, pubS);
cout << "\nLUC-IES validation suite running...\n\n";
- FileSource fc("TestData/lucc512.dat", true, new HexDecoder);
+ FileSource fc(PACKAGE_DATA_DIR "TestData/lucc512.dat", true, new HexDecoder);
LUC_IES<>::Decryptor privC(fc);
LUC_IES<>::Encryptor pubC(privC);
pass = CryptoSystemValidate(privC, pubC) && pass;
@@ -541,7 +541,7 @@
bool pass=true;
{
- FileSource f("TestData/rabi1024.dat", true, new HexDecoder);
+ FileSource f(PACKAGE_DATA_DIR "TestData/rabi1024.dat", true, new HexDecoder);
RabinSS<PSSR, SHA>::Signer priv(f);
RabinSS<PSSR, SHA>::Verifier pub(priv);
pass = SignatureValidate(priv, pub) && pass;
@@ -558,7 +558,7 @@
{
cout << "\nRW validation suite running...\n\n";
- FileSource f("TestData/rw1024.dat", true, new HexDecoder);
+ FileSource f(PACKAGE_DATA_DIR "TestData/rw1024.dat", true, new HexDecoder);
RWSS<PSSR, SHA>::Signer priv(f);
RWSS<PSSR, SHA>::Verifier pub(priv);
@@ -570,7 +570,7 @@
{
cout << "\nBlumGoldwasser validation suite running...\n\n";
- FileSource f("TestData/blum512.dat", true, new HexDecoder);
+ FileSource f(PACKAGE_DATA_DIR "TestData/blum512.dat", true, new HexDecoder);
BlumGoldwasserPrivateKey priv(f);
BlumGoldwasserPublicKey pub(priv);
@@ -740,7 +740,7 @@
"\x74\x02\x37\x0E\xED\x0A\x06\xAD\xF4\x15\x65\xB8\xE1\xD1\x45\xAE\x39\x19\xB4\xFF\x5D\xF1\x45\x7B\xE0\xFE\x72\xED\x11\x92\x8F\x61\x41\x4F\x02\x00\xF2\x76\x6F\x7C"
"\x79\xA2\xE5\x52\x20\x5D\x97\x5E\xFE\x39\xAE\x21\x10\xFB\x35\xF4\x80\x81\x41\x13\xDD\xE8\x5F\xCA\x1E\x4F\xF8\x9B\xB2\x68\xFB\x28";
- FileSource keys("TestData/esig1536.dat", true, new HexDecoder);
+ FileSource keys(PACKAGE_DATA_DIR "TestData/esig1536.dat", true, new HexDecoder);
ESIGN<SHA>::Signer signer(keys);
ESIGN<SHA>::Verifier verifier(signer);
Index: libcrypto++/validat3.cpp
===================================================================
--- libcrypto++.orig/validat3.cpp 2010-08-11 17:25:57.000000000 +0200
+++ libcrypto++/validat3.cpp 2010-08-11 17:26:20.000000000 +0200
@@ -168,13 +168,13 @@
bool ValidateSHA()
{
cout << "\nSHA validation suite running...\n\n";
- return RunTestDataFile("TestVectors/sha.txt");
+ return RunTestDataFile(PACKAGE_DATA_DIR "TestVectors/sha.txt");
}
bool ValidateSHA2()
{
cout << "\nSHA validation suite running...\n\n";
- return RunTestDataFile("TestVectors/sha.txt");
+ return RunTestDataFile(PACKAGE_DATA_DIR "TestVectors/sha.txt");
}
bool ValidateTiger()
@@ -321,12 +321,12 @@
bool ValidatePanama()
{
- return RunTestDataFile("TestVectors/panama.txt");
+ return RunTestDataFile(PACKAGE_DATA_DIR "TestVectors/panama.txt");
}
bool ValidateWhirlpool()
{
- return RunTestDataFile("TestVectors/whrlpool.txt");
+ return RunTestDataFile(PACKAGE_DATA_DIR "TestVectors/whrlpool.txt");
}
#ifdef CRYPTOPP_REMOVED
@@ -393,7 +393,7 @@
bool ValidateHMAC()
{
- return RunTestDataFile("TestVectors/hmac.txt");
+ return RunTestDataFile(PACKAGE_DATA_DIR "TestVectors/hmac.txt");
}
#ifdef CRYPTOPP_REMOVED
|
