From owner-cvs-src@FreeBSD.ORG  Tue Aug 16 09:02:23 2005
Return-Path: <owner-cvs-src@FreeBSD.ORG>
X-Original-To: cvs-src@FreeBSD.org
Delivered-To: cvs-src@FreeBSD.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id D8E4716A41F;
	Tue, 16 Aug 2005 09:02:23 +0000 (GMT) (envelope-from pjd@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 6CF8C43D5C;
	Tue, 16 Aug 2005 09:02:23 +0000 (GMT) (envelope-from pjd@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j7G92Nwt061098;
	Tue, 16 Aug 2005 09:02:23 GMT (envelope-from pjd@repoman.freebsd.org)
Received: (from pjd@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j7G92NsD061096;
	Tue, 16 Aug 2005 09:02:23 GMT (envelope-from pjd)
Message-Id: <200508160902.j7G92NsD061096@repoman.freebsd.org>
From: Pawel Jakub Dawidek <pjd@FreeBSD.org>
Date: Tue, 16 Aug 2005 09:02:22 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: RELENG_6
Cc: 
Subject: cvs commit: src/sbin/geom/class/eli geom_eli.c
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the src tree <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 16 Aug 2005 09:02:24 -0000

pjd         2005-08-16 09:02:22 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_6)
    sbin/geom/class/eli  geom_eli.c 
  Log:
  MFC:    sbin/geom/class/eli/geom_eli.c  1.2
  
  When keys were configured without passphrase, number of iterations in
  metadata is equal to -1. if we then wanted to attach provider (or change
  keys) and forget about '-p' flag it failed on assertion (quite ok, without
  assertion it could call PKCS#5v2 with 4294967295 iterations).
  
  Instead of failing on assertion, remind about '-p' flag.
  
  Approved by:    re (kensmith)
  
  Revision  Changes    Path
  1.1.2.2   +4 -0      src/sbin/geom/class/eli/geom_eli.c