From owner-cvs-src@FreeBSD.ORG  Wed Mar  1 17:52:16 2006
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 435B616A420;
	Wed,  1 Mar 2006 17:52:16 +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 0D67443D4C;
	Wed,  1 Mar 2006 17:52:16 +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 k21HqFKu055054;
	Wed, 1 Mar 2006 17:52:15 GMT (envelope-from pjd@repoman.freebsd.org)
Received: (from pjd@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k21HqFWA055053;
	Wed, 1 Mar 2006 17:52:15 GMT (envelope-from pjd)
Message-Id: <200603011752.k21HqFWA055053@repoman.freebsd.org>
From: Pawel Jakub Dawidek <pjd@FreeBSD.org>
Date: Wed, 1 Mar 2006 17:52:15 +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 geli.8 geom_eli.c
 src/sys/geom/eli g_eli.c g_eli.h g_eli_crypto.c g_eli_ctl.c
 g_eli_key.c pkcs5v2.c pkcs5v2.h
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: Wed, 01 Mar 2006 17:52:16 -0000

pjd         2006-03-01 17:52:15 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_6)
    sbin/geom/class/eli  geli.8 geom_eli.c 
    sys/geom/eli         g_eli.c g_eli.h g_eli_crypto.c 
                         g_eli_ctl.c g_eli_key.c pkcs5v2.c 
                         pkcs5v2.h 
  Log:
  MFC:    Sync with HEAD.
  
  Approved by:    re (scottl)
  
  Revision  Changes    Path
  1.2.2.5   +39 -3     src/sbin/geom/class/eli/geli.8
  1.1.2.7   +22 -23    src/sbin/geom/class/eli/geom_eli.c
  1.3.2.8   +112 -51   src/sys/geom/eli/g_eli.c
  1.1.2.5   +1 -1      src/sys/geom/eli/g_eli.h
  1.1.2.2   +1 -1      src/sys/geom/eli/g_eli_crypto.c
  1.1.2.4   +1 -1      src/sys/geom/eli/g_eli_ctl.c
  1.1.2.2   +1 -1      src/sys/geom/eli/g_eli_key.c
  1.1.2.2   +1 -1      src/sys/geom/eli/pkcs5v2.c
  1.1.2.2   +1 -1      src/sys/geom/eli/pkcs5v2.h