Module Name: src
Committed By: tls
Date: Mon Nov 28 15:22:41 UTC 2011
Modified Files:
src/sys/arch/x86/x86: via_padlock.c
Log Message:
Fix one last dangling use of arc4randbytes().
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/x86/x86/via_padlock.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/arch/x86/x86/via_padlock.c
diff -u src/sys/arch/x86/x86/via_padlock.c:1.16 src/sys/arch/x86/x86/via_padlock.c:1.17
--- src/sys/arch/x86/x86/via_padlock.c:1.16 Sat Nov 19 22:51:21 2011
+++ src/sys/arch/x86/x86/via_padlock.c Mon Nov 28 15:22:41 2011
@@ -1,5 +1,5 @@
/* $OpenBSD: via.c,v 1.8 2006/11/17 07:47:56 tom Exp $ */
-/* $NetBSD: via_padlock.c,v 1.16 2011/11/19 22:51:21 tls Exp $ */
+/* $NetBSD: via_padlock.c,v 1.17 2011/11/28 15:22:41 tls Exp $ */
/*-
* Copyright (c) 2003 Jason Wright
@@ -20,7 +20,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: via_padlock.c,v 1.16 2011/11/19 22:51:21 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: via_padlock.c,v 1.17 2011/11/28 15:22:41 tls Exp $");
#ifdef _KERNEL_OPT
# include "rnd.h"
@@ -40,6 +40,7 @@ __KERNEL_RCSID(0, "$NetBSD: via_padlock.
#include <sys/mbuf.h>
#include <sys/cpu.h>
#include <sys/rnd.h>
+#include <sys/cprng.h>
#include <x86/specialreg.h>
@@ -258,7 +259,7 @@ via_padlock_crypto_newsession(void *arg,
C3_CRYPT_CWLO_KEYGEN_SW |
C3_CRYPT_CWLO_NORMAL;
- arc4randbytes(ses->ses_iv, sizeof(ses->ses_iv));
+ cprng_fast(ses->ses_iv, sizeof(ses->ses_iv));
ses->ses_klen = c->cri_klen;
ses->ses_cw0 = cw0;
