From owner-cvs-src@FreeBSD.ORG  Thu Jan 25 11:44:04 2007
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 [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 6A3B016A401;
	Thu, 25 Jan 2007 11:44:04 +0000 (UTC) (envelope-from pjd@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 5BB3E13C457;
	Thu, 25 Jan 2007 11:44:04 +0000 (UTC) (envelope-from pjd@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l0PBi4TV097931;
	Thu, 25 Jan 2007 11:44:04 GMT (envelope-from pjd@repoman.freebsd.org)
Received: (from pjd@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0PBi4lH097930;
	Thu, 25 Jan 2007 11:44:04 GMT (envelope-from pjd)
Message-Id: <200701251144.l0PBi4lH097930@repoman.freebsd.org>
From: Pawel Jakub Dawidek <pjd@FreeBSD.org>
Date: Thu, 25 Jan 2007 11:44:03 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
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: Thu, 25 Jan 2007 11:44:04 -0000

pjd         2007-01-25 11:44:03 UTC

  FreeBSD src repository

  Modified files:
    sbin/geom/class/eli  geom_eli.c 
  Log:
  When the following conditions are meet:
  - First configured key is based only on keyfile (no passphrase).
  - Device is attached.
  - User changes first key (setkey) from keyfile to passphrase and doesn't
    specify number of iterations (with -i option).
  ...geli(8) won't store calculated number of iterations in metadata.
  This result in device beeing unaccesable after detach.
  
  One can recover from this situation by guessing number of iterations
  generated, storing it in metadata and trying to attach device.
  Recovery procedure isn't nice, but one's data is not lost.
  
  Reported by:    Thomas Nickl <T.Nickl@gmx.net>
  MFC after:      1 week
  
  Revision  Changes    Path
  1.19      +13 -1     src/sbin/geom/class/eli/geom_eli.c