From owner-svn-src-user@freebsd.org  Fri May 13 09:42:59 2016
Return-Path: <owner-svn-src-user@freebsd.org>
Delivered-To: svn-src-user@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 2A92FB375B6
 for <svn-src-user@mailman.ysv.freebsd.org>;
 Fri, 13 May 2016 09:42:59 +0000 (UTC)
 (envelope-from ngie@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 DC1691779;
 Fri, 13 May 2016 09:42:58 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4D9gwaa088080;
 Fri, 13 May 2016 09:42:58 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4D9gwbm088079;
 Fri, 13 May 2016 09:42:58 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201605130942.u4D9gwbm088079@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
 ngie@FreeBSD.org using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Fri, 13 May 2016 09:42:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r299647 - user/ngie/bsnmp_cleanup/contrib/bsnmp/snmp_usm
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 13 May 2016 09:42:59 -0000

Author: ngie
Date: Fri May 13 09:42:57 2016
New Revision: 299647
URL: https://svnweb.freebsd.org/changeset/base/299647

Log:
  Follow up to r299465
  
  Use the size of the destination buffer, not SNMP_PRIV_KEY_SIZ.
  
  The latter form is more prone to fall victim to buffer size changes

Modified:
  user/ngie/bsnmp_cleanup/contrib/bsnmp/snmp_usm/usm_snmp.c

Modified: user/ngie/bsnmp_cleanup/contrib/bsnmp/snmp_usm/usm_snmp.c
==============================================================================
--- user/ngie/bsnmp_cleanup/contrib/bsnmp/snmp_usm/usm_snmp.c	Fri May 13 09:37:53 2016	(r299646)
+++ user/ngie/bsnmp_cleanup/contrib/bsnmp/snmp_usm/usm_snmp.c	Fri May 13 09:42:57 2016	(r299647)
@@ -360,7 +360,7 @@ op_usm_users(struct snmp_context *ctx, s
 		case LEAF_usmUserPrivKeyChange:
 		case LEAF_usmUserOwnPrivKeyChange:
 			memcpy(uuser->suser.priv_key, ctx->scratch->ptr1,
-			    SNMP_PRIV_KEY_SIZ);
+			    sizeof(uuser->suser.priv_key));
 			free(ctx->scratch->ptr1);
 			break;
 		case LEAF_usmUserPublic: