From patchwork Mon Mar 21 10:07:15 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= X-Patchwork-Id: 8631241 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 035049F36E for ; Mon, 21 Mar 2016 10:10:59 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 74F26201FE for ; Mon, 21 Mar 2016 10:10:58 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D1FE3201F5 for ; Mon, 21 Mar 2016 10:10:57 +0000 (UTC) Received: from localhost ([::1]:56676 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ahwnZ-0006CO-24 for patchwork-qemu-devel@patchwork.kernel.org; Mon, 21 Mar 2016 06:10:57 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38040) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ahwkA-0008Pm-IC for qemu-devel@nongnu.org; Mon, 21 Mar 2016 06:07:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ahwk8-0006GT-2S for qemu-devel@nongnu.org; Mon, 21 Mar 2016 06:07:26 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57137) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ahwk7-0006GM-Tr for qemu-devel@nongnu.org; Mon, 21 Mar 2016 06:07:24 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (Postfix) with ESMTPS id 9B370804EF; Mon, 21 Mar 2016 10:07:23 +0000 (UTC) Received: from t530wlan.home.berrange.com.com (vpn1-7-230.ams2.redhat.com [10.36.7.230]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u2LA7LFp009340; Mon, 21 Mar 2016 06:07:22 -0400 From: "Daniel P. Berrange" To: qemu-devel@nongnu.org Date: Mon, 21 Mar 2016 10:07:15 +0000 Message-Id: <1458554836-8864-2-git-send-email-berrange@redhat.com> In-Reply-To: <1458554836-8864-1-git-send-email-berrange@redhat.com> References: <1458554836-8864-1-git-send-email-berrange@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Peter Maydell Subject: [Qemu-devel] [PULL v1 1/2] crypto: add compat cast5_set_key with nettle < 3.0.0 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Prior to the nettle 3.0.0 release, the cast5_set_key function was actually named cast128_set_key, so we must add a compatibility definition. Signed-off-by: Daniel P. Berrange --- crypto/cipher-nettle.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/crypto/cipher-nettle.c b/crypto/cipher-nettle.c index 3c982e4..bec4f1c 100644 --- a/crypto/cipher-nettle.c +++ b/crypto/cipher-nettle.c @@ -34,6 +34,8 @@ typedef nettle_crypt_func nettle_cipher_func; typedef void * cipher_ctx_t; typedef unsigned cipher_length_t; + +#define cast5_set_key cast128_set_key #else typedef const void * cipher_ctx_t; typedef size_t cipher_length_t;