diff options
author | Daniel Borkmann <dborkman@redhat.com> | 2013-11-11 06:20:37 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-11-11 14:32:15 -0500 |
commit | a6a9c0f1bf5a9a5faa605773ea75e0b93c3ab108 (patch) | |
tree | aa0aee61cf99280eaa533956438c9daec3a2afc7 | |
parent | a98814cef87946d2708812ad9f8b1e03b8366b6f (diff) |
random32: add test cases for taus113 implementation
We generated a battery of 100 test cases from GSL taus113 implemention
and compare the results from a particular seed and a particular
iteration with our implementation in the kernel. We have verified on
32 and 64 bit machines that our taus113 kernel implementation gives
same results as GSL taus113 implementation:
[ 0.147370] prandom: seed boundary self test passed
[ 0.148078] prandom: 100 self tests passed
This is a Kconfig option that is disabled on default, just like the
crc32 init selftests in order to not unnecessary slow down boot process.
We also refactored out prandom_seed_very_weak() as it's now used in
multiple places in order to reduce redundant code.
GSL code we used for generating test cases:
int i, j;
srand(time(NULL));
for (i = 0; i < 100; ++i) {
int iteration = 500 + (rand() % 500);
gsl_rng_default_seed = rand() + 1;
gsl_rng *r = gsl_rng_alloc(gsl_rng_taus113);
printf("\t{ %lu, ", gsl_rng_default_seed);
for (j = 0; j < iteration - 1; ++j)
gsl_rng_get(r);
printf("%u, %lu },\n", iteration, gsl_rng_get(r));
gsl_rng_free(r);
}
Joint work with Hannes Frederic Sowa.
Cc: Florian Weimer <fweimer@redhat.com>
Cc: Theodore Ts'o <tytso@mit.edu>
Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
Signed-off-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | lib/Kconfig | 7 | ||||
-rw-r--r-- | lib/random32.c | 195 |
2 files changed, 196 insertions, 6 deletions
diff --git a/lib/Kconfig b/lib/Kconfig index b3c8be0da17f..75485e163ca3 100644 --- a/lib/Kconfig +++ b/lib/Kconfig | |||
@@ -189,6 +189,13 @@ config AUDIT_GENERIC | |||
189 | depends on AUDIT && !AUDIT_ARCH | 189 | depends on AUDIT && !AUDIT_ARCH |
190 | default y | 190 | default y |
191 | 191 | ||
192 | config RANDOM32_SELFTEST | ||
193 | bool "PRNG perform self test on init" | ||
194 | default n | ||
195 | help | ||
196 | This option enables the 32 bit PRNG library functions to perform a | ||
197 | self test on initialization. | ||
198 | |||
192 | # | 199 | # |
193 | # compression support is select'ed if needed | 200 | # compression support is select'ed if needed |
194 | # | 201 | # |
diff --git a/lib/random32.c b/lib/random32.c index 27adb753180f..82da4f4c3489 100644 --- a/lib/random32.c +++ b/lib/random32.c | |||
@@ -38,6 +38,11 @@ | |||
38 | #include <linux/export.h> | 38 | #include <linux/export.h> |
39 | #include <linux/jiffies.h> | 39 | #include <linux/jiffies.h> |
40 | #include <linux/random.h> | 40 | #include <linux/random.h> |
41 | #include <linux/sched.h> | ||
42 | |||
43 | #ifdef CONFIG_RANDOM32_SELFTEST | ||
44 | static void __init prandom_state_selftest(void); | ||
45 | #endif | ||
41 | 46 | ||
42 | static DEFINE_PER_CPU(struct rnd_state, net_rand_state); | 47 | static DEFINE_PER_CPU(struct rnd_state, net_rand_state); |
43 | 48 | ||
@@ -142,6 +147,23 @@ static void prandom_warmup(struct rnd_state *state) | |||
142 | prandom_u32_state(state); | 147 | prandom_u32_state(state); |
143 | } | 148 | } |
144 | 149 | ||
150 | static void prandom_seed_very_weak(struct rnd_state *state, u32 seed) | ||
151 | { | ||
152 | /* Note: This sort of seeding is ONLY used in test cases and | ||
153 | * during boot at the time from core_initcall until late_initcall | ||
154 | * as we don't have a stronger entropy source available yet. | ||
155 | * After late_initcall, we reseed entire state, we have to (!), | ||
156 | * otherwise an attacker just needs to search 32 bit space to | ||
157 | * probe for our internal 128 bit state if he knows a couple | ||
158 | * of prandom32 outputs! | ||
159 | */ | ||
160 | #define LCG(x) ((x) * 69069U) /* super-duper LCG */ | ||
161 | state->s1 = __seed(LCG(seed), 2U); | ||
162 | state->s2 = __seed(LCG(state->s1), 8U); | ||
163 | state->s3 = __seed(LCG(state->s2), 16U); | ||
164 | state->s4 = __seed(LCG(state->s3), 128U); | ||
165 | } | ||
166 | |||
145 | /** | 167 | /** |
146 | * prandom_seed - add entropy to pseudo random number generator | 168 | * prandom_seed - add entropy to pseudo random number generator |
147 | * @seed: seed value | 169 | * @seed: seed value |
@@ -172,15 +194,14 @@ static int __init prandom_init(void) | |||
172 | { | 194 | { |
173 | int i; | 195 | int i; |
174 | 196 | ||
197 | #ifdef CONFIG_RANDOM32_SELFTEST | ||
198 | prandom_state_selftest(); | ||
199 | #endif | ||
200 | |||
175 | for_each_possible_cpu(i) { | 201 | for_each_possible_cpu(i) { |
176 | struct rnd_state *state = &per_cpu(net_rand_state,i); | 202 | struct rnd_state *state = &per_cpu(net_rand_state,i); |
177 | 203 | ||
178 | #define LCG(x) ((x) * 69069U) /* super-duper LCG */ | 204 | prandom_seed_very_weak(state, (i + jiffies) ^ random_get_entropy()); |
179 | state->s1 = __seed(LCG((i + jiffies) ^ random_get_entropy()), 2U); | ||
180 | state->s2 = __seed(LCG(state->s1), 8U); | ||
181 | state->s3 = __seed(LCG(state->s2), 16U); | ||
182 | state->s4 = __seed(LCG(state->s3), 128U); | ||
183 | |||
184 | prandom_warmup(state); | 205 | prandom_warmup(state); |
185 | } | 206 | } |
186 | return 0; | 207 | return 0; |
@@ -253,3 +274,165 @@ static int __init prandom_reseed(void) | |||
253 | return 0; | 274 | return 0; |
254 | } | 275 | } |
255 | late_initcall(prandom_reseed); | 276 | late_initcall(prandom_reseed); |
277 | |||
278 | #ifdef CONFIG_RANDOM32_SELFTEST | ||
279 | static struct prandom_test1 { | ||
280 | u32 seed; | ||
281 | u32 result; | ||
282 | } test1[] = { | ||
283 | { 1U, 3484351685U }, | ||
284 | { 2U, 2623130059U }, | ||
285 | { 3U, 3125133893U }, | ||
286 | { 4U, 984847254U }, | ||
287 | }; | ||
288 | |||
289 | static struct prandom_test2 { | ||
290 | u32 seed; | ||
291 | u32 iteration; | ||
292 | u32 result; | ||
293 | } test2[] = { | ||
294 | /* Test cases against taus113 from GSL library. */ | ||
295 | { 931557656U, 959U, 2975593782U }, | ||
296 | { 1339693295U, 876U, 3887776532U }, | ||
297 | { 1545556285U, 961U, 1615538833U }, | ||
298 | { 601730776U, 723U, 1776162651U }, | ||
299 | { 1027516047U, 687U, 511983079U }, | ||
300 | { 416526298U, 700U, 916156552U }, | ||
301 | { 1395522032U, 652U, 2222063676U }, | ||
302 | { 366221443U, 617U, 2992857763U }, | ||
303 | { 1539836965U, 714U, 3783265725U }, | ||
304 | { 556206671U, 994U, 799626459U }, | ||
305 | { 684907218U, 799U, 367789491U }, | ||
306 | { 2121230701U, 931U, 2115467001U }, | ||
307 | { 1668516451U, 644U, 3620590685U }, | ||
308 | { 768046066U, 883U, 2034077390U }, | ||
309 | { 1989159136U, 833U, 1195767305U }, | ||
310 | { 536585145U, 996U, 3577259204U }, | ||
311 | { 1008129373U, 642U, 1478080776U }, | ||
312 | { 1740775604U, 939U, 1264980372U }, | ||
313 | { 1967883163U, 508U, 10734624U }, | ||
314 | { 1923019697U, 730U, 3821419629U }, | ||
315 | { 442079932U, 560U, 3440032343U }, | ||
316 | { 1961302714U, 845U, 841962572U }, | ||
317 | { 2030205964U, 962U, 1325144227U }, | ||
318 | { 1160407529U, 507U, 240940858U }, | ||
319 | { 635482502U, 779U, 4200489746U }, | ||
320 | { 1252788931U, 699U, 867195434U }, | ||
321 | { 1961817131U, 719U, 668237657U }, | ||
322 | { 1071468216U, 983U, 917876630U }, | ||
323 | { 1281848367U, 932U, 1003100039U }, | ||
324 | { 582537119U, 780U, 1127273778U }, | ||
325 | { 1973672777U, 853U, 1071368872U }, | ||
326 | { 1896756996U, 762U, 1127851055U }, | ||
327 | { 847917054U, 500U, 1717499075U }, | ||
328 | { 1240520510U, 951U, 2849576657U }, | ||
329 | { 1685071682U, 567U, 1961810396U }, | ||
330 | { 1516232129U, 557U, 3173877U }, | ||
331 | { 1208118903U, 612U, 1613145022U }, | ||
332 | { 1817269927U, 693U, 4279122573U }, | ||
333 | { 1510091701U, 717U, 638191229U }, | ||
334 | { 365916850U, 807U, 600424314U }, | ||
335 | { 399324359U, 702U, 1803598116U }, | ||
336 | { 1318480274U, 779U, 2074237022U }, | ||
337 | { 697758115U, 840U, 1483639402U }, | ||
338 | { 1696507773U, 840U, 577415447U }, | ||
339 | { 2081979121U, 981U, 3041486449U }, | ||
340 | { 955646687U, 742U, 3846494357U }, | ||
341 | { 1250683506U, 749U, 836419859U }, | ||
342 | { 595003102U, 534U, 366794109U }, | ||
343 | { 47485338U, 558U, 3521120834U }, | ||
344 | { 619433479U, 610U, 3991783875U }, | ||
345 | { 704096520U, 518U, 4139493852U }, | ||
346 | { 1712224984U, 606U, 2393312003U }, | ||
347 | { 1318233152U, 922U, 3880361134U }, | ||
348 | { 855572992U, 761U, 1472974787U }, | ||
349 | { 64721421U, 703U, 683860550U }, | ||
350 | { 678931758U, 840U, 380616043U }, | ||
351 | { 692711973U, 778U, 1382361947U }, | ||
352 | { 677703619U, 530U, 2826914161U }, | ||
353 | { 92393223U, 586U, 1522128471U }, | ||
354 | { 1222592920U, 743U, 3466726667U }, | ||
355 | { 358288986U, 695U, 1091956998U }, | ||
356 | { 1935056945U, 958U, 514864477U }, | ||
357 | { 735675993U, 990U, 1294239989U }, | ||
358 | { 1560089402U, 897U, 2238551287U }, | ||
359 | { 70616361U, 829U, 22483098U }, | ||
360 | { 368234700U, 731U, 2913875084U }, | ||
361 | { 20221190U, 879U, 1564152970U }, | ||
362 | { 539444654U, 682U, 1835141259U }, | ||
363 | { 1314987297U, 840U, 1801114136U }, | ||
364 | { 2019295544U, 645U, 3286438930U }, | ||
365 | { 469023838U, 716U, 1637918202U }, | ||
366 | { 1843754496U, 653U, 2562092152U }, | ||
367 | { 400672036U, 809U, 4264212785U }, | ||
368 | { 404722249U, 965U, 2704116999U }, | ||
369 | { 600702209U, 758U, 584979986U }, | ||
370 | { 519953954U, 667U, 2574436237U }, | ||
371 | { 1658071126U, 694U, 2214569490U }, | ||
372 | { 420480037U, 749U, 3430010866U }, | ||
373 | { 690103647U, 969U, 3700758083U }, | ||
374 | { 1029424799U, 937U, 3787746841U }, | ||
375 | { 2012608669U, 506U, 3362628973U }, | ||
376 | { 1535432887U, 998U, 42610943U }, | ||
377 | { 1330635533U, 857U, 3040806504U }, | ||
378 | { 1223800550U, 539U, 3954229517U }, | ||
379 | { 1322411537U, 680U, 3223250324U }, | ||
380 | { 1877847898U, 945U, 2915147143U }, | ||
381 | { 1646356099U, 874U, 965988280U }, | ||
382 | { 805687536U, 744U, 4032277920U }, | ||
383 | { 1948093210U, 633U, 1346597684U }, | ||
384 | { 392609744U, 783U, 1636083295U }, | ||
385 | { 690241304U, 770U, 1201031298U }, | ||
386 | { 1360302965U, 696U, 1665394461U }, | ||
387 | { 1220090946U, 780U, 1316922812U }, | ||
388 | { 447092251U, 500U, 3438743375U }, | ||
389 | { 1613868791U, 592U, 828546883U }, | ||
390 | { 523430951U, 548U, 2552392304U }, | ||
391 | { 726692899U, 810U, 1656872867U }, | ||
392 | { 1364340021U, 836U, 3710513486U }, | ||
393 | { 1986257729U, 931U, 935013962U }, | ||
394 | { 407983964U, 921U, 728767059U }, | ||
395 | }; | ||
396 | |||
397 | static void __init prandom_state_selftest(void) | ||
398 | { | ||
399 | int i, j, errors = 0, runs = 0; | ||
400 | bool error = false; | ||
401 | |||
402 | for (i = 0; i < ARRAY_SIZE(test1); i++) { | ||
403 | struct rnd_state state; | ||
404 | |||
405 | prandom_seed_very_weak(&state, test1[i].seed); | ||
406 | prandom_warmup(&state); | ||
407 | |||
408 | if (test1[i].result != prandom_u32_state(&state)) | ||
409 | error = true; | ||
410 | } | ||
411 | |||
412 | if (error) | ||
413 | pr_warn("prandom: seed boundary self test failed\n"); | ||
414 | else | ||
415 | pr_info("prandom: seed boundary self test passed\n"); | ||
416 | |||
417 | for (i = 0; i < ARRAY_SIZE(test2); i++) { | ||
418 | struct rnd_state state; | ||
419 | |||
420 | prandom_seed_very_weak(&state, test2[i].seed); | ||
421 | prandom_warmup(&state); | ||
422 | |||
423 | for (j = 0; j < test2[i].iteration - 1; j++) | ||
424 | prandom_u32_state(&state); | ||
425 | |||
426 | if (test2[i].result != prandom_u32_state(&state)) | ||
427 | errors++; | ||
428 | |||
429 | runs++; | ||
430 | cond_resched(); | ||
431 | } | ||
432 | |||
433 | if (errors) | ||
434 | pr_warn("prandom: %d/%d self tests failed\n", errors, runs); | ||
435 | else | ||
436 | pr_info("prandom: %d self tests passed\n", runs); | ||
437 | } | ||
438 | #endif | ||