From nobody Tue May 7 20:26:32 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1611940286; cv=none; d=zohomail.com; s=zohoarc; b=BrwvZzbZYlao4eAHl24bkLWjPynC4qWRs+6Eqf2XMufL0Ne9VAuFUT2cVK6R1k1E7+RRZ2oiDHsY40BqG3owd6jw3kl7e7XOpBQ6E5wAKSENF35q+wj9Ty4Vp/WFqf3hCStwCvSK0s18onxviiDK3UfEUwLZ30yVrC+AbzIEAZs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1611940286; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=XVgxAnmumRG0Eq1PgXFB2QqRTRBwymFtBPXX+eeghr0=; b=RseqkMCmpzeC60ZJD1dGw6zWZqDJ8ckvz3vH0bI6SktiL2ih2+3NosCQqdznGZ4ja2MIijwOl7ACqHbnz+GBiRtod9Sn+3T6d54kCv60O23bKfBEk5E6A5cx24OanAn5WKxmb25TJAJjNyBohFVm5RSVEW3zLiGOxNDTg/+rv6I= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 161194028676765.6853911193864; Fri, 29 Jan 2021 09:11:26 -0800 (PST) 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-98-Vwz4kr4dNbKfU92jeOvGig-1; Fri, 29 Jan 2021 12:11:22 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 77D8F8042CE; Fri, 29 Jan 2021 17:11:16 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 53CDA60CC4; Fri, 29 Jan 2021 17:11:16 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id D2CFE1809CA3; Fri, 29 Jan 2021 17:11:15 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 10THBD5I018631 for ; Fri, 29 Jan 2021 12:11:13 -0500 Received: by smtp.corp.redhat.com (Postfix) id CC0D16267E; Fri, 29 Jan 2021 17:11:13 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-115-94.ams2.redhat.com [10.36.115.94]) by smtp.corp.redhat.com (Postfix) with ESMTP id 82EA35D741; Fri, 29 Jan 2021 17:11:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1611940285; h=from:from:sender:sender: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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=XVgxAnmumRG0Eq1PgXFB2QqRTRBwymFtBPXX+eeghr0=; b=e/L/iHbE2qS3Es9eXnMK6X4N6rC2NsXk2dKutDJNk8K5iqfWIycgDZvSZRU30hiaxtgUNw 7CNWctDu6NpFXOfLMbkBIHN+GhIZahnAKsSMoSoJRL8bhlu/TBE5AdD/6waawYFbta429H j3m45FEouSPFC1Q/aeVM8qhZ6M8N67M= X-MC-Unique: Vwz4kr4dNbKfU92jeOvGig-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 01/13] crypto: Fix some code style problems, add spaces around operator Date: Fri, 29 Jan 2021 17:10:50 +0000 Message-Id: <20210129171102.4109641-2-berrange@redhat.com> In-Reply-To: <20210129171102.4109641-1-berrange@redhat.com> References: <20210129171102.4109641-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Cc: Kevin Wolf , qemu-block@nongnu.org, libvir-list@redhat.com, shiliyang , Max Reitz , Gerd Hoffmann , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) From: shiliyang This patch fixes error style problems found by checkpatch.pl: ERROR: spaces required around that '*' ERROR: space required after that ',' ERROR: spaces required around that '|' Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Liyang Shi Signed-off-by: Daniel P. Berrang=C3=A9 --- crypto/aes.c | 2 +- crypto/desrfb.c | 2 +- crypto/tlscredsx509.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/crypto/aes.c b/crypto/aes.c index 159800df65..56efc95196 100644 --- a/crypto/aes.c +++ b/crypto/aes.c @@ -1182,7 +1182,7 @@ int AES_set_decrypt_key(const unsigned char *userKey,= const int bits, rk =3D key->rd_key; =20 /* invert the order of the round keys: */ - for (i =3D 0, j =3D 4*(key->rounds); i < j; i +=3D 4, j -=3D 4) { + for (i =3D 0, j =3D 4 * (key->rounds); i < j; i +=3D 4, j -=3D 4) { temp =3D rk[i ]; rk[i ] =3D rk[j ]; rk[j ] =3D= temp; temp =3D rk[i + 1]; rk[i + 1] =3D rk[j + 1]; rk[j + 1] =3D= temp; temp =3D rk[i + 2]; rk[i + 2] =3D rk[j + 2]; rk[j + 2] =3D= temp; diff --git a/crypto/desrfb.c b/crypto/desrfb.c index 3274c36510..675847c93b 100644 --- a/crypto/desrfb.c +++ b/crypto/desrfb.c @@ -56,7 +56,7 @@ static const unsigned char pc1[56] =3D { 13, 5, 60, 52, 44, 36, 28, 20, 12, 4, 27, 19, 11, 3 }; =20 static const unsigned char totrot[16] =3D { - 1,2,4,6,8,10,12,14,15,17,19,21,23,25,27,28 }; + 1, 2, 4, 6, 8, 10, 12, 14, 15, 17, 19, 21, 23, 25, 27, 28 }; =20 static const unsigned char pc2[48] =3D { 13, 16, 10, 23, 0, 4, 2, 27, 14, 5, 20, 9, diff --git a/crypto/tlscredsx509.c b/crypto/tlscredsx509.c index dd7267ccdb..c89dd62435 100644 --- a/crypto/tlscredsx509.c +++ b/crypto/tlscredsx509.c @@ -143,7 +143,7 @@ qcrypto_tls_creds_check_cert_key_usage(QCryptoTLSCredsX= 509 *creds, if (status < 0) { if (status =3D=3D GNUTLS_E_REQUESTED_DATA_NOT_AVAILABLE) { usage =3D isCA ? GNUTLS_KEY_KEY_CERT_SIGN : - GNUTLS_KEY_DIGITAL_SIGNATURE|GNUTLS_KEY_KEY_ENCIPHERMENT; + GNUTLS_KEY_DIGITAL_SIGNATURE | GNUTLS_KEY_KEY_ENCIPHERMENT; } else { error_setg(errp, "Unable to query certificate %s key usage: %s", --=20 2.29.2 From nobody Tue May 7 20:26:32 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1611940326; cv=none; d=zohomail.com; s=zohoarc; b=VPtq3BQMR56ucHckS2fOZkG/sDadC+dPY/RX1rfjnq9XkSu96mxJ0wGwMbObMYfUFlx3ORGxy/bXmbMRQ6WX/xC7g7Yw9D23wz1UJULwuiZSzJigi0oHcIJdWojTnYddcUTeupA5VWvFjo+BthZLceMbgYOiJab3Y/B8quooP68= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1611940326; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=5AbEZm7MEzTbhIfJr+NljGbcT+M0kR8yP9wWjN4MhTM=; b=OctjVKXNlQwWUitL7sIQ2gR0m6TrMAThc3EqaVG6kd4m/MVtEQ0zG/ELnbltbZD/WQNZAjuX7Jui5kKKXEwB+XkdnuoBAdW1/uOcbTeT5wEoDCUL/GZAVwnPV4oFV8RyEFUBb+fH7F1Mp2asGacj9DrCyKdok4oD0C8CtJ/Ms6I= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1611940326866301.11086864397726; Fri, 29 Jan 2021 09:12:06 -0800 (PST) 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-160-_VT8cmE6NZS8CmtH7H8YVA-1; Fri, 29 Jan 2021 12:11:22 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 55130A0BC2; Fri, 29 Jan 2021 17:11:17 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 33C2860CD2; Fri, 29 Jan 2021 17:11:17 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id EE9805003C; Fri, 29 Jan 2021 17:11:16 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 10THBFa1018641 for ; Fri, 29 Jan 2021 12:11:15 -0500 Received: by smtp.corp.redhat.com (Postfix) id BB8086268B; Fri, 29 Jan 2021 17:11:15 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-115-94.ams2.redhat.com [10.36.115.94]) by smtp.corp.redhat.com (Postfix) with ESMTP id 222536267E; Fri, 29 Jan 2021 17:11:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1611940325; h=from:from:sender:sender: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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=5AbEZm7MEzTbhIfJr+NljGbcT+M0kR8yP9wWjN4MhTM=; b=QcH9xP49eruek7fgv+iAPj3aYbwRrL9ZG/og+E2P2HFsChhWaUSBZUyZqzfFA8ZhvRVfz1 o6lB9KRMAMRHsqQzbsEwSj/7/AYcWhgXD7dfE6/5fWCsH0+PuuRqphIAFKnZQoXoCpmkfe svaP80rVH3QyoznWyJpE0vyPtB6G4RQ= X-MC-Unique: _VT8cmE6NZS8CmtH7H8YVA-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 02/13] crypto: Move USER_CREATABLE to secret_common base class Date: Fri, 29 Jan 2021 17:10:51 +0000 Message-Id: <20210129171102.4109641-3-berrange@redhat.com> In-Reply-To: <20210129171102.4109641-1-berrange@redhat.com> References: <20210129171102.4109641-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Cc: Kevin Wolf , qemu-block@nongnu.org, libvir-list@redhat.com, Max Reitz , Gerd Hoffmann , Paolo Bonzini X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) From: Kevin Wolf Instead of duplicating the code for user creatable objects in secret and secret_keyring, move it to the common base clase secret_common. As the base class is abstract, it won't become user creatable itself. Signed-off-by: Kevin Wolf Signed-off-by: Daniel P. Berrang=C3=A9 --- crypto/secret.c | 14 -------------- crypto/secret_common.c | 15 +++++++++++++++ crypto/secret_keyring.c | 14 -------------- 3 files changed, 15 insertions(+), 28 deletions(-) diff --git a/crypto/secret.c b/crypto/secret.c index 281cb81f0f..44eaff16f6 100644 --- a/crypto/secret.c +++ b/crypto/secret.c @@ -107,13 +107,6 @@ qcrypto_secret_prop_get_file(Object *obj, } =20 =20 -static void -qcrypto_secret_complete(UserCreatable *uc, Error **errp) -{ - object_property_set_bool(OBJECT(uc), "loaded", true, errp); -} - - static void qcrypto_secret_finalize(Object *obj) { @@ -129,9 +122,6 @@ qcrypto_secret_class_init(ObjectClass *oc, void *data) QCryptoSecretCommonClass *sic =3D QCRYPTO_SECRET_COMMON_CLASS(oc); sic->load_data =3D qcrypto_secret_load_data; =20 - UserCreatableClass *ucc =3D USER_CREATABLE_CLASS(oc); - ucc->complete =3D qcrypto_secret_complete; - object_class_property_add_str(oc, "data", qcrypto_secret_prop_get_data, qcrypto_secret_prop_set_data); @@ -148,10 +138,6 @@ static const TypeInfo qcrypto_secret_info =3D { .instance_finalize =3D qcrypto_secret_finalize, .class_size =3D sizeof(QCryptoSecretClass), .class_init =3D qcrypto_secret_class_init, - .interfaces =3D (InterfaceInfo[]) { - { TYPE_USER_CREATABLE }, - { } - } }; =20 =20 diff --git a/crypto/secret_common.c b/crypto/secret_common.c index b03d530867..35b82cb531 100644 --- a/crypto/secret_common.c +++ b/crypto/secret_common.c @@ -268,6 +268,13 @@ qcrypto_secret_prop_get_keyid(Object *obj, } =20 =20 +static void +qcrypto_secret_complete(UserCreatable *uc, Error **errp) +{ + object_property_set_bool(OBJECT(uc), "loaded", true, errp); +} + + static void qcrypto_secret_finalize(Object *obj) { @@ -281,6 +288,10 @@ qcrypto_secret_finalize(Object *obj) static void qcrypto_secret_class_init(ObjectClass *oc, void *data) { + UserCreatableClass *ucc =3D USER_CREATABLE_CLASS(oc); + + ucc->complete =3D qcrypto_secret_complete; + object_class_property_add_bool(oc, "loaded", qcrypto_secret_prop_get_loaded, qcrypto_secret_prop_set_loaded); @@ -390,6 +401,10 @@ static const TypeInfo qcrypto_secret_info =3D { .class_size =3D sizeof(QCryptoSecretCommonClass), .class_init =3D qcrypto_secret_class_init, .abstract =3D true, + .interfaces =3D (InterfaceInfo[]) { + { TYPE_USER_CREATABLE }, + { } + } }; =20 =20 diff --git a/crypto/secret_keyring.c b/crypto/secret_keyring.c index 10d8bc48a0..1b7edec84a 100644 --- a/crypto/secret_keyring.c +++ b/crypto/secret_keyring.c @@ -102,22 +102,12 @@ qcrypto_secret_prop_get_key(Object *obj, Visitor *v, } =20 =20 -static void -qcrypto_secret_keyring_complete(UserCreatable *uc, Error **errp) -{ - object_property_set_bool(OBJECT(uc), "loaded", true, errp); -} - - static void qcrypto_secret_keyring_class_init(ObjectClass *oc, void *data) { QCryptoSecretCommonClass *sic =3D QCRYPTO_SECRET_COMMON_CLASS(oc); sic->load_data =3D qcrypto_secret_keyring_load_data; =20 - UserCreatableClass *ucc =3D USER_CREATABLE_CLASS(oc); - ucc->complete =3D qcrypto_secret_keyring_complete; - object_class_property_add(oc, "serial", "int32_t", qcrypto_secret_prop_get_key, qcrypto_secret_prop_set_key, @@ -130,10 +120,6 @@ static const TypeInfo qcrypto_secret_info =3D { .name =3D TYPE_QCRYPTO_SECRET_KEYRING, .instance_size =3D sizeof(QCryptoSecretKeyring), .class_init =3D qcrypto_secret_keyring_class_init, - .interfaces =3D (InterfaceInfo[]) { - { TYPE_USER_CREATABLE }, - { } - } }; =20 =20 --=20 2.29.2 From nobody Tue May 7 20:26:32 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1611940292; cv=none; d=zohomail.com; s=zohoarc; b=VtPKgKaTalVzc6A4QY2JEWghZpk7/dK4JeIL+zwxOUrJG5VrcwF0Ids01ap6rB83AbWD+9XGz4wre7ZvRVzNYw7JcUw1fRjXu+H0Kh/0tIko1WOWcZhB9vWqj2kBMMOFsNVrJnz5pH8Rq+JpFaHX0rN5ogUnU0p1H3Ec8qMKQOw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1611940292; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=0Y+XsgsuNWj+0ga3joW8YXXOVTV8AzQFFMVZpMMxo6M=; b=YwdHiXuoRLN10JZDs+A7bXcHo0cZLp31zHSPWUkILgZa2/ZKlYZhGLgyedISJeZX1/JlxL1Qies1yOb4zOhNy5OJmZgjGp5GbEssGFsds8/Do4QK5IQzU7fU3pyql1Ez12zWAyjd4Vzb2VOK3MdoHRziq43YFopxzf0z1KU8cOM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1611940292801169.7627652147105; Fri, 29 Jan 2021 09:11:32 -0800 (PST) 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-598-w4jU-zkXM9ePGb9XB9UWig-1; Fri, 29 Jan 2021 12:11:28 -0500 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 7808D192D787; Fri, 29 Jan 2021 17:11:22 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 520F410074E5; Fri, 29 Jan 2021 17:11:22 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 1D6B31809CA4; Fri, 29 Jan 2021 17:11:22 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 10THBKQc018663 for ; Fri, 29 Jan 2021 12:11:20 -0500 Received: by smtp.corp.redhat.com (Postfix) id 405B05D741; Fri, 29 Jan 2021 17:11:20 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-115-94.ams2.redhat.com [10.36.115.94]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2827A5D705; Fri, 29 Jan 2021 17:11:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1611940291; h=from:from:sender:sender: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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=0Y+XsgsuNWj+0ga3joW8YXXOVTV8AzQFFMVZpMMxo6M=; b=TdUwLSl8fExum18v4r1PZ1jRZKkObZF3IkXvUG6hYAXVrLT4cE134IMo7eXWeTm+mcN6bP jw+7TuzGbHk7YNoRi9AlZpynNIr5OBnM9hq/2Fbcdw/OMuwXg6uGk5Ess8tCPuoIRS72wx 1w2X6EwxwjZnMdbW3H2LIJAwPsMRF2A= X-MC-Unique: w4jU-zkXM9ePGb9XB9UWig-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 03/13] crypto: Forbid broken unloading of secrets Date: Fri, 29 Jan 2021 17:10:52 +0000 Message-Id: <20210129171102.4109641-4-berrange@redhat.com> In-Reply-To: <20210129171102.4109641-1-berrange@redhat.com> References: <20210129171102.4109641-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Cc: Kevin Wolf , qemu-block@nongnu.org, libvir-list@redhat.com, Max Reitz , Gerd Hoffmann , Paolo Bonzini X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) From: Kevin Wolf qcrypto_secret_prop_set_loaded() forgets to reset secret->rawdata after unloading a secret, which will lead to a double free at some point. Because there is no use case for unloading an already loaded secret (apart from deleting the whole secret object) and we know that nobody could use this because it would lead to crashes, let's just forbid the operation instead of fixing the unloading. Eventually, we'll want to get rid of 'loaded' in the external interface, but for the meantime this is more consistent with rng, which has a similar property 'opened' that also can't be reset to false after it became true. Signed-off-by: Kevin Wolf Signed-off-by: Daniel P. Berrang=C3=A9 --- crypto/secret_common.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/crypto/secret_common.c b/crypto/secret_common.c index 35b82cb531..714a15d5e5 100644 --- a/crypto/secret_common.c +++ b/crypto/secret_common.c @@ -191,9 +191,9 @@ qcrypto_secret_prop_set_loaded(Object *obj, =20 secret->rawdata =3D input; secret->rawlen =3D inputlen; - } else { - g_free(secret->rawdata); - secret->rawlen =3D 0; + } else if (secret->rawdata) { + error_setg(errp, "Cannot unload secret"); + return; } } =20 --=20 2.29.2 From nobody Tue May 7 20:26:32 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1611940305; cv=none; d=zohomail.com; s=zohoarc; b=Dyz5Semcjj8GWPvvRlCGJ1pTVe49FZicMNE5IEFoWW7UUvPJrjxXnVDe23qhtt92GmMgmV8CGZ9YtS7LH4PalrgUirZ/e2UrC56mFhiMa1P5Ao/Hvcypu0AmPn0nSQfS3Ilejm0l4P0TQOziLT3pEhkUpcc/o1UQb63mLi6c1bU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1611940305; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=5W85jRKRkTM28M78Uqk941jBiKL2UVivuVHcLvFjqho=; b=WGKDWSr6VD5DOTwNTtMBL0RmVYKHRuNxf0RoLNLb3kovCF7sut8vxwC+vzncoUFi9AZmGdQhYWQMBIQzDd4ohTwAfG8Cb+seEpkxDW9RX3rrddkqnB0KYfm9H/rc71D19GzFvFKhHQIEKjmZIEYft7p75vXltkxMJQspSQGk20E= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1611940305515526.6978736682977; Fri, 29 Jan 2021 09:11:45 -0800 (PST) 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-320-0M19v0LSPm29LaTiq2M6qA-1; Fri, 29 Jan 2021 12:11:41 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2DC36107ACFB; Fri, 29 Jan 2021 17:11:35 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0B8B960CE6; Fri, 29 Jan 2021 17:11:35 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id C888E5003E; Fri, 29 Jan 2021 17:11:34 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 10THBXjU018738 for ; Fri, 29 Jan 2021 12:11:33 -0500 Received: by smtp.corp.redhat.com (Postfix) id 319F61945C; Fri, 29 Jan 2021 17:11:33 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-115-94.ams2.redhat.com [10.36.115.94]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8DD5A5D705; Fri, 29 Jan 2021 17:11:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1611940304; h=from:from:sender:sender: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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=5W85jRKRkTM28M78Uqk941jBiKL2UVivuVHcLvFjqho=; b=FhwVfzyPJN4L/gfrXHoEplQEf6K2jYSIKUD0Nb37ENVBx2wk6AvHD/cJzm9ongaAxvnvHX 0JTKvW08hWUal7FO4NTxh4lXnGPDxMNMxZWp+kjEKpTXi9RYatAxzIzsfdQn1doyRcoXMr fZyPNi/w5TpbTkAF/90bxC49xuMN+/s= X-MC-Unique: 0M19v0LSPm29LaTiq2M6qA-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 04/13] crypto: Fix memory leaks in set_loaded for tls-* Date: Fri, 29 Jan 2021 17:10:53 +0000 Message-Id: <20210129171102.4109641-5-berrange@redhat.com> In-Reply-To: <20210129171102.4109641-1-berrange@redhat.com> References: <20210129171102.4109641-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Cc: Kevin Wolf , qemu-block@nongnu.org, libvir-list@redhat.com, Max Reitz , Gerd Hoffmann , Paolo Bonzini X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) From: Kevin Wolf If you set the loaded property to true when it was already true, the state is overwritten without freeing the old state first. Change the set_loaded callback so that it always frees the old state (which is a no-op if nothing was loaded) and only then load if requestsd. Signed-off-by: Kevin Wolf Signed-off-by: Daniel P. Berrang=C3=A9 --- crypto/tlscredsanon.c | 3 +-- crypto/tlscredspsk.c | 3 +-- crypto/tlscredsx509.c | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/crypto/tlscredsanon.c b/crypto/tlscredsanon.c index 30275b6847..bea5f76c55 100644 --- a/crypto/tlscredsanon.c +++ b/crypto/tlscredsanon.c @@ -123,10 +123,9 @@ qcrypto_tls_creds_anon_prop_set_loaded(Object *obj, { QCryptoTLSCredsAnon *creds =3D QCRYPTO_TLS_CREDS_ANON(obj); =20 + qcrypto_tls_creds_anon_unload(creds); if (value) { qcrypto_tls_creds_anon_load(creds, errp); - } else { - qcrypto_tls_creds_anon_unload(creds); } } =20 diff --git a/crypto/tlscredspsk.c b/crypto/tlscredspsk.c index e26807b899..f5a31108d1 100644 --- a/crypto/tlscredspsk.c +++ b/crypto/tlscredspsk.c @@ -192,10 +192,9 @@ qcrypto_tls_creds_psk_prop_set_loaded(Object *obj, { QCryptoTLSCredsPSK *creds =3D QCRYPTO_TLS_CREDS_PSK(obj); =20 + qcrypto_tls_creds_psk_unload(creds); if (value) { qcrypto_tls_creds_psk_load(creds, errp); - } else { - qcrypto_tls_creds_psk_unload(creds); } } =20 diff --git a/crypto/tlscredsx509.c b/crypto/tlscredsx509.c index c89dd62435..dbadad4df2 100644 --- a/crypto/tlscredsx509.c +++ b/crypto/tlscredsx509.c @@ -694,10 +694,9 @@ qcrypto_tls_creds_x509_prop_set_loaded(Object *obj, { QCryptoTLSCredsX509 *creds =3D QCRYPTO_TLS_CREDS_X509(obj); =20 + qcrypto_tls_creds_x509_unload(creds); if (value) { qcrypto_tls_creds_x509_load(creds, errp); - } else { - qcrypto_tls_creds_x509_unload(creds); } } =20 --=20 2.29.2 From nobody Tue May 7 20:26:32 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1611940307; cv=none; d=zohomail.com; s=zohoarc; b=mjZyeL0oFmLtTRvu6UTWfLOkI2U8wxZoAkR7WVyn09a7D29h1g+ZbJ4rVcl3K5T4QfcAso9Laz6UNc+uCAX/WGy6dDEsYWD+pfXsCuFTlhN6YohpKAkcPkykYN83ArQiKbfVHfTRod01U9K6iwOQkHNjYNIkNEDmBT83lM72zbs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1611940307; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=n6JYP9W32stwdwNTOMk8OrBP4nVF1AJX/Q/uK1qg7Dw=; b=idkcyG86W+ugncUAxGcLbyNIunhazEQ/bmVELVMJjS/LF6ijfsGHgUPViaiq8Aq4Ou+aC5NE8jiDIp+nHyt4qux/05EDR2MYIOHBzNr4bRD9fl8Ki8Qk+K55xpQDa1A0KsRuT4V+6gI8PcfWCeno+MFCz7xifqven2jdUA6gR3M= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1611940307306103.43741482031203; Fri, 29 Jan 2021 09:11:47 -0800 (PST) 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-10-Z060i-aWPCCkdpBpcafkjQ-1; Fri, 29 Jan 2021 12:11:43 -0500 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 47E0E1007461; Fri, 29 Jan 2021 17:11:37 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2159C10023B8; Fri, 29 Jan 2021 17:11:37 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id DAC005003F; Fri, 29 Jan 2021 17:11:36 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 10THBZh4018778 for ; Fri, 29 Jan 2021 12:11:35 -0500 Received: by smtp.corp.redhat.com (Postfix) id A19BD63633; Fri, 29 Jan 2021 17:11:35 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-115-94.ams2.redhat.com [10.36.115.94]) by smtp.corp.redhat.com (Postfix) with ESMTP id 95AF95D705; Fri, 29 Jan 2021 17:11:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1611940305; h=from:from:sender:sender: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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=n6JYP9W32stwdwNTOMk8OrBP4nVF1AJX/Q/uK1qg7Dw=; b=VtEjOMFpBHw6bJLcawaARtg0BtzSCcL56MtiU2dASK0cKpMmt/PjdK8OpotzoB7YvvPNGM kyYxXxpH2K2S+rVBLpDsRyB/31jMoW87dif54FaoL9dQolqgu9wuCOZauG3GemAOaClJfa 5jcM95Xyuk7F1o0WUGvqcMqPm1zy+T8= X-MC-Unique: Z060i-aWPCCkdpBpcafkjQ-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 05/13] os: deprecate the -enable-fips option and QEMU's FIPS enforcement Date: Fri, 29 Jan 2021 17:10:54 +0000 Message-Id: <20210129171102.4109641-6-berrange@redhat.com> In-Reply-To: <20210129171102.4109641-1-berrange@redhat.com> References: <20210129171102.4109641-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Cc: Kevin Wolf , Thomas Huth , qemu-block@nongnu.org, libvir-list@redhat.com, Max Reitz , Gerd Hoffmann , Paolo Bonzini , John Snow X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) The -enable-fips option was added a long time ago to prevent the use of single DES when VNC when FIPS mode is enabled. It should never have been added, because apps are supposed to unconditionally honour FIPS mode based on the '/proc/sys/crypto/fips_enabled' file contents. In addition there is more to achieving FIPS compliance than merely blocking use of certain algorithms. Those algorithms which are used need to perform self-tests at runtime. QEMU's built-in cryptography provider has no support for self-tests, and neither does the nettle library. If QEMU is required to be used in a FIPS enabled host, then it must be built with the libgcrypt library enabled, which will unconditionally enforce FIPS compliance in any algorithm usage. Thus there is no need to keep either the -enable-fips option in QEMU, or QEMU's internal FIPS checking methods. Reviewed-by: John Snow Reviewed-by: Thomas Huth Signed-off-by: Daniel P. Berrang=C3=A9 --- docs/system/deprecated.rst | 12 ++++++++++++ os-posix.c | 3 +++ 2 files changed, 15 insertions(+) diff --git a/docs/system/deprecated.rst b/docs/system/deprecated.rst index 9de663526a..6ac757ed9f 100644 --- a/docs/system/deprecated.rst +++ b/docs/system/deprecated.rst @@ -134,6 +134,18 @@ Boolean options such as ``share=3Don``/``share=3Doff``= could be written in short form as ``share`` and ``noshare``. This is now deprecated and will cause a warning. =20 +``--enable-fips`` (since 6.0) +''''''''''''''''''''''''''''' + +This option restricts usage of certain cryptographic algorithms when +the host is operating in FIPS mode. + +If FIPS compliance is required, QEMU should be built with the ``libgcrypt`` +library enabled as a cryptography provider. + +Neither the ``nettle`` library, or the built-in cryptography provider are +supported on FIPS enabled hosts. + QEMU Machine Protocol (QMP) commands ------------------------------------ =20 diff --git a/os-posix.c b/os-posix.c index 1de2839554..a6846f51c1 100644 --- a/os-posix.c +++ b/os-posix.c @@ -153,6 +153,9 @@ int os_parse_cmd_args(int index, const char *optarg) break; #if defined(CONFIG_LINUX) case QEMU_OPTION_enablefips: + warn_report("-enable-fips is deprecated, please build QEMU with " + "the `libgcrypt` library as the cryptography provider " + "to enable FIPS compliance"); fips_set_state(true); break; #endif --=20 2.29.2 From nobody Tue May 7 20:26:32 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1611940311; cv=none; d=zohomail.com; s=zohoarc; b=nqRTE9sZeShHKpF6ajP2yLphGs8vj4SF1oOedU24J7QlBhUEX61gWuY8eXUBFFVfdTo5E9KIvpm9gGjPrGqg3651bGPly8utMvu7rGjvdDRf2HVS23ixF04qR3IRJbi14Mnl3/tdOrFaQPEnoaORGC7Nn8DaWNBeDNt8kETDgmk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1611940311; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=VPtgisoxsfLGdVEc2IMdhTz7S/zJCO018gB3xpDn0CU=; b=KP/lSej4UlESLBk8Mz8wMAbGNKMzJ32+oddDn1a5vKSTqXjM7yPG+LuHmOdQtOYSmunGgRJ0N/7zYH4iuYCUJ+jsfH5PVI27VDLPFfabbKuo48DTH/xbxutDNwHZ4Oh4u3ZnK9XfSN0/AvfP/RbirpYepGmjFMWTjCKwicorEgE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1611940311746976.5941387304825; Fri, 29 Jan 2021 09:11:51 -0800 (PST) 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-383-ola6JlEJMqu5VVxXzubtpw-1; Fri, 29 Jan 2021 12:11:47 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2005B192D788; Fri, 29 Jan 2021 17:11:41 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id F1D3A1962F; Fri, 29 Jan 2021 17:11:40 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id BADC650042; Fri, 29 Jan 2021 17:11:40 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 10THBcUq018808 for ; Fri, 29 Jan 2021 12:11:38 -0500 Received: by smtp.corp.redhat.com (Postfix) id 029256A8E8; Fri, 29 Jan 2021 17:11:38 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-115-94.ams2.redhat.com [10.36.115.94]) by smtp.corp.redhat.com (Postfix) with ESMTP id 08D526294D; Fri, 29 Jan 2021 17:11:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1611940310; h=from:from:sender:sender: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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=VPtgisoxsfLGdVEc2IMdhTz7S/zJCO018gB3xpDn0CU=; b=L3w5tcObrrHJdU7lJHBGEn5rWgCrQplE4j06+VypbLnVMkooMjks0A6Q8EMuQzyHNquu4M YztksmdWhEF6OlTdPT5JZSP3r2+78xVCHmUU63gX4JkHkdxAIagSBg2N3LwLpYxJjDL7Lh f7T6TbLfOb5YX0L7TX18tpRIENmCB6g= X-MC-Unique: ola6JlEJMqu5VVxXzubtpw-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 06/13] Prefer 'on' | 'off' over 'yes' | 'no' for bool options Date: Fri, 29 Jan 2021 17:10:55 +0000 Message-Id: <20210129171102.4109641-7-berrange@redhat.com> In-Reply-To: <20210129171102.4109641-1-berrange@redhat.com> References: <20210129171102.4109641-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Cc: Kevin Wolf , Thomas Huth , qemu-block@nongnu.org, libvir-list@redhat.com, Max Reitz , Gerd Hoffmann , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Update some docs and test cases to use 'on' | 'off' as the preferred value for bool options. Reviewed-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Daniel P. Berrang=C3=A9 --- docs/system/vnc-security.rst | 10 +++++----- include/authz/listfile.h | 2 +- qemu-options.hx | 4 ++-- tests/qemu-iotests/233 | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/docs/system/vnc-security.rst b/docs/system/vnc-security.rst index 558e4faffc..ebca656d87 100644 --- a/docs/system/vnc-security.rst +++ b/docs/system/vnc-security.rst @@ -65,7 +65,7 @@ encrypted session. .. parsed-literal:: =20 |qemu_system| [...OPTIONS...] \ - -object tls-creds-x509,id=3Dtls0,dir=3D/etc/pki/qemu,endpoint=3Dserve= r,verify-peer=3Dno \ + -object tls-creds-x509,id=3Dtls0,dir=3D/etc/pki/qemu,endpoint=3Dserve= r,verify-peer=3Doff \ -vnc :1,tls-creds=3Dtls0 -monitor stdio =20 In the above example ``/etc/pki/qemu`` should contain at least three @@ -84,12 +84,12 @@ connecting. The server will request that the client pro= vide a certificate, which it will then validate against the CA certificate. This is a good choice if deploying in an environment with a private internal certificate authority. It uses the same syntax as previously, -but with ``verify-peer`` set to ``yes`` instead. +but with ``verify-peer`` set to ``on`` instead. =20 .. parsed-literal:: =20 |qemu_system| [...OPTIONS...] \ - -object tls-creds-x509,id=3Dtls0,dir=3D/etc/pki/qemu,endpoint=3Dserve= r,verify-peer=3Dyes \ + -object tls-creds-x509,id=3Dtls0,dir=3D/etc/pki/qemu,endpoint=3Dserve= r,verify-peer=3Don \ -vnc :1,tls-creds=3Dtls0 -monitor stdio =20 .. _vnc_005fsec_005fcertificate_005fpw: @@ -103,7 +103,7 @@ authentication to provide two layers of authentication = for clients. .. parsed-literal:: =20 |qemu_system| [...OPTIONS...] \ - -object tls-creds-x509,id=3Dtls0,dir=3D/etc/pki/qemu,endpoint=3Dserve= r,verify-peer=3Dyes \ + -object tls-creds-x509,id=3Dtls0,dir=3D/etc/pki/qemu,endpoint=3Dserve= r,verify-peer=3Don \ -vnc :1,tls-creds=3Dtls0,password -monitor stdio (qemu) change vnc password Password: ******** @@ -145,7 +145,7 @@ x509 options: .. parsed-literal:: =20 |qemu_system| [...OPTIONS...] \ - -object tls-creds-x509,id=3Dtls0,dir=3D/etc/pki/qemu,endpoint=3Dserve= r,verify-peer=3Dyes \ + -object tls-creds-x509,id=3Dtls0,dir=3D/etc/pki/qemu,endpoint=3Dserve= r,verify-peer=3Don \ -vnc :1,tls-creds=3Dtls0,sasl -monitor stdio =20 .. _vnc_005fsetup_005fsasl: diff --git a/include/authz/listfile.h b/include/authz/listfile.h index 0a1e5bddd3..0b7fe72198 100644 --- a/include/authz/listfile.h +++ b/include/authz/listfile.h @@ -73,7 +73,7 @@ OBJECT_DECLARE_SIMPLE_TYPE(QAuthZListFile, * The object can be created on the command line using * * -object authz-list-file,id=3Dauthz0,\ - * filename=3D/etc/qemu/myvm-vnc.acl,refresh=3Dyes + * filename=3D/etc/qemu/myvm-vnc.acl,refresh=3Don * */ struct QAuthZListFile { diff --git a/qemu-options.hx b/qemu-options.hx index 9172d51659..d0410f0512 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -5027,7 +5027,7 @@ SRST Note the use of quotes due to the x509 distinguished name containing whitespace, and escaping of ','. =20 - ``-object authz-listfile,id=3Did,filename=3Dpath,refresh=3Dyes|no`` + ``-object authz-listfile,id=3Did,filename=3Dpath,refresh=3Don|off`` Create an authorization object that will control access to network services. =20 @@ -5072,7 +5072,7 @@ SRST =20 # |qemu_system| \\ ... \\ - -object authz-simple,id=3Dauth0,filename=3D/etc/qemu/vnc-= sasl.acl,refresh=3Dyes \\ + -object authz-simple,id=3Dauth0,filename=3D/etc/qemu/vnc-= sasl.acl,refresh=3Don \\ ... =20 ``-object authz-pam,id=3Did,service=3Dstring`` diff --git a/tests/qemu-iotests/233 b/tests/qemu-iotests/233 index 7ce5764903..da150cd27b 100755 --- a/tests/qemu-iotests/233 +++ b/tests/qemu-iotests/233 @@ -84,7 +84,7 @@ echo echo "=3D=3D check plain client to TLS server fails =3D=3D" =20 nbd_server_start_tcp_socket \ - --object tls-creds-x509,dir=3D${tls_dir}/server1,endpoint=3Dserver,id= =3Dtls0,verify-peer=3Dyes \ + --object tls-creds-x509,dir=3D${tls_dir}/server1,endpoint=3Dserver,id= =3Dtls0,verify-peer=3Don \ --tls-creds tls0 \ -f $IMGFMT "$TEST_IMG" 2>> "$TEST_DIR/server.log" =20 @@ -129,7 +129,7 @@ echo "=3D=3D check TLS with authorization =3D=3D" nbd_server_stop =20 nbd_server_start_tcp_socket \ - --object tls-creds-x509,dir=3D${tls_dir}/server1,endpoint=3Dserver,id= =3Dtls0,verify-peer=3Dyes \ + --object tls-creds-x509,dir=3D${tls_dir}/server1,endpoint=3Dserver,id= =3Dtls0,verify-peer=3Don \ --object "authz-simple,id=3Dauthz0,identity=3DCN=3Dlocalhost,, \ O=3DCthulu Dark Lord Enterprises client1,,L=3DR'lyeh,,C=3DSouth Paci= fic" \ --tls-authz authz0 \ --=20 2.29.2 From nobody Tue May 7 20:26:32 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1611940384; cv=none; d=zohomail.com; s=zohoarc; b=S/3XL+p0Yfikz+vwi1HGjzS5czRiGzfJ+vUtWNmcrC0IQp4VR8uJDmHiiugH4JRXZ843miI7MYMISg3q1z6VZo7Ccz5RvvSdXtTtdc5cVjXWKaJtwHBnuH3hHQozU3PNyJI3AgciWoK5ZHVNEfi6KcXdkfZGhH6WIN4WhewKOIk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1611940384; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=pGaLyQslc+Drgg1yv7UeVmBjqIIoxzi36KdJjtdfFEQ=; b=Hjt07oFXu0QMjyAjP5VpJN5Gu4KQr2blsF5rw6nmrxTrYCsQmiZGBwQX63B/lzvk7WJ6I5VQrrQlHY+Y+YUcN3S/r31V33Mh7LAwULBua+KEkjFcHKG5Vexu4qMyE8gdstYoT1AXN1dUwHjmoUjmPQl51uWu7t44+GYWTK8JJcY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1611940384694713.7760410197104; Fri, 29 Jan 2021 09:13:04 -0800 (PST) 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-357-piObQC2WN7uYprK1J7oUHA-1; Fri, 29 Jan 2021 12:11:59 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 255EB87950D; Fri, 29 Jan 2021 17:11:53 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E9BF219725; Fri, 29 Jan 2021 17:11:52 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id B2BD81809CA2; Fri, 29 Jan 2021 17:11:52 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 10THBomn018872 for ; Fri, 29 Jan 2021 12:11:50 -0500 Received: by smtp.corp.redhat.com (Postfix) id E8EC366A05; Fri, 29 Jan 2021 17:11:50 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-115-94.ams2.redhat.com [10.36.115.94]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4B4806A8E8; Fri, 29 Jan 2021 17:11:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1611940383; h=from:from:sender:sender: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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=pGaLyQslc+Drgg1yv7UeVmBjqIIoxzi36KdJjtdfFEQ=; b=ALePYEXRvphYdMRFnmYk4To9wlFmkpxQpt1IydPm12bEPb9KTLcYI/u99KoUZxXGdL+hbd nKGsPlfJzU/m2oVKXTnbZE3gf5SC5ldJCZHGtqY1nyuNJENl4h+l5Vgglp7607bI9JdNRv sewzWmzyws/kHHB2kkCNZsgMi5zKHbU= X-MC-Unique: piObQC2WN7uYprK1J7oUHA-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 07/13] docs: simplify and clarify the platform support rules Date: Fri, 29 Jan 2021 17:10:56 +0000 Message-Id: <20210129171102.4109641-8-berrange@redhat.com> In-Reply-To: <20210129171102.4109641-1-berrange@redhat.com> References: <20210129171102.4109641-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Cc: Kevin Wolf , Thomas Huth , Eduardo Habkost , qemu-block@nongnu.org, libvir-list@redhat.com, Max Reitz , Gerd Hoffmann , Paolo Bonzini X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) The distinction between short life and long life Linux distributions turned out to be redundant. They can both be covered in a simple way by noting support will target the current release, and the previous release for a period of two years or until its EOL. This rule can also apply to the other UNIX based distros, leaving only Windows needing a different set of rules. This also clarifies that Debian LTS is out of scope, because the LTS support is provided by a separate group from the main Debian maintainer team. Reviewed-by: Eduardo Habkost Reviewed-by: Thomas Huth Signed-off-by: Daniel P. Berrang=C3=A9 --- docs/system/build-platforms.rst | 63 ++++++++++++--------------------- 1 file changed, 23 insertions(+), 40 deletions(-) diff --git a/docs/system/build-platforms.rst b/docs/system/build-platforms.= rst index 9734eba2f1..692323609e 100644 --- a/docs/system/build-platforms.rst +++ b/docs/system/build-platforms.rst @@ -25,55 +25,38 @@ software in their distro, QEMU upstream code will not a= dd explicit support for those backports, unless the feature is auto-detectable in a manner that works for the upstream releases too. =20 -The Repology site https://repology.org is a useful resource to identify +The `Repology`_ site is a useful resource to identify currently shipped versions of software in various operating systems, though it does not cover all distros listed below. =20 -Linux OS --------- +Linux OS, macOS, FreeBSD, NetBSD, OpenBSD +----------------------------------------- =20 -For distributions with frequent, short-lifetime releases, the project -will aim to support all versions that are not end of life by their -respective vendors. For the purposes of identifying supported software -versions, the project will look at Fedora, Ubuntu, and openSUSE distros. -Other short- lifetime distros will be assumed to ship similar software -versions. +The project aims to support the most recent major version at all times. Su= pport +for the previous major version will be dropped 2 years after the new major +version is released or when the vendor itself drops support, whichever com= es +first. In this context, third-party efforts to extend the lifetime of a di= stro +are not considered, even when they are endorsed by the vendor (eg. Debian = LTS). =20 -For distributions with long-lifetime releases, the project will aim to -support the most recent major version at all times. Support for the -previous major version will be dropped 2 years after the new major -version is released, or when it reaches "end of life". For the purposes -of identifying supported software versions, the project will look at -RHEL, Debian, Ubuntu LTS, and SLES distros. Other long-lifetime distros -will be assumed to ship similar software versions. +For the purposes of identifying supported software versions available on L= inux, +the project will look at CentOS, Debian, Fedora, openSUSE, RHEL, SLES and +Ubuntu LTS. Other distros will be assumed to ship similar software version= s. =20 -Windows -------- - -The project supports building with current versions of the MinGW -toolchain, hosted on Linux. - -macOS ------ +For FreeBSD and OpenBSD, decisions will be made based on the contents of t= he +respective ports repository, while NetBSD will use the pkgsrc repository. =20 -The project supports building with the two most recent versions of -macOS, with the current Homebrew package set available. +For macOS, `HomeBrew`_ will be used, although `MacPorts`_ is expected to c= arry +similar versions. =20 -FreeBSD +Windows ------- =20 -The project aims to support all versions which are not end of -life. - -NetBSD ------- +The project supports building with current versions of the MinGW toolchain, +hosted on Linux (Debian/Fedora). =20 -The project aims to support the most recent major version at all times. -Support for the previous major version will be dropped 2 years after the -new major version is released. - -OpenBSD -------- +The version of the Windows API that's currently targeted is Vista / Server +2008. =20 -The project aims to support all versions which are not end of -life. +.. _HomeBrew: https://brew.sh/ +.. _MacPorts: https://www.macports.org/ +.. _Repology: https://repology.org/ --=20 2.29.2 From nobody Tue May 7 20:26:32 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1611940381; cv=none; d=zohomail.com; s=zohoarc; b=gISrdvYhn+HOtsV1X0az6zO6eoRyvmUer+rbQPRYzEakUf/6HW3mijsgi5LfpILl3phDBiDZQ95BMAYicxAHmaSLGwS9H7kFA2oXPIuqWw3kEOprxUgsr6SRzwE1t3PVgRXJkGVOrcYDSyMN2r5WTMQ9lVIG5FwnH84OnSRV77U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1611940381; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=uFIEH66ZY3YoBTPohiZZoTLza5bxW8cFzROb1848FPo=; b=S6zKfnbXu9Hq06v/7dYAMn9gzujEZ7F6R+r4AtNaKc4bZynjSgKeLp/pnmEgXbDiHPxDQJhj9BtQAMTXephj71+7rZ42iROybWxQUkBuv19judHvDcbtKdrAYQgTIKfx9EeIoutMn5Sf37oAxt5SO3oeUEPnYt/KTQiGpBVPyLU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1611940381186828.7037922390874; Fri, 29 Jan 2021 09:13:01 -0800 (PST) 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-403-tS8QcBtwPgOK4L_k2AsoGg-1; Fri, 29 Jan 2021 12:12:57 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5C1B2BBF05; Fri, 29 Jan 2021 17:12:50 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C36F360C61; Fri, 29 Jan 2021 17:12:49 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 8586D5003E; Fri, 29 Jan 2021 17:12:49 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 10THCmB5019103 for ; Fri, 29 Jan 2021 12:12:48 -0500 Received: by smtp.corp.redhat.com (Postfix) id BA1FC6A908; Fri, 29 Jan 2021 17:12:48 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-115-94.ams2.redhat.com [10.36.115.94]) by smtp.corp.redhat.com (Postfix) with ESMTP id 497DA5D705; Fri, 29 Jan 2021 17:11:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1611940380; h=from:from:sender:sender: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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=uFIEH66ZY3YoBTPohiZZoTLza5bxW8cFzROb1848FPo=; b=gqPZw2D5JyxzrI8+BlfHkFKwjupboKWxkO8NR0vSYaA8BMMsbK5NCfSrH+/WS19KbrNLBd aCN248KLltAo9mW2AXxUjFu+gmr14VrtuGoUkuIYrJxHB8DWky7rpTzQG+SZcEbd/v41OS PdITtxDlPmvgUb3fX3H7HU1BhMfafiE= X-MC-Unique: tS8QcBtwPgOK4L_k2AsoGg-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 08/13] docs: fix missing backslash in certtool shell example Date: Fri, 29 Jan 2021 17:10:57 +0000 Message-Id: <20210129171102.4109641-9-berrange@redhat.com> In-Reply-To: <20210129171102.4109641-1-berrange@redhat.com> References: <20210129171102.4109641-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Cc: Kevin Wolf , Peter Maydell , qemu-block@nongnu.org, libvir-list@redhat.com, Max Reitz , Gerd Hoffmann , Paolo Bonzini X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Reviewed-by: Peter Maydell Signed-off-by: Daniel P. Berrang=C3=A9 --- docs/system/tls.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/system/tls.rst b/docs/system/tls.rst index dc2b94257f..b0973afe1b 100644 --- a/docs/system/tls.rst +++ b/docs/system/tls.rst @@ -64,7 +64,7 @@ interactive prompts from certtool:: cert_signing_key EOF # certtool --generate-self-signed \ - --load-privkey ca-key.pem + --load-privkey ca-key.pem \ --template ca.info \ --outfile ca-cert.pem =20 --=20 2.29.2 From nobody Tue May 7 20:26:32 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1611940429; cv=none; d=zohomail.com; s=zohoarc; b=Z0wGMYe+VSqIzjeGhIa30WvcfbG/nWknKJ01BMP1BloDwJpIyn5RYpmSb4QjQe00i9k4X1PE/mnTPyVxxGmYMIfcw/9QDGIBUfON49MVXxfzEoG3O7J9lCXgLgpucmFL76a9Wz4rfiXpGPeqF5TYdyJxeSmW+rrm5VbmCgalwyo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1611940429; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=VKXhDcY2fr9D/W+PiAuP5BWT+VMuGcseLcNFfSXuLpM=; b=EJsHEQg+9b1DT0ARU4g9+XJHp2TyCu9nXrCS7wAkp7CtT6vv71RDHEVDe+xPq9Y3ZHiEPtz9rqSh6+d+OgkHtkYcz/jQfvuC3c0dhl5n6PJXoNwhN1SChNvr00fXmCw1qmExFRGbbq9OOUyYZGx5Hc117urq+yexpRFmCg5DaTo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 161194042942997.05632899240618; Fri, 29 Jan 2021 09:13:49 -0800 (PST) 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-185-guD4nloxNPu7W9RKFxGq2g-1; Fri, 29 Jan 2021 12:13:42 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id BCB0810054FF; Fri, 29 Jan 2021 17:13:35 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 995C0179B3; Fri, 29 Jan 2021 17:13:35 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 6162D5003C; Fri, 29 Jan 2021 17:13:35 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 10THDX6M019333 for ; Fri, 29 Jan 2021 12:13:33 -0500 Received: by smtp.corp.redhat.com (Postfix) id 4C99B5D71B; Fri, 29 Jan 2021 17:13:33 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-115-94.ams2.redhat.com [10.36.115.94]) by smtp.corp.redhat.com (Postfix) with ESMTP id 190F66B544; Fri, 29 Jan 2021 17:12:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1611940428; h=from:from:sender:sender: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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=VKXhDcY2fr9D/W+PiAuP5BWT+VMuGcseLcNFfSXuLpM=; b=bQyb4HZyM9RVawAOQ9OJ1FpyuKH8RlAgAPflkRts78skGSwkLGOpbC4CCaieF12SD6SZjb co+WIunHimO0paRSDx1cSpWACMnQyD3eTkFHk0yLQb8aKuPuBB3UFbyBM912ofY+hjKtH1 +gS6aBdWVIiSPymn5wUztzd0MHLFYx0= X-MC-Unique: guD4nloxNPu7W9RKFxGq2g-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 09/13] configure: replace --enable/disable-git-update with --with-git-submodules Date: Fri, 29 Jan 2021 17:10:58 +0000 Message-Id: <20210129171102.4109641-10-berrange@redhat.com> In-Reply-To: <20210129171102.4109641-1-berrange@redhat.com> References: <20210129171102.4109641-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Cc: Kevin Wolf , qemu-block@nongnu.org, libvir-list@redhat.com, Max Reitz , Dan Streetman , Gerd Hoffmann , Paolo Bonzini X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) From: Dan Streetman Replace the --enable-git-update and --disable-git-update configure params with the param --with-git-submodules=3D(update|validate|ignore) to allow 3 options for building from a git repo. This is needed because downstream packagers, e.g. Debian, Ubuntu, etc, also keep the source code in git, but do not want to enable the 'git_update' mode; with the current code, that's not possible even if the downstream package specifies --disable-git-update. The previous parameters are deprecated but still available; the --enable-git-update parameter maps to --with-git-submodules=3Dupdate and --disable-git-update parameter maps to --with-git-submodules=3Dvalidate. The configure script behavior is slightly modified, where previously the dtc, capstone, and slirp submodules were not validated when --disable-git-update was specified (but were updated with git-update enabled), now they are validated when using --with-git-submodules=3Dvalidate and are only ignored when using --with-git-submodules=3Dignore. Signed-off-by: Dan Streetman Signed-off-by: Daniel P. Berrang=C3=A9 --- Makefile | 24 ++----------------- configure | 51 ++++++++++++++++++++++++++++++---------- scripts/git-submodule.sh | 34 ++++++++++++++++++++------- 3 files changed, 66 insertions(+), 43 deletions(-) diff --git a/Makefile b/Makefile index 291ea19f2e..b0dff73904 100644 --- a/Makefile +++ b/Makefile @@ -47,30 +47,10 @@ git-submodule-update: Makefile: .git-submodule-status =20 .PHONY: git-submodule-update - -git_module_status :=3D $(shell \ - cd '$(SRC_PATH)' && \ - GIT=3D"$(GIT)" ./scripts/git-submodule.sh status $(GIT_SUBMODULES); \ - echo $$?; \ -) - -ifeq (1,$(git_module_status)) -ifeq (no,$(GIT_UPDATE)) git-submodule-update: $(call quiet-command, \ - echo && \ - echo "GIT submodule checkout is out of date. Please run" && \ - echo " scripts/git-submodule.sh update $(GIT_SUBMODULES)" && \ - echo "from the source directory checkout $(SRC_PATH)" && \ - echo && \ - exit 1) -else -git-submodule-update: - $(call quiet-command, \ - (cd $(SRC_PATH) && GIT=3D"$(GIT)" ./scripts/git-submodule.sh upd= ate $(GIT_SUBMODULES)), \ - "GIT","$(GIT_SUBMODULES)") -endif -endif + (GIT=3D"$(GIT)" "$(SRC_PATH)/scripts/git-submodule.sh" $(GIT_SUBMODULES_= ACTION) $(GIT_SUBMODULES)), \ + "GIT","$(GIT_SUBMODULES)") =20 # 0. ensure the build tree is okay =20 diff --git a/configure b/configure index 87de49e2c2..8fc59848b2 100755 --- a/configure +++ b/configure @@ -254,12 +254,12 @@ gdb_bin=3D$(command -v "gdb-multiarch" || command -v = "gdb") =20 if test -e "$source_path/.git" then - git_update=3Dyes + git_submodules_action=3D"update" git_submodules=3D"ui/keycodemapdb" git_submodules=3D"$git_submodules tests/fp/berkeley-testfloat-3" git_submodules=3D"$git_submodules tests/fp/berkeley-softfloat-3" else - git_update=3Dno + git_submodules_action=3D"ignore" git_submodules=3D"" =20 if ! test -f "$source_path/ui/keycodemapdb/README" @@ -1508,9 +1508,16 @@ for opt do ;; --with-git=3D*) git=3D"$optarg" ;; - --enable-git-update) git_update=3Dyes + --enable-git-update) + git_submodules_action=3D"update" + echo "--enable-git-update deprecated, use --with-git-submodules=3Dup= date" ;; - --disable-git-update) git_update=3Dno + --disable-git-update) + git_submodules_action=3D"validate" + echo "--disable-git-update deprecated, use --with-git-submodules=3Dv= alidate" + ;; + --with-git-submodules=3D*) + git_submodules_action=3D"$optarg" ;; --enable-debug-mutex) debug_mutex=3Dyes ;; @@ -1566,6 +1573,21 @@ for opt do esac done =20 +case $git_submodules_action in + update|validate) + if test ! -e "$source_path/.git"; then + echo "ERROR: cannot $git_submodules_action git submodules with= out .git" + exit 1 + fi + ;; + ignore) + ;; + *) + echo "ERROR: invalid --with-git-submodules=3D value '$git_submodul= es_action'" + exit 1 + ;; +esac + libdir=3D"${libdir:-$prefix/lib}" libexecdir=3D"${libexecdir:-$prefix/libexec}" includedir=3D"${includedir:-$prefix/include}" @@ -1710,6 +1732,9 @@ Advanced options (experts only): --ninja=3DNINJA use specified ninja [$ninja] --smbd=3DSMBD use specified smbd [$smbd] --with-git=3DGIT use specified git [$git] + --with-git-submodules=3Dupdate update git submodules (default if .git = dir exists) + --with-git-submodules=3Dvalidate fail if git submodules are not up to da= te + --with-git-submodules=3Dignore do not update or check git submodules (= default if no .git dir) --static enable static build [$static] --mandir=3DPATH install man pages in PATH --datadir=3DPATH install firmware in PATH/$qemu_suffix @@ -1926,7 +1951,7 @@ python=3D"$python -B" if test -z "$meson"; then if test "$explicit_python" =3D no && has meson && version_ge "$(meson = --version)" 0.55.3; then meson=3Dmeson - elif test -e "${source_path}/.git" && test $git_update =3D 'yes' ; then + elif test $git_submodules_action !=3D 'ignore' ; then meson=3Dgit elif test -e "${source_path}/meson/meson.py" ; then meson=3Dinternal @@ -1994,7 +2019,7 @@ fi # Consult white-list to determine whether to enable werror # by default. Only enable by default for git builds if test -z "$werror" ; then - if test -e "$source_path/.git" && \ + if test "$git_submodules_action" !=3D "ignore" && \ { test "$linux" =3D "yes" || test "$mingw32" =3D "yes"; }; then werror=3D"yes" else @@ -3550,7 +3575,7 @@ fi case "$fdt" in auto | enabled | internal) # Simpler to always update submodule, even if not needed. - if test -e "${source_path}/.git" && test $git_update =3D 'yes' ; then + if test "$git_submodules_action" !=3D "ignore"; then git_submodules=3D"${git_submodules} dtc" fi ;; @@ -4264,7 +4289,7 @@ fi case "$capstone" in auto | enabled | internal) # Simpler to always update submodule, even if not needed. - if test -e "${source_path}/.git" && test $git_update =3D 'yes' ; then + if test "$git_submodules_action" !=3D "ignore"; then git_submodules=3D"${git_submodules} capstone" fi ;; @@ -5211,7 +5236,7 @@ fi case "$slirp" in auto | enabled | internal) # Simpler to always update submodule, even if not needed. - if test -e "${source_path}/.git" && test $git_update =3D 'yes' ; then + if test "$git_submodules_action" !=3D "ignore"; then git_submodules=3D"${git_submodules} slirp" fi ;; @@ -5385,7 +5410,7 @@ if test "$cpu" =3D "s390x" ; then roms=3D"$roms s390-ccw" # SLOF is required for building the s390-ccw firmware on s390x, # since it is using the libnet code from SLOF for network booting. - if test -e "${source_path}/.git" ; then + if test "$git_submodules_action" !=3D "ignore"; then git_submodules=3D"${git_submodules} roms/SLOF" fi fi @@ -5423,8 +5448,8 @@ else cxx=3D fi =20 -if test $git_update =3D 'yes' ; then - (cd "${source_path}" && GIT=3D"$git" "./scripts/git-submodule.sh" upda= te "$git_submodules") +if !(GIT=3D"$git" "$source_path/scripts/git-submodule.sh" "$git_submodules= _action" "$git_submodules"); then + exit 1 fi =20 config_host_mak=3D"config-host.mak" @@ -5435,7 +5460,7 @@ echo >> $config_host_mak echo all: >> $config_host_mak echo "GIT=3D$git" >> $config_host_mak echo "GIT_SUBMODULES=3D$git_submodules" >> $config_host_mak -echo "GIT_UPDATE=3D$git_update" >> $config_host_mak +echo "GIT_SUBMODULES_ACTION=3D$git_submodules_action" >> $config_host_mak =20 echo "ARCH=3D$ARCH" >> $config_host_mak =20 diff --git a/scripts/git-submodule.sh b/scripts/git-submodule.sh index 65ed877aef..e225d3a963 100755 --- a/scripts/git-submodule.sh +++ b/scripts/git-submodule.sh @@ -9,9 +9,14 @@ command=3D$1 shift maybe_modules=3D"$@" =20 +# if --with-git-submodules=3Dignore, do nothing +test "$command" =3D "ignore" && exit 0 + test -z "$GIT" && GIT=3Dgit =20 -error() { +cd "$(dirname "$0")/.." + +update_error() { echo "$0: $*" echo echo "Unable to automatically checkout GIT submodules '$modules'." @@ -24,7 +29,7 @@ error() { echo "Alternatively you may disable automatic GIT submodule checkout" echo "with:" echo - echo " $ ./configure --disable-git-update" + echo " $ ./configure --with-git-submodules=3Dvalidate" echo echo "and then manually update submodules prior to running make, with:" echo @@ -33,6 +38,19 @@ error() { exit 1 } =20 +validate_error() { + if test "$1" =3D "validate"; then + echo "GIT submodules checkout is out of date, and submodules" + echo "configured for validate only. Please run" + echo " scripts/git-submodule.sh update $maybe_modules" + echo "from the source directory or call configure with" + echo " --with-git-submodules=3Dupdate" + echo "To disable GIT submodules validation, use" + echo " --with-git-submodules=3Dignore" + fi + exit 1 +} + modules=3D"" for m in $maybe_modules do @@ -52,18 +70,18 @@ then fi =20 case "$command" in -status) +status|validate) if test -z "$maybe_modules" then - test -s ${substat} && exit 1 || exit 0 + test -s ${substat} && validate_error "$command" || exit 0 fi =20 - test -f "$substat" || exit 1 + test -f "$substat" || validate_error "$command" for module in $modules; do CURSTATUS=3D$($GIT submodule status $module) OLDSTATUS=3D$(cat $substat | grep $module) if test "$CURSTATUS" !=3D "$OLDSTATUS"; then - exit 1 + validate_error "$command" fi done exit 0 @@ -76,10 +94,10 @@ update) fi =20 $GIT submodule update --init $modules 1>/dev/null - test $? -ne 0 && error "failed to update modules" + test $? -ne 0 && update_error "failed to update modules" =20 $GIT submodule status $modules > "${substat}" - test $? -ne 0 && error "failed to save git submodule status" >&2 + test $? -ne 0 && update_error "failed to save git submodule status" >&2 ;; esac =20 --=20 2.29.2 From nobody Tue May 7 20:26:32 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1611940457; cv=none; d=zohomail.com; s=zohoarc; b=cx5/8OMzjLLbxlfHpuqUlYVGxXXX2l4dwVeFAK/wAxp8pec7ldt/0dH7BBIfIFFKruZuEKlKu5EQLBBWNxB7yW9dmxjm57S1hdQv587bvCdttwHXwQufhu3K6UyVpjUs4AQeyiatZh0J5fDiEzKI+2xGrzihGbxd9zgraPcWydY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1611940457; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Gbi6B0K/FuSJi96fDmspZ/JcpueXhhF8FsKIc8ujvn0=; b=WcvzJgfFxH7mVelhcZcpMjIYBjWl4R5fu9/+ygXkVBmt1X0rYue5+KwO690NJL8dxigIQA2g3/ylyCRM00tiOqN4k/ncx2JmsvHak8BnnDQYSc/chHcpV55sssx7TM+v1akOyUJtodSTCrsYwXRN1IEggsTbFeuDvZ7ZfLlvxbs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1611940457187264.0139557206272; Fri, 29 Jan 2021 09:14:17 -0800 (PST) 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-210-3vk7pyybNtWYQU099zrM7g-1; Fri, 29 Jan 2021 12:14:08 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5BDD48066E9; Fri, 29 Jan 2021 17:14:01 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3AFAA60CD0; Fri, 29 Jan 2021 17:14:01 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 02D8C1809C9F; Fri, 29 Jan 2021 17:14:01 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 10THDxRX019497 for ; Fri, 29 Jan 2021 12:14:00 -0500 Received: by smtp.corp.redhat.com (Postfix) id ECA725B694; Fri, 29 Jan 2021 17:13:59 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-115-94.ams2.redhat.com [10.36.115.94]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9D1485D705; Fri, 29 Jan 2021 17:13:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1611940451; h=from:from:sender:sender: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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=Gbi6B0K/FuSJi96fDmspZ/JcpueXhhF8FsKIc8ujvn0=; b=BLHlVxuEwiwxaee5V5ggtxPGbMk8n4tmkK9guEa8pBdp9odpygR0MwSD/TZyEsRKZ7Bn4V OKICdJYyir9Os3QgoPtLsKgbJC4yPyuzt5AIwzu8jvBaFf5oVp+SJlaq5I6dcfJ3uk3Phm kn+z6anXXGA0FcAHWarkCSU5eFIWxWs= X-MC-Unique: 3vk7pyybNtWYQU099zrM7g-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 10/13] crypto: Add spaces around operator Date: Fri, 29 Jan 2021 17:10:59 +0000 Message-Id: <20210129171102.4109641-11-berrange@redhat.com> In-Reply-To: <20210129171102.4109641-1-berrange@redhat.com> References: <20210129171102.4109641-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Cc: Kevin Wolf , qemu-block@nongnu.org, libvir-list@redhat.com, shiliyang , Max Reitz , Gerd Hoffmann , Paolo Bonzini X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) From: shiliyang I am reading crypto related code, find some code style problems while using checkpatch.pl to check crypto folder. Fix the error style problems. Signed-off-by: Liyang Shi Signed-off-by: Daniel P. Berrang=C3=A9 --- crypto/aes.c | 4 ++-- crypto/desrfb.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/crypto/aes.c b/crypto/aes.c index 56efc95196..af72ff7779 100644 --- a/crypto/aes.c +++ b/crypto/aes.c @@ -1080,9 +1080,9 @@ int AES_set_encrypt_key(const unsigned char *userKey,= const int bits, =20 rk =3D key->rd_key; =20 - if (bits=3D=3D128) + if (bits =3D=3D 128) key->rounds =3D 10; - else if (bits=3D=3D192) + else if (bits =3D=3D 192) key->rounds =3D 12; else key->rounds =3D 14; diff --git a/crypto/desrfb.c b/crypto/desrfb.c index 675847c93b..b2a105ebbc 100644 --- a/crypto/desrfb.c +++ b/crypto/desrfb.c @@ -93,7 +93,7 @@ void deskey(unsigned char *key, int edf) } for( j =3D 0; j < 24; j++ ) { if( pcr[pc2[j]] ) kn[m] |=3D bigbyte[j]; - if( pcr[pc2[j+24]] ) kn[n] |=3D bigbyte[j]; + if( pcr[pc2[j + 24]] ) kn[n] |=3D bigbyte[j]; } } cookey(kn); --=20 2.29.2 From nobody Tue May 7 20:26:32 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1611940468; cv=none; d=zohomail.com; s=zohoarc; b=ARpoC6ZOItzyn+z0fAP9N06bbuoSZdsfjs+a7cv+E1ecsvM5xaR94rmussUUvsK6q+g5xK+2hYwdkxyXcR5ZmIRdLJgQtbX6aLb7jZE68Q9UitZSuy+YwCcfWiVaNpIRtXs9UBom4/QAqx0+yjOnrkSXzqhlQC+ZnEro3zbc/Q0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1611940468; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=XjKCfSj/EWNFUSOhuv/JcgrJDeWDOxrG0F3zpFldsqM=; b=Zmf8bRT8qex+265ZfYsduY0eBDiP0yu8yiHaSqskpiWoJlptsr02t3eRDDvGLnAH0OthKUUC4uyenjn4wiUhkxnJuwOnhEj2R6B8i6Jj81dQ9uN4Ra4F/yUxQUzlIPi+95cg/Kc5/NpvMLa1QdUGKEoq1BIKmCnD5wsCnf1CXLU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1611940468805570.9208954439964; Fri, 29 Jan 2021 09:14:28 -0800 (PST) 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-364-4-fyoPGlPvOND475yu0y_A-1; Fri, 29 Jan 2021 12:14:22 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3199A8066E9; Fri, 29 Jan 2021 17:14:14 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0DFAD5D9C9; Fri, 29 Jan 2021 17:14:14 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id C11F45003D; Fri, 29 Jan 2021 17:14:13 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 10THECJP019545 for ; Fri, 29 Jan 2021 12:14:12 -0500 Received: by smtp.corp.redhat.com (Postfix) id 1EC7262688; Fri, 29 Jan 2021 17:14:12 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-115-94.ams2.redhat.com [10.36.115.94]) by smtp.corp.redhat.com (Postfix) with ESMTP id 46C896267E; Fri, 29 Jan 2021 17:14:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1611940466; h=from:from:sender:sender: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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=XjKCfSj/EWNFUSOhuv/JcgrJDeWDOxrG0F3zpFldsqM=; b=jDIPXPg+Tb1GPHhQoA+i92Ph+Lj0JX+fpBjexUUM+IS25YX68l3tu4UBtkngSmzh3cTiD9 R4Cwr2y0FI6BYl1P/0VD9opt42OGwKrXKCKWj3g4aE23g4Nf88b5mz2XLXEz47zIokPVdr d2x0zXEFkvTucyPbLc+LBZoX/8j3u88= X-MC-Unique: 4-fyoPGlPvOND475yu0y_A-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 11/13] ui: update keycodemapdb submodule commit Date: Fri, 29 Jan 2021 17:11:00 +0000 Message-Id: <20210129171102.4109641-12-berrange@redhat.com> In-Reply-To: <20210129171102.4109641-1-berrange@redhat.com> References: <20210129171102.4109641-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Cc: Kevin Wolf , qemu-block@nongnu.org, libvir-list@redhat.com, Max Reitz , Gerd Hoffmann , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Primarily this is to pull in a fix for Win32 keycodes. The other useful change is the removal of build timestamp from generated files which is desirable for reproducable builds. The make rules need updating due to slightly changed CLI syntax - more args must now come after the command name. 6119e6e19a050df847418de7babe5166779955e4 Fix scan codes for Korean keys 685684a8404301780714e8a89a871981e7cae988 Fix argument order in output heade= rs b3774853042c951b200d767697285781cc59a83c Add HTML entries for Korean layout= keys 8e54850d800e4697a2798fb82ac740e760f8530b Add macOS entries for Japanese key= boards 27acf0ef828bf719b2053ba398b195829413dbdd Fix win32 keycode for VK_OEM_102 317d3eeb963a515e15a63fa356d8ebcda7041a51 Add support for generating RST for= matted docs pages 7381b9bfadd31c4c9e9a10b5bb5032f9189d4352 Introduce separate args for title = & subtitle with docs generator 6280c94f306df6a20bbc100ba15a5a81af0366e6 keymap-gen: Name sections in pod o= utput df4e56f8fab65ba714ec18f4e7338a966a1620ad Add an empty meson project 16e5b0787687d8904dad2c026107409eb9bfcb95 remove buildtime from generated fi= les 044f21dd0d4f62519aae9f1d53a026407a0b664f add header file generators 7779876a6b06755e3bb2c94ee3ded50635bcb0fa c++: add extern declaration to the= generated file 0e0a317889464397d6f1ae03aad0d2ca593aab04 move CLanguageGenerator closer to = CLanguageGenerator itself Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Daniel P. Berrang=C3=A9 --- ui/keycodemapdb | 2 +- ui/meson.build | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ui/keycodemapdb b/ui/keycodemapdb index 6b3d716e2b..6119e6e19a 160000 --- a/ui/keycodemapdb +++ b/ui/keycodemapdb @@ -1 +1 @@ -Subproject commit 6b3d716e2b6472eb7189d3220552280ef3d832ce +Subproject commit 6119e6e19a050df847418de7babe5166779955e4 diff --git a/ui/meson.build b/ui/meson.build index 634fabab0d..156b600a99 100644 --- a/ui/meson.build +++ b/ui/meson.build @@ -127,9 +127,10 @@ if have_system or xkbcommon.found() capture: true, input: files('keycodemapdb/data/keymaps.csv'), command: [python.full_path(), files('keycodemapdb/tools/= keymap-gen'), + 'code-map', '--lang', 'glib2', '--varname', 'qemu_input_map_@0@_to_@1@'.forma= t(e[0], e[1]), - 'code-map', '@INPUT0@', e[0], e[1]]) + '@INPUT0@', e[0], e[1]]) endforeach endif =20 --=20 2.29.2 From nobody Tue May 7 20:26:32 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1611940505; cv=none; d=zohomail.com; s=zohoarc; b=GIitPrjyQPGV8zUpSJisr23Ea5x56kUDQC5DIFVEJBvmBlVEK6WIkwtd9aPOXWx23u1Nsl/1WzgnUYzfuZKQnmMc5/fJ4VxIGatucVTlPPwHHZRgshKmOKFGRJKPPvA1M17HbpIZvH3D+63+yJkx2HgtqOpq8EV4Ri6lQ0/UthU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1611940505; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=8nPNfO81PlYle/zzWJjxZiJWWSFeST7l/GLvM7fvdOc=; b=dvp0tmEEjw7SqdOYMBkP5KfKb7si5+JHqyPUExPRvaZ6nFF1aqZxhyNb9D0XARHAFsjFajcLKgOvS0HAGfOdrScwSba1If6rftxrLNZqFnjThn2Ar9GnqN8NMzsZ0sNGqbkE6JOw7IgT2Mr1eSRKUme8odORJ0A2E7mLVRfW4jc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1611940505137987.0109821549761; Fri, 29 Jan 2021 09:15:05 -0800 (PST) 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-491-ToKG56pdNMuepdawKmWrkg-1; Fri, 29 Jan 2021 12:14:24 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 90309107ACE8; Fri, 29 Jan 2021 17:14:15 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6E66A5C1B4; Fri, 29 Jan 2021 17:14:15 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 375155003F; Fri, 29 Jan 2021 17:14:15 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 10THEERK019557 for ; Fri, 29 Jan 2021 12:14:14 -0500 Received: by smtp.corp.redhat.com (Postfix) id 6776C5D71B; Fri, 29 Jan 2021 17:14:14 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-115-94.ams2.redhat.com [10.36.115.94]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6B1716267E; Fri, 29 Jan 2021 17:14:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1611940503; h=from:from:sender:sender: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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=8nPNfO81PlYle/zzWJjxZiJWWSFeST7l/GLvM7fvdOc=; b=K6GKAv1RaDPU2Z62scKBlkmkI0hQKWGz88fyoTtpMLe2sGoSi0c57XhwLC0WQgvDdd21wq jcyx1RGb9e5JjWpstdN1k5BF8zvSovAbjUycRtbEuW4fFwf0LVoFq5/pTJ8b4kEJUD0HU8 7PipAInwocGLxxudBYjPa1f5NHZqShU= X-MC-Unique: ToKG56pdNMuepdawKmWrkg-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 12/13] tests: Fix runtime error in test-authz-pam Date: Fri, 29 Jan 2021 17:11:01 +0000 Message-Id: <20210129171102.4109641-13-berrange@redhat.com> In-Reply-To: <20210129171102.4109641-1-berrange@redhat.com> References: <20210129171102.4109641-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Cc: Kevin Wolf , qemu-block@nongnu.org, libvir-list@redhat.com, Stefan Weil , Max Reitz , Gerd Hoffmann , Paolo Bonzini X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) From: Stefan Weil A test with sanitizers on macOS shows this error: authz/pamacct.c:50:25: runtime error: null pointer passed as argument 1= , which is declared to never be null /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/De= veloper/SDKs/MacOSX.sdk/usr/include/security/pam_appl.h:56:2: note: nonnull= attribute specified here Signed-off-by: Stefan Weil Signed-off-by: Daniel P. Berrang=C3=A9 --- tests/test-authz-pam.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/tests/test-authz-pam.c b/tests/test-authz-pam.c index 1baeadee03..4fe1ef2603 100644 --- a/tests/test-authz-pam.c +++ b/tests/test-authz-pam.c @@ -28,7 +28,7 @@ static bool failauth; =20 /* - * These two functions are exported by libpam.so. + * These three functions are exported by libpam.so. * * By defining them again here, our impls are resolved * by the linker instead of those in libpam.so @@ -50,6 +50,7 @@ pam_start(const char *service_name, const char *user, failauth =3D false; } =20 + *pamh =3D (pam_handle_t *)0xbadeaffe; return PAM_SUCCESS; } =20 @@ -65,6 +66,13 @@ pam_acct_mgmt(pam_handle_t *pamh, int flags) } =20 =20 +int +pam_end(pam_handle_t *pamh, int status) +{ + return PAM_SUCCESS; +} + + static void test_authz_unknown_service(void) { Error *local_err =3D NULL; --=20 2.29.2 From nobody Tue May 7 20:26:32 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1611940516; cv=none; d=zohomail.com; s=zohoarc; b=nWJ0U4bKDnlDF5cDbMaZey2vTY8PYFWhOe21zIPdQNLxmhdXlHcCRjoA4ekEFBKPl5JaIgGcAGy9FG/oHyHAPZisDPDrUBqcwTu5Jg1oyL+6TRT6yMtZIL0cmD3z348XVB6VzRxw6XphUBcqHUadr/blEGoUv01nPFdw9fKkIj8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1611940516; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Gkg3MzCPbavxuNiSJr19uftkEaAWeUeVqoQYbr9qNyQ=; b=ips7QBMidtCuEN/aL7tFD1CdrS/BCz3IfEai8bd3kYdvLKRVPbs0kk6YXiB7PupT+z4NIe/bPgniq/gMg/aQDULV8FVyWhRD9x8D5k2ikO2o/SOEl63xpyXbMlVDJRdoS8jZLoWm0tNiyXPVmjSV0NeUlWfM/hUcHVT7KKccOZM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1611940516383409.95703725144665; Fri, 29 Jan 2021 09:15:16 -0800 (PST) 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-604-vluNxJUbNBSH9DNgk226Mw-1; Fri, 29 Jan 2021 12:14:27 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 355DF18C8C00; Fri, 29 Jan 2021 17:14:21 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 116C95C290; Fri, 29 Jan 2021 17:14:21 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id CEEAD1809C9F; Fri, 29 Jan 2021 17:14:20 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 10THEJeC019589 for ; Fri, 29 Jan 2021 12:14:19 -0500 Received: by smtp.corp.redhat.com (Postfix) id 97D916268B; Fri, 29 Jan 2021 17:14:19 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-115-94.ams2.redhat.com [10.36.115.94]) by smtp.corp.redhat.com (Postfix) with ESMTP id AFFB95D705; Fri, 29 Jan 2021 17:14:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1611940515; h=from:from:sender:sender: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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=Gkg3MzCPbavxuNiSJr19uftkEaAWeUeVqoQYbr9qNyQ=; b=dGQME2rybOXkBTAc1iwcy6diPXOTc9IlXt/RENqmK4RVgPhpLpGHsAPeU2L5Kzch8XJXrT cKhXZ4osFfR5ftyF0GyiBGwKYRYUT8ExYBmp9qFd7rqJE60J/sR2DQw9zBLHmzvSKTkXOK 6RvhwKPgM40Fy4+pnGyAK6oMjYVsA9s= X-MC-Unique: vluNxJUbNBSH9DNgk226Mw-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 13/13] tests: Replace deprecated ASN1 code Date: Fri, 29 Jan 2021 17:11:02 +0000 Message-Id: <20210129171102.4109641-14-berrange@redhat.com> In-Reply-To: <20210129171102.4109641-1-berrange@redhat.com> References: <20210129171102.4109641-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Cc: Kevin Wolf , qemu-block@nongnu.org, libvir-list@redhat.com, Stefan Weil , Max Reitz , Gerd Hoffmann , Paolo Bonzini X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) From: Stefan Weil This fixes several compiler warnings on MacOS with Homebrew. The git development branch for forthcoming libtasn1 4.17.0 has introduced deprecation warnings for several macros/types that we use. Signed-off-by: Stefan Weil Signed-off-by: Daniel P. Berrang=C3=A9 --- tests/crypto-tls-x509-helpers.c | 10 +++++----- tests/crypto-tls-x509-helpers.h | 2 +- tests/pkix_asn1_tab.c | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/crypto-tls-x509-helpers.c b/tests/crypto-tls-x509-helper= s.c index 01b3daf358..97658592a2 100644 --- a/tests/crypto-tls-x509-helpers.c +++ b/tests/crypto-tls-x509-helpers.c @@ -30,7 +30,7 @@ * This stores some static data that is needed when * encoding extensions in the x509 certs */ -ASN1_TYPE pkix_asn1; +asn1_node pkix_asn1; =20 /* * To avoid consuming random entropy to generate keys, @@ -139,7 +139,7 @@ void test_tls_cleanup(const char *keyfile) /* * Turns an ASN1 object into a DER encoded byte array */ -static void test_tls_der_encode(ASN1_TYPE src, +static void test_tls_der_encode(asn1_node src, const char *src_name, gnutls_datum_t *res) { @@ -317,7 +317,7 @@ test_tls_generate_cert(QCryptoTLSTestCertReq *req, * the 'critical' field which we want control over */ if (req->basicConstraintsEnable) { - ASN1_TYPE ext =3D ASN1_TYPE_EMPTY; + asn1_node ext =3D NULL; =20 asn1_create_element(pkix_asn1, "PKIX1.BasicConstraints", &ext); asn1_write_value(ext, "cA", @@ -344,7 +344,7 @@ test_tls_generate_cert(QCryptoTLSTestCertReq *req, * to be 'critical' */ if (req->keyUsageEnable) { - ASN1_TYPE ext =3D ASN1_TYPE_EMPTY; + asn1_node ext =3D NULL; char str[2]; =20 str[0] =3D req->keyUsageValue & 0xff; @@ -374,7 +374,7 @@ test_tls_generate_cert(QCryptoTLSTestCertReq *req, * set this the hard way building up ASN1 data ourselves */ if (req->keyPurposeEnable) { - ASN1_TYPE ext =3D ASN1_TYPE_EMPTY; + asn1_node ext =3D NULL; =20 asn1_create_element(pkix_asn1, "PKIX1.ExtKeyUsageSyntax", &ext); if (req->keyPurposeOID1) { diff --git a/tests/crypto-tls-x509-helpers.h b/tests/crypto-tls-x509-helper= s.h index 08efba4e19..8fcd7785ab 100644 --- a/tests/crypto-tls-x509-helpers.h +++ b/tests/crypto-tls-x509-helpers.h @@ -125,7 +125,7 @@ void test_tls_cleanup(const char *keyfile); }; \ test_tls_generate_cert(&varname, NULL) =20 -extern const ASN1_ARRAY_TYPE pkix_asn1_tab[]; +extern const asn1_static_node pkix_asn1_tab[]; =20 #endif /* QCRYPTO_HAVE_TLS_TEST_SUPPORT */ =20 diff --git a/tests/pkix_asn1_tab.c b/tests/pkix_asn1_tab.c index f15fc515cb..4aaf736d3f 100644 --- a/tests/pkix_asn1_tab.c +++ b/tests/pkix_asn1_tab.c @@ -8,7 +8,7 @@ =20 #ifdef QCRYPTO_HAVE_TLS_TEST_SUPPORT =20 -const ASN1_ARRAY_TYPE pkix_asn1_tab[] =3D { +const asn1_static_node pkix_asn1_tab[] =3D { {"PKIX1", 536875024, 0}, {0, 1073741836, 0}, {"id-ce", 1879048204, 0}, --=20 2.29.2