From owner-svn-soc-all@FreeBSD.ORG  Fri Jun 19 20:58:44 2015
Return-Path: <owner-svn-soc-all@FreeBSD.ORG>
Delivered-To: svn-soc-all@hub.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 79843A90
 for <svn-soc-all@hub.freebsd.org>; Fri, 19 Jun 2015 20:58:44 +0000 (UTC)
 (envelope-from roam@FreeBSD.org)
Received: from socsvn.freebsd.org (socsvn.freebsd.org
 [IPv6:2001:1900:2254:206a::50:2])
 (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 67D1899A
 for <svn-soc-all@FreeBSD.org>; Fri, 19 Jun 2015 20:58:44 +0000 (UTC)
 (envelope-from roam@FreeBSD.org)
Received: from socsvn.freebsd.org ([127.0.1.124])
 by socsvn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5JKwilD051721
 for <svn-soc-all@FreeBSD.org>; Fri, 19 Jun 2015 20:58:44 GMT
 (envelope-from roam@FreeBSD.org)
Received: (from www@localhost)
 by socsvn.freebsd.org (8.14.9/8.14.9/Submit) id t5JKwhGe051709
 for svn-soc-all@FreeBSD.org; Fri, 19 Jun 2015 20:58:43 GMT
 (envelope-from roam@FreeBSD.org)
Date: Fri, 19 Jun 2015 20:58:43 GMT
Message-Id: <201506192058.t5JKwhGe051709@socsvn.freebsd.org>
X-Authentication-Warning: socsvn.freebsd.org: www set sender to
 roam@FreeBSD.org using -f
From: roam@FreeBSD.org
To: svn-soc-all@FreeBSD.org
Subject: socsvn commit: r287337 - soc2015/roam/ng_ayiya
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-soc-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the entire Summer of Code repository
 <svn-soc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-soc-all/>
List-Post: <mailto:svn-soc-all@freebsd.org>
List-Help: <mailto:svn-soc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 19 Jun 2015 20:58:44 -0000

Author: roam
Date: Fri Jun 19 20:58:43 2015
New Revision: 287337
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=287337

Log:
  Fix the AYIYA ID length calculation properly.
  
  ObQuote:	"A momentary lapse of reason"

Modified:
  soc2015/roam/ng_ayiya/ng_ayiya.c

Modified: soc2015/roam/ng_ayiya/ng_ayiya.c
==============================================================================
--- soc2015/roam/ng_ayiya/ng_ayiya.c	Fri Jun 19 19:57:39 2015	(r287336)
+++ soc2015/roam/ng_ayiya/ng_ayiya.c	Fri Jun 19 20:58:43 2015	(r287337)
@@ -515,7 +515,7 @@
 		return (EINVAL);
 	if (hdr->idlen > 4)
 		return (EINVAL);
-	const int32_t ofs_sig = ofs_id + (2 << (hdr->idlen - 1));
+	const int32_t ofs_sig = ofs_id + (1 << hdr->idlen);
 	if (len < ofs_sig)
 		return (EINVAL);
 	const unsigned siglen = 4 * hdr->siglen;