From owner-svn-src-all@FreeBSD.ORG  Sat Feb 16 12:45:57 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])
 by hub.freebsd.org (Postfix) with ESMTP id E5DACB00;
 Sat, 16 Feb 2013 12:45:57 +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 D3AAB937;
 Sat, 16 Feb 2013 12:45:57 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1GCjvI4083349;
 Sat, 16 Feb 2013 12:45:57 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1GCjvA1083348;
 Sat, 16 Feb 2013 12:45:57 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201302161245.r1GCjvA1083348@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Sat, 16 Feb 2013 12:45:57 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r246873 - head/contrib/opie
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: Sat, 16 Feb 2013 12:45:58 -0000

Author: dim
Date: Sat Feb 16 12:45:57 2013
New Revision: 246873
URL: http://svnweb.freebsd.org/changeset/base/246873

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

Modified:
  head/contrib/opie/opiekey.c

Modified: head/contrib/opie/opiekey.c
==============================================================================
--- head/contrib/opie/opiekey.c	Sat Feb 16 06:07:07 2013	(r246872)
+++ head/contrib/opie/opiekey.c	Sat Feb 16 12:45:57 2013	(r246873)
@@ -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);
   };