From: Damien Miller <djm@mindrot.org>
Date: Fri, 23 Sep 2011 00:46:48 +0000 (+1000)
Subject:    - deraadt@cvs.openbsd.org 2008/07/22 21:47:45
X-Git-Tag: V_6_0_P1~61
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dc0e09b41c0de295e1c5d902a52343259130e76f;p=thirdparty%2Fopenssh-portable.git

   - deraadt@cvs.openbsd.org 2008/07/22 21:47:45
     [mktemp.c]
     use arc4random_uniform(); ok djm millert
---

diff --git a/ChangeLog b/ChangeLog
index eb231e77b..6dac102de 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,9 @@
      Comment fix about time consumption of _gettemp.
      FreeBSD did this in revision 1.20.
      OK deraadt@, krw@
+   - deraadt@cvs.openbsd.org 2008/07/22 21:47:45
+     [mktemp.c]
+     use arc4random_uniform(); ok djm millert
 
 20110922
  - OpenBSD CVS Sync
diff --git a/openbsd-compat/mktemp.c b/openbsd-compat/mktemp.c
index 5529bee75..5bdf3e6d9 100644
--- a/openbsd-compat/mktemp.c
+++ b/openbsd-compat/mktemp.c
@@ -1,7 +1,7 @@
 /* THIS FILE HAS BEEN MODIFIED FROM THE ORIGINAL OPENBSD SOURCE */
 /* Changes: Removed mktemp */
 
-/*	$OpenBSD: mktemp.c,v 1.20 2007/10/21 11:09:30 tobias Exp $ */
+/*	$OpenBSD: mktemp.c,v 1.21 2008/07/22 21:47:45 deraadt Exp $ */
 /*
  * Copyright (c) 1987, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -103,7 +103,7 @@ _gettemp(path, doopen, domkdir, slen)
 	while (trv >= path && *trv == 'X') {
 		char c;
 
-		pid = (arc4random() & 0xffff) % (26+26);
+		pid = arc4random_uniform(26+26);
 		if (pid < 26)
 			c = pid + 'A';
 		else