From owner-svn-src-stable-9@FreeBSD.ORG  Tue Feb 19 07:50:12 2013
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 5070ADBF;
 Tue, 19 Feb 2013 07:50:12 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 41587218;
 Tue, 19 Feb 2013 07:50:12 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1J7oBVi012565;
 Tue, 19 Feb 2013 07:50:11 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1J7oBto012564;
 Tue, 19 Feb 2013 07:50:11 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201302190750.r1J7oBto012564@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Tue, 19 Feb 2013 07:50:11 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r246980 - in stable: 7/contrib/opie 8/contrib/opie
 9/contrib/opie
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
 <svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable-9>, 
 <mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
 <mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 19 Feb 2013 07:50:12 -0000

Author: dim
Date: Tue Feb 19 07:50:10 2013
New Revision: 246980
URL: http://svnweb.freebsd.org/changeset/base/246980

Log:
  MFC r246873:
  
  In contrib/opie/opiekey.c, use the correct length to zero the secret.
  
  Found by:	clang ToT
  Reviewed by:	delphij

Modified:
  stable/9/contrib/opie/opiekey.c
Directory Properties:
  stable/9/contrib/opie/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/7/contrib/opie/opiekey.c
  stable/8/contrib/opie/opiekey.c
Directory Properties:
  stable/7/contrib/opie/   (props changed)
  stable/8/contrib/opie/   (props changed)

Modified: stable/9/contrib/opie/opiekey.c
==============================================================================
--- stable/9/contrib/opie/opiekey.c	Tue Feb 19 06:42:12 2013	(r246979)
+++ stable/9/contrib/opie/opiekey.c	Tue Feb 19 07:50:10 2013	(r246980)
@@ -109,19 +109,19 @@ static void getsecret FUNCTION((secret, 
     if (!opiereadpass(verify, OPIE_SECRET_MAX, 0)) {
       fprintf(stderr, "Error reading %ssecret pass phrase!\n", promptextra);
       memset(verify, 0, sizeof(verify));
-      memset(secret, 0, sizeof(secret));
+      memset(secret, 0, OPIE_SECRET_MAX + 1);
       exit(1);
     }
     if (verify[0] && strcmp(verify, secret)) {
       fprintf(stderr, "They don't match. Try again.\n");
       memset(verify, 0, sizeof(verify));
-      memset(secret, 0, sizeof(secret));
+      memset(secret, 0, OPIE_SECRET_MAX + 1);
       exit(1);
     }
     memset(verify, 0, sizeof(verify));
   }
   if (!(flags & 2) && !aflag && opiepasscheck(secret)) {
-    memset(secret, 0, sizeof(secret));
+    memset(secret, 0, OPIE_SECRET_MAX + 1);
     fprintf(stderr, "Secret pass phrases must be between %d and %d characters long.\n", OPIE_SECRET_MIN, OPIE_SECRET_MAX);
     exit(1);
   };