Module Name: src
Committed By: snj
Date: Thu Jan 21 08:32:25 UTC 2010
Modified Files:
src/sys/lib/libkern [netbsd-4-0]: arc4random.c
Log Message:
Pull up following revision(s) (requested by joerg in ticket #1374):
sys/lib/libkern/arc4random.c: revision 1.21
Keep arc4_i and arc4_j synchronised after a rekeying. This prevents
accidentally ending up in a short ARC4 cycle.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.18.22.1 src/sys/lib/libkern/arc4random.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/lib/libkern/arc4random.c
diff -u src/sys/lib/libkern/arc4random.c:1.18 src/sys/lib/libkern/arc4random.c:1.18.22.1
--- src/sys/lib/libkern/arc4random.c:1.18 Sun Nov 5 14:13:56 2006
+++ src/sys/lib/libkern/arc4random.c Thu Jan 21 08:32:24 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: arc4random.c,v 1.18 2006/11/05 14:13:56 christos Exp $ */
+/* $NetBSD: arc4random.c,v 1.18.22.1 2010/01/21 08:32:24 snj Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -141,6 +141,7 @@
arc4_j = (arc4_j + arc4_sbox[n] + key[n]) % 256;
arc4_swap(&arc4_sbox[n], &arc4_sbox[arc4_j]);
}
+ arc4_i = arc4_j;
/* Reset for next reseed cycle. */
arc4_nextreseed = time_uptime + ARC4_RESEED_SECONDS;
