From owner-svn-src-all@FreeBSD.ORG  Wed Oct 16 02:55:32 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 1E5CDC30;
 Wed, 16 Oct 2013 02:55:32 +0000 (UTC)
 (envelope-from kevlo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 0B7292970;
 Wed, 16 Oct 2013 02:55:32 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9G2tVNV097800;
 Wed, 16 Oct 2013 02:55:31 GMT (envelope-from kevlo@svn.freebsd.org)
Received: (from kevlo@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9G2tV22097799;
 Wed, 16 Oct 2013 02:55:31 GMT (envelope-from kevlo@svn.freebsd.org)
Message-Id: <201310160255.r9G2tV22097799@svn.freebsd.org>
From: Kevin Lo <kevlo@FreeBSD.org>
Date: Wed, 16 Oct 2013 02:55:31 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r256574 - head/usr.sbin/ppp
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 16 Oct 2013 02:55:32 -0000

Author: kevlo
Date: Wed Oct 16 02:55:31 2013
New Revision: 256574
URL: http://svnweb.freebsd.org/changeset/base/256574

Log:
  Fix logic error.  MPPE only accepts protocol numbers 0x21 through 0xFA.
  
  PR:	bin/175974

Modified:
  head/usr.sbin/ppp/mppe.c

Modified: head/usr.sbin/ppp/mppe.c
==============================================================================
--- head/usr.sbin/ppp/mppe.c	Wed Oct 16 02:46:00 2013	(r256573)
+++ head/usr.sbin/ppp/mppe.c	Wed Oct 16 02:55:31 2013	(r256574)
@@ -168,7 +168,7 @@ MPPEOutput(void *v, struct ccp *ccp, str
   dictinit = 0;
 
   log_Printf(LogDEBUG, "MPPE: Output: Proto %02x (%d bytes)\n", *proto, ilen);
-  if (*proto < 0x21 && *proto > 0xFA) {
+  if (*proto < 0x21 || *proto > 0xFA) {
     log_Printf(LogDEBUG, "MPPE: Output: Not encrypting\n");
     ccp->compout += ilen;
     ccp->uncompout += ilen;