From patchwork Thu Sep 10 10:06:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= X-Patchwork-Id: 249584 Delivered-To: patch@linaro.org Received: by 2002:a17:906:6011:0:0:0:0 with SMTP id o17csp1239159ejj; Thu, 10 Sep 2020 03:08:15 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwmEVmSQqWw3DePeb/ozsjlIoq6hE6Xx/GPNHmQYiIU37lV93MMteJi6sP5ObIOwPzhxW2+ X-Received: by 2002:a25:d5:: with SMTP id 204mr12561709yba.101.1599732495542; Thu, 10 Sep 2020 03:08:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1599732495; cv=none; d=google.com; s=arc-20160816; b=MbL4eDN6E4Fd73hUoI/Mm4WnRotUvqZvDhi6HOLUKks2GSIcOKqen36p7mVov/h77l 9B/xD7utOuZsyE38s37t4Z6qVcZEEiZOfW1bV3MlIv20RNPT+qDXMDFr1T3p/85AIB2d d+n7F+u+H7gfqg0oMrUcxrCqPCyetSPWhTcet5EKzHp2ED5fIU3b/M0OGOV1mfCRwbql 2hFG5UJ/Jhuvn25cFP7UqNaave3/hcN0IyJHh3zuRYX1NVQtz19xtZs8NT4GeRGrLJdE o9AlkQ5xDN5jcuiyefLAQmbrxK2B62I/CTiyT1POysSxE5K8KDg6pMYxCNWgk4AIEfNV mD8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=22/8j3nSglJouwHuKcmQ4OJ5TmHD2LDjjXggNCdZvbI=; b=o/VMXjFjpV7p5kdIk677EymdXybtF05DVJ91vH2As6UXeAdtjJdd5lxC48O8K6MPSi Eo5O1Zc479TnONuEPFUX2vVaBLxOC1gzXtjXowr2cKQO2s9RQcxivDbXlcsKj3Rg6qE+ CXyO2MAAG78ZOK25voZthunNCK7luUZBjH4wxRxIGY4WVJ2mIz7frc2c2vJXYsIhO1ox 3CidW1aiXz8YrdZkY27pZjCt4apJMDtwkkPD11ZixR1ZxxYQxz7UbDuu8k/8zATumYM3 1S7TzxRpc9Rs15gCMjS75ZcNhVzEprG3V3lXwoMXqmJllO2XysAKD/QPN4qTdk9HYGxz Z+Qw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@redhat.com header.s=mimecast20190719 header.b=JCiZo0TI; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d4si5044905ybr.182.2020.09.10.03.08.15 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 10 Sep 2020 03:08:15 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@redhat.com header.s=mimecast20190719 header.b=JCiZo0TI; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1]:50524 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kGJV0-0003Yk-SK for patch@linaro.org; Thu, 10 Sep 2020 06:08:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43572) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kGJTP-000050-1g for qemu-devel@nongnu.org; Thu, 10 Sep 2020 06:06:35 -0400 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:55513 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kGJTN-0007gL-CP for qemu-devel@nongnu.org; Thu, 10 Sep 2020 06:06:34 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599732392; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=22/8j3nSglJouwHuKcmQ4OJ5TmHD2LDjjXggNCdZvbI=; b=JCiZo0TI8+992qhNuDeMp+xESNdfC33bWBA7jcPmEmrn0mPCy7EOfixDizhfKVBdvhPQBS 4eBUm/EZRtSPh9ySLXULqpZG6366PBXq666/o+Fl512VhvFkdhD9ds3tksieKrwAyuCBC7 /X6q7yu3NA5uSpRBM3HW0w0xx0hOUU4= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-543-MCA9rrJEPMKASciiV7urdA-1; Thu, 10 Sep 2020 06:06:30 -0400 X-MC-Unique: MCA9rrJEPMKASciiV7urdA-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C5B9464081; Thu, 10 Sep 2020 10:06:29 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-112-4.ams2.redhat.com [10.36.112.4]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8826F1002D5C; Thu, 10 Sep 2020 10:06:28 +0000 (UTC) From: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 03/17] crypto: Rename cipher include files to .c.inc Date: Thu, 10 Sep 2020 11:06:09 +0100 Message-Id: <20200910100623.1088965-4-berrange@redhat.com> In-Reply-To: <20200910100623.1088965-1-berrange@redhat.com> References: <20200910100623.1088965-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=berrange@redhat.com X-Mimecast-Spam-Score: 0.002 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=207.211.31.81; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/10 00:49:43 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Richard Henderson , =?utf-8?q?Daniel_P?= =?utf-8?b?LiBCZXJyYW5nw6k=?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Richard Henderson QEMU standard procedure for included c files is to use *.c.inc. E.g. there are a different set of checks that are applied. Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson Signed-off-by: Daniel P. Berrangé --- crypto/{cipher-builtin.c => cipher-builtin.c.inc} | 0 crypto/{cipher-gcrypt.c => cipher-gcrypt.c.inc} | 0 crypto/{cipher-nettle.c => cipher-nettle.c.inc} | 0 crypto/cipher.c | 6 +++--- 4 files changed, 3 insertions(+), 3 deletions(-) rename crypto/{cipher-builtin.c => cipher-builtin.c.inc} (100%) rename crypto/{cipher-gcrypt.c => cipher-gcrypt.c.inc} (100%) rename crypto/{cipher-nettle.c => cipher-nettle.c.inc} (100%) -- 2.26.2 diff --git a/crypto/cipher-builtin.c b/crypto/cipher-builtin.c.inc similarity index 100% rename from crypto/cipher-builtin.c rename to crypto/cipher-builtin.c.inc diff --git a/crypto/cipher-gcrypt.c b/crypto/cipher-gcrypt.c.inc similarity index 100% rename from crypto/cipher-gcrypt.c rename to crypto/cipher-gcrypt.c.inc diff --git a/crypto/cipher-nettle.c b/crypto/cipher-nettle.c.inc similarity index 100% rename from crypto/cipher-nettle.c rename to crypto/cipher-nettle.c.inc diff --git a/crypto/cipher.c b/crypto/cipher.c index 2722dc7d87..005b5da4de 100644 --- a/crypto/cipher.c +++ b/crypto/cipher.c @@ -151,11 +151,11 @@ qcrypto_cipher_munge_des_rfb_key(const uint8_t *key, #endif /* CONFIG_GCRYPT || CONFIG_NETTLE */ #ifdef CONFIG_GCRYPT -#include "cipher-gcrypt.c" +#include "cipher-gcrypt.c.inc" #elif defined CONFIG_NETTLE -#include "cipher-nettle.c" +#include "cipher-nettle.c.inc" #else -#include "cipher-builtin.c" +#include "cipher-builtin.c.inc" #endif QCryptoCipher *qcrypto_cipher_new(QCryptoCipherAlgorithm alg,