From patchwork Thu Sep 10 10:06:16 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: 249589 Delivered-To: patch@linaro.org Received: by 2002:a17:906:6011:0:0:0:0 with SMTP id o17csp1240308ejj; Thu, 10 Sep 2020 03:10:05 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyP8myV24FxjBE8TUd0fUtZS9HsiHoPjql4GR23nsxzrADu0tF0AdQu95zvGLVuU+xcodwG X-Received: by 2002:a5b:c86:: with SMTP id i6mr11186875ybq.400.1599732605828; Thu, 10 Sep 2020 03:10:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1599732605; cv=none; d=google.com; s=arc-20160816; b=gJZox5SGVJ5+NUogvA8Eto2tCpiz0Y1B5s7T1kCTwzWef/u6adNevEVk7maMDlpYo4 hQFkrCGVY2TovpPgmGNzEQXOfmAWZGKxcEO/GndrGVGOuoUp9D//bo05xEiXP1N6sOmY DJjsx5udCmxKPZ3oimrThclruePvofVm7oCbInVbSJDQT0HxhuFvkL+DKMbZtxQxTL0a c6i3OcIltlchWseBh5HUgEAm/LWgcwFJl3I1REO6euWn0lxDWk7I102L2d3UI2eCyFh2 MIc3WsNCxE8HpndkTkkD0Gw+kcelzoARmSBoHZUQTS92SCuguv9A4dGbZuz6g8rQGPQw LkhQ== 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=LZmUthsQHGdqq+Z0/yMwoLNJz4uIPUN1e7DgJ0tmhBk=; b=OmfAxLoS1nj7WCMUyxdcZtRUn9WcUUcNNKVfI6kLPnHOdVVD5RWHqXAYhtbbbZPTZa dehI/+p8beeLz1o/HQPa10bGF1JGdEb54Go/lw4oY9yUsO19CHhwGz12uTGAgRsrVr+z KwwDEv8YauONa3isy7NtVasCkGHoRu7nVNQ+VsC/xWEyOYyutKZLQ0uHE3mlacmFjsLM f6T3Dy6O3xPTTUJld54MBlxXbdCCLAmT87Lg3np1EzgLA0PaGTS4g7EJonyKqzlrD277 3MaeG2tcu1qkK+9jP8sb+2ULGMhssQSubUCGoWDo7DM6q2108IuP3vr0N+PwBjxHooi1 bNbQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@redhat.com header.s=mimecast20190719 header.b=EE3YfGUM; 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 e142si5197159ybh.104.2020.09.10.03.10.05 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 10 Sep 2020 03:10:05 -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=EE3YfGUM; 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]:58198 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kGJWn-0006hJ-3O for patch@linaro.org; Thu, 10 Sep 2020 06:10:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43712) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kGJTa-0000RT-Tl for qemu-devel@nongnu.org; Thu, 10 Sep 2020 06:06:47 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:45303) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kGJTY-0007i8-05 for qemu-devel@nongnu.org; Thu, 10 Sep 2020 06:06:46 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599732403; 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=LZmUthsQHGdqq+Z0/yMwoLNJz4uIPUN1e7DgJ0tmhBk=; b=EE3YfGUMgGjDvHekgTlXBLmaSDefmdRVTr4KTPuj8E+3Qxysn9zTQxpMAPaFIpq41mEf+A /xGDI2tYycCyi7xbVCrrOKoqSp6a81cP1dWM8QxOJ0928g7ICkrKZ0dXoKBtijp66V+YUI 2W4Ra8/VYf7TLjZwxn7X6uB0j4Rx7U0= 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-86-0FdH3YMPPhC3PI6G-mUaZg-1; Thu, 10 Sep 2020 06:06:41 -0400 X-MC-Unique: 0FdH3YMPPhC3PI6G-mUaZg-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 3F372107464E; Thu, 10 Sep 2020 10:06:40 +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 002131002D41; Thu, 10 Sep 2020 10:06:38 +0000 (UTC) From: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 10/17] crypto: Constify cipher data tables Date: Thu, 10 Sep 2020 11:06:16 +0100 Message-Id: <20200910100623.1088965-11-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=63.128.21.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/10 02:38:59 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_H5=0.001, RCVD_IN_MSPIKE_WL=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 Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson Signed-off-by: Daniel P. Berrangé --- crypto/cipher.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- 2.26.2 diff --git a/crypto/cipher.c b/crypto/cipher.c index 3711b552fa..068b2fb867 100644 --- a/crypto/cipher.c +++ b/crypto/cipher.c @@ -25,7 +25,7 @@ #include "cipherpriv.h" -static size_t alg_key_len[QCRYPTO_CIPHER_ALG__MAX] = { +static const size_t alg_key_len[QCRYPTO_CIPHER_ALG__MAX] = { [QCRYPTO_CIPHER_ALG_AES_128] = 16, [QCRYPTO_CIPHER_ALG_AES_192] = 24, [QCRYPTO_CIPHER_ALG_AES_256] = 32, @@ -40,7 +40,7 @@ static size_t alg_key_len[QCRYPTO_CIPHER_ALG__MAX] = { [QCRYPTO_CIPHER_ALG_TWOFISH_256] = 32, }; -static size_t alg_block_len[QCRYPTO_CIPHER_ALG__MAX] = { +static const size_t alg_block_len[QCRYPTO_CIPHER_ALG__MAX] = { [QCRYPTO_CIPHER_ALG_AES_128] = 16, [QCRYPTO_CIPHER_ALG_AES_192] = 16, [QCRYPTO_CIPHER_ALG_AES_256] = 16, @@ -55,7 +55,7 @@ static size_t alg_block_len[QCRYPTO_CIPHER_ALG__MAX] = { [QCRYPTO_CIPHER_ALG_TWOFISH_256] = 16, }; -static bool mode_need_iv[QCRYPTO_CIPHER_MODE__MAX] = { +static const bool mode_need_iv[QCRYPTO_CIPHER_MODE__MAX] = { [QCRYPTO_CIPHER_MODE_ECB] = false, [QCRYPTO_CIPHER_MODE_CBC] = true, [QCRYPTO_CIPHER_MODE_XTS] = true,