From owner-svn-src-head@freebsd.org  Thu Jul 27 06:26:16 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id E846CDC31BE;
 Thu, 27 Jul 2017 06:26:16 +0000 (UTC) (envelope-from cy@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id B77026932A;
 Thu, 27 Jul 2017 06:26:16 +0000 (UTC) (envelope-from cy@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v6R6QFcw016945;
 Thu, 27 Jul 2017 06:26:15 GMT (envelope-from cy@FreeBSD.org)
Received: (from cy@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v6R6QFpx016943;
 Thu, 27 Jul 2017 06:26:15 GMT (envelope-from cy@FreeBSD.org)
Message-Id: <201707270626.v6R6QFpx016943@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: cy set sender to cy@FreeBSD.org
 using -f
From: Cy Schubert <cy@FreeBSD.org>
Date: Thu, 27 Jul 2017 06:26:15 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r321605 - head/contrib/ipfilter
X-SVN-Group: head
X-SVN-Commit-Author: cy
X-SVN-Commit-Paths: head/contrib/ipfilter
X-SVN-Commit-Revision: 321605
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 27 Jul 2017 06:26:17 -0000

Author: cy
Date: Thu Jul 27 06:26:15 2017
New Revision: 321605
URL: https://svnweb.freebsd.org/changeset/base/321605

Log:
  As in r315225, discard 3072 bytes of RC4 bytestream instead of 1024.
  
  PR:		217920
  Submitted by:	codarren@hackers.mu
  Reviewed by:	emaste, cem
  Approved by:	so (implicit, in r315225)
  MFC after:	1 week
  Differential Revision:	D11747
  Patterned after:	r315225

Modified:
  head/contrib/ipfilter/arc4random.c

Modified: head/contrib/ipfilter/arc4random.c
==============================================================================
--- head/contrib/ipfilter/arc4random.c	Thu Jul 27 05:31:48 2017	(r321604)
+++ head/contrib/ipfilter/arc4random.c	Thu Jul 27 06:26:15 2017	(r321605)
@@ -109,9 +109,9 @@ arc4_randomstir (void)
 	/*
 	 * Throw away the first N words of output, as suggested in the
 	 * paper "Weaknesses in the Key Scheduling Algorithm of RC4"
-	 * by Fluher, Mantin, and Shamir.  (N = 256 in our case.)
+	 * by Fluher, Mantin, and Shamir.  (N = 768 in our case.)
 	 */
-	for (n = 0; n < 256*4; n++)
+	for (n = 0; n < 768*4; n++)
 		arc4_randbyte();
 	MUTEX_EXIT(&arc4_mtx);
 }