From owner-cvs-src-old@FreeBSD.ORG  Sun May  8 09:18:14 2011
Return-Path: <owner-cvs-src-old@FreeBSD.ORG>
Delivered-To: cvs-src-old@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6462E106566C
	for <cvs-src-old@freebsd.org>; Sun,  8 May 2011 09:18:14 +0000 (UTC)
	(envelope-from pjd@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 55B328FC08
	for <cvs-src-old@freebsd.org>; Sun,  8 May 2011 09:18:14 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id p489IEIB074599
	for <cvs-src-old@freebsd.org>; Sun, 8 May 2011 09:18:14 GMT
	(envelope-from pjd@repoman.freebsd.org)
Received: (from svn2cvs@localhost)
	by repoman.freebsd.org (8.14.4/8.14.4/Submit) id p489IEUX074598
	for cvs-src-old@freebsd.org; Sun, 8 May 2011 09:18:14 GMT
	(envelope-from pjd@repoman.freebsd.org)
Message-Id: <201105080918.p489IEUX074598@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to
	pjd@repoman.freebsd.org using -f
From: Pawel Jakub Dawidek <pjd@FreeBSD.org>
Date: Sun, 8 May 2011 09:17:56 +0000 (UTC)
To: cvs-src-old@freebsd.org
X-FreeBSD-CVS-Branch: HEAD
Subject: cvs commit: src/sys/geom/eli g_eli.c g_eli.h g_eli_integrity.c
X-BeenThere: cvs-src-old@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: **OBSOLETE** CVS commit messages for the src tree
	<cvs-src-old.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src-old>,
	<mailto:cvs-src-old-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src-old>
List-Post: <mailto:cvs-src-old@freebsd.org>
List-Help: <mailto:cvs-src-old-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src-old>,
	<mailto:cvs-src-old-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 08 May 2011 09:18:14 -0000

pjd         2011-05-08 09:17:56 UTC

  FreeBSD src repository

  Modified files:
    sys/geom/eli         g_eli.c g_eli.h g_eli_integrity.c 
  Log:
  SVN rev 221628 on 2011-05-08 09:17:56Z by pjd
  
  When support for multiple encryption keys was committed, GELI integrity mode
  was not updated to pass CRD_F_KEY_EXPLICIT flag to opencrypto. This resulted in
  always using first key.
  
  We need to support providers created with this bug, so set special
  G_ELI_FLAG_FIRST_KEY flag for GELI provider in integrity mode with version
  smaller than 6 and pass the CRD_F_KEY_EXPLICIT flag to opencrypto only if
  G_ELI_FLAG_FIRST_KEY doesn't exist.
  
  Reported by:    Anton Yuzhaninov <citrin@citrin.ru>
  MFC after:      1 week
  
  Revision  Changes    Path
  1.65      +11 -1     src/sys/geom/eli/g_eli.c
  1.25      +13 -2     src/sys/geom/eli/g_eli.h
  1.12      +2 -0      src/sys/geom/eli/g_eli_integrity.c