summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/lib/libc/crypt/arc4random.c11
1 files changed, 10 insertions, 1 deletions
diff --git a/src/lib/libc/crypt/arc4random.c b/src/lib/libc/crypt/arc4random.c
index 5e3b2925a6..5b376488ec 100644
--- a/src/lib/libc/crypt/arc4random.c
+++ b/src/lib/libc/crypt/arc4random.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: arc4random.c,v 1.9 2003/08/16 19:07:40 tedu Exp $ */ 1/* $OpenBSD: arc4random.c,v 1.10 2003/11/26 21:40:08 djm Exp $ */
2 2
3/* 3/*
4 * Arc4 random number generator for OpenBSD. 4 * Arc4 random number generator for OpenBSD.
@@ -48,6 +48,8 @@ static int rs_initialized;
48static struct arc4_stream rs; 48static struct arc4_stream rs;
49static pid_t arc4_stir_pid; 49static pid_t arc4_stir_pid;
50 50
51static inline u_int8_t arc4_getbyte(struct arc4_stream *);
52
51static inline void 53static inline void
52arc4_init(struct arc4_stream *as) 54arc4_init(struct arc4_stream *as)
53{ 55{
@@ -98,6 +100,13 @@ arc4_stir(struct arc4_stream *as)
98 100
99 arc4_stir_pid = getpid(); 101 arc4_stir_pid = getpid();
100 arc4_addrandom(as, (void *) &rdat, sizeof(rdat)); 102 arc4_addrandom(as, (void *) &rdat, sizeof(rdat));
103
104 /*
105 * Discard early keystream, as per recommendations in:
106 * http://www.wisdom.weizmann.ac.il/~itsik/RC4/Papers/Rc4_ksa.ps
107 */
108 for (i = 0; i < 256; i++)
109 (void) arc4_getbyte(as);
101} 110}
102 111
103static inline u_int8_t 112static inline u_int8_t