From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:40428)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <famz@redhat.com>) id 1aJENE-0000nF-V5
	for qemu-devel@nongnu.org; Wed, 13 Jan 2016 00:53:37 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <famz@redhat.com>) id 1aJEND-0000ky-Uj
	for qemu-devel@nongnu.org; Wed, 13 Jan 2016 00:53:36 -0500
Date: Wed, 13 Jan 2016 13:53:27 +0800
From: Fam Zheng <famz@redhat.com>
Message-ID: <20160113055327.GE25517@ad.usersys.redhat.com>
References: <1452624982-19332-1-git-send-email-berrange@redhat.com>
	<1452624982-19332-3-git-send-email-berrange@redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <1452624982-19332-3-git-send-email-berrange@redhat.com>
Subject: Re: [Qemu-devel] [PATCH v1 02/15] crypto: add support for PBKDF2
 algorithm
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: "Daniel P. Berrange" <berrange@redhat.com>
Cc: qemu-devel@nongnu.org, qemu-block@nongnu.org

On Tue, 01/12 18:56, Daniel P. Berrange wrote:
> +#if defined CONFIG_NETTLE
> +#include "crypto/pbkdf-nettle.c"
> +#elif defined CONFIG_GCRYPT
> +#include "crypto/pbkdf-gcrypt.c"
> +#else /* ! CONFIG_GCRYPT */
> +#include "crypto/pbkdf-stub.c"
> +#endif /* ! CONFIG_GCRYPT */

I think the convention in QEMU is in crypto/Makefile.objs:

    crypto-obj-$(CONFIG_NETTLE) += pbkdf-nettle.o
    crypto-obj-$(if $(CONFIG_NETTLE),n,$(CONFIG_GCRYPT)) += pbkdf-gcrypt.o

And move pbkdf-stub.c to stub/pbkdf.c.