From nobody Thu May 2 12:32:33 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1592933452; cv=none; d=zohomail.com; s=zohoarc; b=OB8HlW62HloBtcKY5hUREp2xcU8PThogHJSZSwskJxs5fvk2aRmHbMTbAmdpQZuEtArABjwpyVnSTJ5tRpi3tOsf9VnPt0tkdUxmLP053UFEEDDXwQ6ecm8qSmpeKltFtqqcYOE186B6ReCtw6E8k3VOupBMmnurwvMFUcr+XY8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592933452; 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=6iPGTeL0qE7rLuYxB8HEYjfyPQqHoQfjvyyUuliwuz8=; b=WKk4493Wogq9uoJAR5WuTTRuLiShbSZJPA9E8RxrGVJO3+fCpm7vf2gP/2SJ6u6krAmCXzdWmvEBynDnmMa7vpW7Z4Kk92esTB0ARb+Ie/NrhwiGl9t9AUZBvwXVDL9/4YEFlaU8L64XOeMDdJLwS4nlPZJS5w6Cqt0CZcArbsQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1592933452113528.5008092823106; Tue, 23 Jun 2020 10:30:52 -0700 (PDT) Received: from localhost ([::1]:36282 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jnmkz-0001RZ-Qm for importer@patchew.org; Tue, 23 Jun 2020 13:30:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36850) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jnmi7-0005fv-Qa for qemu-devel@nongnu.org; Tue, 23 Jun 2020 13:27:51 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:41272 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jnmi5-0003jB-CB for qemu-devel@nongnu.org; Tue, 23 Jun 2020 13:27:51 -0400 Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-46-oFldmEBPOgSV2ii_ovzE7Q-1; Tue, 23 Jun 2020 13:27:35 -0400 Received: by mail-wm1-f71.google.com with SMTP id t18so5077236wmj.5 for ; Tue, 23 Jun 2020 10:27:35 -0700 (PDT) Received: from localhost.localdomain (1.red-83-51-162.dynamicip.rima-tde.net. [83.51.162.1]) by smtp.gmail.com with ESMTPSA id h14sm7537052wrt.36.2020.06.23.10.27.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Jun 2020 10:27:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1592933268; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=6iPGTeL0qE7rLuYxB8HEYjfyPQqHoQfjvyyUuliwuz8=; b=B82uDzzv86bjFMUKYoK5450EYT4dYX1tyAEMEmHAMZEvCKMB3z1atfAmjX+bQEtIU9/EL5 CRQtswBK4+xcD33TDTCccPcL7Ec1AUvB5W1RSmtGtdI0rLxSm7IU4x5F5dV+YCFVoiJN2q oKc7axEFtXjgBlzkqwRP53c0/v4lNjY= X-MC-Unique: oFldmEBPOgSV2ii_ovzE7Q-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=6iPGTeL0qE7rLuYxB8HEYjfyPQqHoQfjvyyUuliwuz8=; b=QO+IjKXDUtTXw9X9x5mG1Ikxcj/OTpbnlwssFMxxzTKYfeV9mbvSL1tHBEhJFmuRgP ddCqZ/egfpZ/+U+v0sB5AfZBRieDldPmVgdXwZ+8ETlpUtQo5ubdOlwy5/IT78b9Sccy b6w3G2yj7W+jkTn4wRnJb/7qqktcjPhGpWDGjpp44/IlsqyoD2Mn0zibEZJzGvCR375H fEdcrQPv0sDvH9Ica6aVUcbXEzOq37H7PHHVwerdyDkNyOhVtPUmN4CHYp9aKXX+PYC/ X9B5QjWFC/T3rDuu8IGo/vvswXALH6Pd3RWT3RdN7kBkvyPq74xL2BTQUKA6lON5+mvU fZSw== X-Gm-Message-State: AOAM530QKkFTnOFc+4F5+pPcIzl0mVV7TUSOpRMKmAErX3aaewAlTvrq dduEl+XryiJvM7XxyfjMeGWJ/A1RWb8B6BV9B1pqF2RujwqZxlYRwh1frDW5lV5vlkp3vp46pZw E3RJFzjaIEIwz/Rc= X-Received: by 2002:a1c:8117:: with SMTP id c23mr17933016wmd.157.1592933254131; Tue, 23 Jun 2020 10:27:34 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwyFgE+KK6mSJSKkSj2ZbQnLEDez2opjktX0zqk7bPPuV3+YJrqZk7lu+Ql9yRsRFIhJMxMHA== X-Received: by 2002:a1c:8117:: with SMTP id c23mr17932942wmd.157.1592933252823; Tue, 23 Jun 2020 10:27:32 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v10 1/5] crypto: Add tls-cipher-suites object Date: Tue, 23 Jun 2020 19:27:22 +0200 Message-Id: <20200623172726.21040-2-philmd@redhat.com> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200623172726.21040-1-philmd@redhat.com> References: <20200623172726.21040-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8"; text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=205.139.110.120; envelope-from=philmd@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/23 01:53:54 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Laszlo Ersek , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) On the host OS, various aspects of TLS operation are configurable. In particular it is possible for the sysadmin to control the TLS cipher/protocol algorithms that applications are permitted to use. * Any given crypto library has a built-in default priority list defined by the distro maintainer of the library package (or by upstream). * The "crypto-policies" RPM (or equivalent host OS package) provides a config file such as "/etc/crypto-policies/config", where the sysadmin can set a high level (library-independent) policy. The "update-crypto-policies --set" command (or equivalent) is used to translate the global policy to individual library representations, producing files such as "/etc/crypto-policies/back-ends/*.config". The generated files, if present, are loaded by the various crypto libraries to override their own built-in defaults. For example, the GNUTLS library may read "/etc/crypto-policies/back-ends/gnutls.config". * A management application (or the QEMU user) may overide the system-wide crypto-policies config via their own config, if they need to diverge from the former. Thus the priority order is "QEMU user config" > "crypto-policies system config" > "library built-in config". Introduce the "tls-cipher-suites" object for exposing the ordered list of permitted TLS cipher suites from the host side to the guest firmware, via fw_cfg. The list is represented as an array of bytes. The priority at which the host-side policy is retrieved is given by the "priority" property of the new object type. For example, "priority=3D@SYSTEM" may be used to refer to "/etc/crypto-policies/back-ends/gnutls.config" (given that QEMU uses GNUTLS). The firmware uses the IANA_TLS_CIPHER array for configuring guest-side TLS, for example in UEFI HTTPS Boot. [Description from Daniel P. Berrang=C3=A9, edited by Laszlo Ersek.] Signed-off-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Laszlo Ersek Reviewed-by: Daniel P. Berrang=C3=A9 --- v10: rewrote logic (danpb) --- include/crypto/tls-cipher-suites.h | 39 ++++++++++ crypto/tls-cipher-suites.c | 115 +++++++++++++++++++++++++++++ crypto/Makefile.objs | 1 + crypto/trace-events | 5 ++ qemu-options.hx | 19 +++++ 5 files changed, 179 insertions(+) create mode 100644 include/crypto/tls-cipher-suites.h create mode 100644 crypto/tls-cipher-suites.c diff --git a/include/crypto/tls-cipher-suites.h b/include/crypto/tls-cipher= -suites.h new file mode 100644 index 0000000000..1be7917233 --- /dev/null +++ b/include/crypto/tls-cipher-suites.h @@ -0,0 +1,39 @@ +/* + * QEMU TLS Cipher Suites Registry (RFC8447) + * + * Copyright (c) 2019 Red Hat, Inc. + * + * Author: Philippe Mathieu-Daud=C3=A9 + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#ifndef QCRYPTO_TLSCIPHERSUITES_H +#define QCRYPTO_TLSCIPHERSUITES_H + +#include "qom/object.h" +#include "crypto/tlscreds.h" + +#define TYPE_QCRYPTO_TLS_CIPHER_SUITES "tls-cipher-suites" +#define QCRYPTO_TLS_CIPHER_SUITES(obj) \ + OBJECT_CHECK(QCryptoTLSCipherSuites, (obj), TYPE_QCRYPTO_TLS_CIPHER_SU= ITES) + +typedef struct QCryptoTLSCipherSuites { + /* */ + QCryptoTLSCreds parent_obj; + /* */ +} QCryptoTLSCipherSuites; + +/** + * qcrypto_tls_cipher_suites_get_data: + * @obj: pointer to a TLS cipher suites object + * @errp: pointer to a NULL-initialized error object + * + * Returns: reference to a byte array containing the data. + * The caller should release the reference when no longer + * required. + */ +GByteArray *qcrypto_tls_cipher_suites_get_data(QCryptoTLSCipherSuites *obj, + Error **errp); + +#endif /* QCRYPTO_TLSCIPHERSUITES_H */ diff --git a/crypto/tls-cipher-suites.c b/crypto/tls-cipher-suites.c new file mode 100644 index 0000000000..5b403f86c9 --- /dev/null +++ b/crypto/tls-cipher-suites.c @@ -0,0 +1,115 @@ +/* + * QEMU TLS Cipher Suites + * + * Copyright (c) 2019 Red Hat, Inc. + * + * Author: Philippe Mathieu-Daud=C3=A9 + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include "qemu/osdep.h" +#include "qapi/error.h" +#include "qom/object_interfaces.h" +#include "crypto/tlscreds.h" +#include "crypto/tls-cipher-suites.h" +#include "trace.h" + +/* + * IANA registered TLS ciphers: + * https://www.iana.org/assignments/tls-parameters/tls-parameters.xhtml#tl= s-parameters-4 + */ +typedef struct { + uint8_t data[2]; +} QEMU_PACKED IANA_TLS_CIPHER; + +GByteArray *qcrypto_tls_cipher_suites_get_data(QCryptoTLSCipherSuites *obj, + Error **errp) +{ + QCryptoTLSCreds *creds =3D QCRYPTO_TLS_CREDS(obj); + gnutls_priority_t pcache; + GByteArray *byte_array; + const char *err; + size_t i; + int ret; + + trace_qcrypto_tls_cipher_suite_priority(creds->priority); + ret =3D gnutls_priority_init(&pcache, creds->priority, &err); + if (ret < 0) { + error_setg(errp, "Syntax error using priority '%s': %s", + creds->priority, gnutls_strerror(ret)); + return NULL; + } + + byte_array =3D g_byte_array_new(); + + for (i =3D 0;; i++) { + int ret; + unsigned idx; + const char *name; + IANA_TLS_CIPHER cipher; + gnutls_protocol_t protocol; + const char *version; + + ret =3D gnutls_priority_get_cipher_suite_index(pcache, i, &idx); + if (ret =3D=3D GNUTLS_E_REQUESTED_DATA_NOT_AVAILABLE) { + break; + } + if (ret =3D=3D GNUTLS_E_UNKNOWN_CIPHER_SUITE) { + continue; + } + + name =3D gnutls_cipher_suite_info(idx, (unsigned char *)&cipher, + NULL, NULL, NULL, &protocol); + if (name =3D=3D NULL) { + continue; + } + + version =3D gnutls_protocol_get_name(protocol); + g_byte_array_append(byte_array, cipher.data, 2); + trace_qcrypto_tls_cipher_suite_info(cipher.data[0], + cipher.data[1], + version, name); + } + trace_qcrypto_tls_cipher_suite_count(byte_array->len); + gnutls_priority_deinit(pcache); + + return byte_array; +} + +static void qcrypto_tls_cipher_suites_complete(UserCreatable *uc, + Error **errp) +{ + QCryptoTLSCreds *creds =3D QCRYPTO_TLS_CREDS(uc); + + if (!creds->priority) { + error_setg(errp, "'priority' property is not set"); + return; + } +} + +static void qcrypto_tls_cipher_suites_class_init(ObjectClass *oc, void *da= ta) +{ + UserCreatableClass *ucc =3D USER_CREATABLE_CLASS(oc); + + ucc->complete =3D qcrypto_tls_cipher_suites_complete; +} + +static const TypeInfo qcrypto_tls_cipher_suites_info =3D { + .parent =3D TYPE_QCRYPTO_TLS_CREDS, + .name =3D TYPE_QCRYPTO_TLS_CIPHER_SUITES, + .instance_size =3D sizeof(QCryptoTLSCreds), + .class_size =3D sizeof(QCryptoTLSCredsClass), + .class_init =3D qcrypto_tls_cipher_suites_class_init, + .interfaces =3D (InterfaceInfo[]) { + { TYPE_USER_CREATABLE }, + { } + } +}; + +static void qcrypto_tls_cipher_suites_register_types(void) +{ + type_register_static(&qcrypto_tls_cipher_suites_info); +} + +type_init(qcrypto_tls_cipher_suites_register_types); diff --git a/crypto/Makefile.objs b/crypto/Makefile.objs index 707c02ad37..f1965b1a68 100644 --- a/crypto/Makefile.objs +++ b/crypto/Makefile.objs @@ -13,6 +13,7 @@ crypto-obj-y +=3D cipher.o crypto-obj-$(CONFIG_AF_ALG) +=3D afalg.o crypto-obj-$(CONFIG_AF_ALG) +=3D cipher-afalg.o crypto-obj-$(CONFIG_AF_ALG) +=3D hash-afalg.o +crypto-obj-$(CONFIG_GNUTLS) +=3D tls-cipher-suites.o crypto-obj-y +=3D tlscreds.o crypto-obj-y +=3D tlscredsanon.o crypto-obj-y +=3D tlscredspsk.o diff --git a/crypto/trace-events b/crypto/trace-events index 9e594d30e8..798b6067ab 100644 --- a/crypto/trace-events +++ b/crypto/trace-events @@ -21,3 +21,8 @@ qcrypto_tls_creds_x509_load_cert_list(void *creds, const = char *file) "TLS creds # tlssession.c qcrypto_tls_session_new(void *session, void *creds, const char *hostname, = const char *authzid, int endpoint) "TLS session new session=3D%p creds=3D%p= hostname=3D%s authzid=3D%s endpoint=3D%d" qcrypto_tls_session_check_creds(void *session, const char *status) "TLS se= ssion check creds session=3D%p status=3D%s" + +# tls-cipher-suites.c +qcrypto_tls_cipher_suite_priority(const char *name) "priority: %s" +qcrypto_tls_cipher_suite_info(uint8_t data0, uint8_t data1, const char *ve= rsion, const char *name) "data=3D[0x%02x,0x%02x] version=3D%s name=3D%s" +qcrypto_tls_cipher_suite_count(unsigned count) "count: %u" diff --git a/qemu-options.hx b/qemu-options.hx index 93bde2bbc8..4f519f35fd 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -4566,6 +4566,25 @@ SRST string as described at https://gnutls.org/manual/html_node/Priority-Strings.html. =20 + ``-object tls-cipher-suites,id=3Did,priority=3Dpriority`` + Creates a TLS cipher suites object, which can be used to control + the TLS cipher/protocol algorithms that applications are permitted + to use. + + The ``id`` parameter is a unique ID which frontends will use to + access the ordered list of permitted TLS cipher suites from the + host. + + The ``priority`` parameter allows to override the global default + priority used by gnutls. This can be useful if the system + administrator needs to use a weaker set of crypto priorities for + QEMU without potentially forcing the weakness onto all + applications. Or conversely if one wants wants a stronger + default for QEMU than for all other applications, they can do + this through this parameter. Its format is a gnutls priority + string as described at + https://gnutls.org/manual/html_node/Priority-Strings.html. + ``-object filter-buffer,id=3Did,netdev=3Dnetdevid,interval=3Dt[,queue= =3Dall|rx|tx][,status=3Don|off][,position=3Dhead|tail|id=3D][,insert=3D= behind|before]`` Interval t can't be 0, this filter batches the packet delivery: all packets arriving in a given interval on netdev netdevid are --=20 2.21.3 From nobody Thu May 2 12:32:33 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1592933324; cv=none; d=zohomail.com; s=zohoarc; b=NFJHFHB3R3feSOdUqBmHZWQSUJruzw4xA03t8gelr92gEp4VTqtwuCaGAlD+3CKtLY3ImA+Sd7RDSbait1BQqfapI0mB4+cnQO6NVAbrZdewls/ABW/4x9LljwOxxeEuxgcfIEftmD9jBxGbw44NtfIZ6wWeZ5/Rg7dy6oqXkjQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592933324; 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=Ta8fofB145HRjeBtGSzkFXoaX65FKHWgqbBS1sayKBY=; b=EkhLdbcM7vSld8kaH7D3klZm44oHct5efU7U8MVUISVtSdabNzSuR3MgA7iUDVYiNyYz9Jwtb6xdtqlnZQmPAj5KKLaABsMTvn51z+80+e17TWkTClaZkzJKgstVeM+OPmtssUp0ecMN1aGTcWKw+hGxRPpEyE7Hfh7v41wvOPg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1592933324962537.1337023371526; Tue, 23 Jun 2020 10:28:44 -0700 (PDT) Received: from localhost ([::1]:58732 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jnmix-0006Zo-Fu for importer@patchew.org; Tue, 23 Jun 2020 13:28:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36786) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jnmi0-0005UU-2o for qemu-devel@nongnu.org; Tue, 23 Jun 2020 13:27:44 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:29201 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jnmhy-0003fS-4g for qemu-devel@nongnu.org; Tue, 23 Jun 2020 13:27:43 -0400 Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-146-5N5sT3TMNLacBn_rSA-BeA-1; Tue, 23 Jun 2020 13:27:39 -0400 Received: by mail-wr1-f69.google.com with SMTP id b14so16082132wrp.0 for ; Tue, 23 Jun 2020 10:27:39 -0700 (PDT) Received: from localhost.localdomain (1.red-83-51-162.dynamicip.rima-tde.net. [83.51.162.1]) by smtp.gmail.com with ESMTPSA id v66sm4819101wme.13.2020.06.23.10.27.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Jun 2020 10:27:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1592933261; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Ta8fofB145HRjeBtGSzkFXoaX65FKHWgqbBS1sayKBY=; b=Ymy6n6SjKe9o39pNB8vmyKqZeS8xBeWD94lOyg9hXC9tsx5PSb8J1xa1Y5kD8rH28wv9Hh umfVTMxLyiVTxf6BJnfV03aMfvXQTBkWPYHJ9ZVly+EcH7Vnx/tYHcj+uP6bX4HyCXn6Xw njYOdpVfrk6Ilbs6R6VglnlBvvL7Wtg= X-MC-Unique: 5N5sT3TMNLacBn_rSA-BeA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Ta8fofB145HRjeBtGSzkFXoaX65FKHWgqbBS1sayKBY=; b=r5v883vQxLBPwoZsEtqJGyOrG7KWa9tlK9B7+ZiArBkbJBWU76rXeUUWDxYWn2us+T KoXhUZqRC8xhpOw846ax4c+HTkgLKiNYQVrX8yAKvfn7MfDkMxast26+t00pU4Sfu51y cGOzrGEKKO86uKqdzgcgALQ/dRdO5XAmODl2npm4pU30oT7noKqnFh/MqiW7W21pLKRr igWdshjOyiw1JVSrFG/pD3ZQtrWw+ZHtX9LQPZxQFFTsMt4dyPxPuaQ9oL/L3/iU9xoV TYfTnK+vCG6CdGTkXosClaiPn9JqX9p80moMUm2Wdt/jEusAm8L+gYdZZ/pmcL9njMb8 p80A== X-Gm-Message-State: AOAM532pn8FLrcOguHmMFtSnCZ9A5A0lU9NM5VZ6aX9lmeOcMN3hEutW syT+0XV6d3THvnEQMmQp80dwOpF8U+QP2mS4HARTrjjfGLkHbzohLYLdwPba9z5KX02c936vcA/ w7rgStK7iO20HAkM= X-Received: by 2002:a5d:60d1:: with SMTP id x17mr15034643wrt.293.1592933257745; Tue, 23 Jun 2020 10:27:37 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwKVtzcje9Rl+nWeaIqgypC+gP91BnSfn6lyOE8wHED7ZK5aMEBo+K9/2v65CiLwoQMupfuUw== X-Received: by 2002:a5d:60d1:: with SMTP id x17mr15034618wrt.293.1592933257496; Tue, 23 Jun 2020 10:27:37 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v10 2/5] hw/nvram/fw_cfg: Add the FW_CFG_DATA_GENERATOR interface Date: Tue, 23 Jun 2020 19:27:23 +0200 Message-Id: <20200623172726.21040-3-philmd@redhat.com> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200623172726.21040-1-philmd@redhat.com> References: <20200623172726.21040-1-philmd@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8"; text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=205.139.110.120; envelope-from=philmd@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/23 01:53:54 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Laszlo Ersek , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) The FW_CFG_DATA_GENERATOR allows any object to produce blob of data consumable by the fw_cfg device. Reviewed-by: Laszlo Ersek Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Daniel P. Berrang=C3=A9 --- docs/specs/fw_cfg.txt | 9 +++++++- include/hw/nvram/fw_cfg.h | 43 +++++++++++++++++++++++++++++++++++++++ hw/nvram/fw_cfg.c | 35 +++++++++++++++++++++++++++++++ 3 files changed, 86 insertions(+), 1 deletion(-) diff --git a/docs/specs/fw_cfg.txt b/docs/specs/fw_cfg.txt index 8f1ebc66fa..bc16daa38a 100644 --- a/docs/specs/fw_cfg.txt +++ b/docs/specs/fw_cfg.txt @@ -219,7 +219,7 @@ To check the result, read the "control" field: =20 =3D Externally Provided Items =3D =20 -As of v2.4, "file" fw_cfg items (i.e., items with selector keys above +Since v2.4, "file" fw_cfg items (i.e., items with selector keys above FW_CFG_FILE_FIRST, and with a corresponding entry in the fw_cfg file directory structure) may be inserted via the QEMU command line, using the following syntax: @@ -230,6 +230,13 @@ Or =20 -fw_cfg [name=3D],string=3D =20 +Since v5.1, QEMU allows some objects to generate fw_cfg-specific content, +the content is then associated with a "file" item using the 'gen_id' option +in the command line, using the following syntax: + + -object ,id=3D,[generator-specific-optio= ns] \ + -fw_cfg [name=3D],gen_id=3D + See QEMU man page for more documentation. =20 Using item_name with plain ASCII characters only is recommended. diff --git a/include/hw/nvram/fw_cfg.h b/include/hw/nvram/fw_cfg.h index 25d9307018..11feae3177 100644 --- a/include/hw/nvram/fw_cfg.h +++ b/include/hw/nvram/fw_cfg.h @@ -9,11 +9,36 @@ #define TYPE_FW_CFG "fw_cfg" #define TYPE_FW_CFG_IO "fw_cfg_io" #define TYPE_FW_CFG_MEM "fw_cfg_mem" +#define TYPE_FW_CFG_DATA_GENERATOR_INTERFACE "fw_cfg-data-generator" =20 #define FW_CFG(obj) OBJECT_CHECK(FWCfgState, (obj), TYPE_FW_CFG) #define FW_CFG_IO(obj) OBJECT_CHECK(FWCfgIoState, (obj), TYPE_FW_CFG_IO) #define FW_CFG_MEM(obj) OBJECT_CHECK(FWCfgMemState, (obj), TYPE_FW_CFG_MEM) =20 +#define FW_CFG_DATA_GENERATOR_CLASS(class) \ + OBJECT_CLASS_CHECK(FWCfgDataGeneratorClass, (class), \ + TYPE_FW_CFG_DATA_GENERATOR_INTERFACE) +#define FW_CFG_DATA_GENERATOR_GET_CLASS(obj) \ + OBJECT_GET_CLASS(FWCfgDataGeneratorClass, (obj), \ + TYPE_FW_CFG_DATA_GENERATOR_INTERFACE) + +typedef struct FWCfgDataGeneratorClass { + /*< private >*/ + InterfaceClass parent_class; + /*< public >*/ + + /** + * get_data: + * @obj: the object implementing this interface + * @errp: pointer to a NULL-initialized error object + * + * Returns: reference to a byte array containing the data. + * The caller should release the reference when no longer + * required. + */ + GByteArray *(*get_data)(Object *obj, Error **errp); +} FWCfgDataGeneratorClass; + typedef struct fw_cfg_file FWCfgFile; =20 #define FW_CFG_ORDER_OVERRIDE_VGA 70 @@ -263,6 +288,24 @@ void fw_cfg_add_file_callback(FWCfgState *s, const cha= r *filename, void *fw_cfg_modify_file(FWCfgState *s, const char *filename, void *data, size_t len); =20 +/** + * fw_cfg_add_from_generator: + * @s: fw_cfg device being modified + * @filename: name of new fw_cfg file item + * @gen_id: name of object implementing FW_CFG_DATA_GENERATOR interface + * @errp: pointer to a NULL initialized error object + * + * Add a new NAMED fw_cfg item with the content generated from the + * @gen_id object. The data generated by the @gen_id object is copied + * into the data structure of the fw_cfg device. + * The next available (unused) selector key starting at FW_CFG_FILE_FIRST + * will be used; also, a new entry will be added to the file directory + * structure residing at key value FW_CFG_FILE_DIR, containing the item na= me, + * data size, and assigned selector key value. + */ +void fw_cfg_add_from_generator(FWCfgState *s, const char *filename, + const char *gen_id, Error **errp); + FWCfgState *fw_cfg_init_io_dma(uint32_t iobase, uint32_t dma_iobase, AddressSpace *dma_as); FWCfgState *fw_cfg_init_io(uint32_t iobase); diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c index 0408a31f8e..694722b212 100644 --- a/hw/nvram/fw_cfg.c +++ b/hw/nvram/fw_cfg.c @@ -1032,6 +1032,35 @@ void *fw_cfg_modify_file(FWCfgState *s, const char *= filename, return NULL; } =20 +void fw_cfg_add_from_generator(FWCfgState *s, const char *filename, + const char *gen_id, Error **errp) +{ + FWCfgDataGeneratorClass *klass; + Error *local_err =3D NULL; + GByteArray *array; + Object *obj; + gsize size; + + obj =3D object_resolve_path_component(object_get_objects_root(), gen_i= d); + if (!obj) { + error_setg(errp, "Cannot find object ID '%s'", gen_id); + return; + } + if (!object_dynamic_cast(obj, TYPE_FW_CFG_DATA_GENERATOR_INTERFACE)) { + error_setg(errp, "Object ID '%s' is not a '%s' subclass", + gen_id, TYPE_FW_CFG_DATA_GENERATOR_INTERFACE); + return; + } + klass =3D FW_CFG_DATA_GENERATOR_GET_CLASS(obj); + array =3D klass->get_data(obj, &local_err); + if (local_err) { + error_propagate(errp, local_err); + return; + } + size =3D array->len; + fw_cfg_add_file(s, filename, g_byte_array_free(array, TRUE), size); +} + static void fw_cfg_machine_reset(void *opaque) { MachineClass *mc =3D MACHINE_GET_CLASS(qdev_get_machine()); @@ -1333,12 +1362,18 @@ static const TypeInfo fw_cfg_mem_info =3D { .class_init =3D fw_cfg_mem_class_init, }; =20 +static const TypeInfo fw_cfg_data_generator_interface_info =3D { + .parent =3D TYPE_INTERFACE, + .name =3D TYPE_FW_CFG_DATA_GENERATOR_INTERFACE, + .class_size =3D sizeof(FWCfgDataGeneratorClass), +}; =20 static void fw_cfg_register_types(void) { type_register_static(&fw_cfg_info); type_register_static(&fw_cfg_io_info); type_register_static(&fw_cfg_mem_info); + type_register_static(&fw_cfg_data_generator_interface_info); } =20 type_init(fw_cfg_register_types) --=20 2.21.3 From nobody Thu May 2 12:32:33 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1592933445; cv=none; d=zohomail.com; s=zohoarc; b=Gkd0c0eYbRgmY+6og8rGuO6T6f5jpd4jWRnn4VmLmfTPJufKxhhwnHx04+mIvXE0siVuybl2gPX9+fgW0Dr6dfot0g6J10pA3GUYAC90578SMEgRedsZfm+3yFspIIZuRyhZImqmq/g4uGLgTNMNmWAdFFm6sDcry3Vx3+Oe0c8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592933445; 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=DZXsJGMtxQbTmLRduHZwl5Kzulm7zv7lmzMMcaa1r5Q=; b=OOhWfVPOi8zWwcmIwUDCLDHzfCfHDPecHO7DtdDg6sMK2rhLBlSv0+nESxegaGNajJZDCz4Sz6A4dgoB/tO0xXLhjtEAxNgFxJyGxqLWQwOMQS0wNZkGSbzMJP+I27lkK2TnegpoanvLwMk/aqZAfo/WWiLiLuWNjZnPFrv9Zo0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1592933445896904.1492246836785; Tue, 23 Jun 2020 10:30:45 -0700 (PDT) Received: from localhost ([::1]:36040 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jnmku-0001B6-MW for importer@patchew.org; Tue, 23 Jun 2020 13:30:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36816) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jnmi3-0005Zb-Pr for qemu-devel@nongnu.org; Tue, 23 Jun 2020 13:27:47 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:25962 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jnmi1-0003hB-PD for qemu-devel@nongnu.org; Tue, 23 Jun 2020 13:27:47 -0400 Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-513-ZnsUwoogNOC0rP5rrUqcSg-1; Tue, 23 Jun 2020 13:27:43 -0400 Received: by mail-wr1-f71.google.com with SMTP id f5so16256269wrv.22 for ; Tue, 23 Jun 2020 10:27:43 -0700 (PDT) Received: from localhost.localdomain (1.red-83-51-162.dynamicip.rima-tde.net. [83.51.162.1]) by smtp.gmail.com with ESMTPSA id x18sm4478171wmi.35.2020.06.23.10.27.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Jun 2020 10:27:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1592933265; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=DZXsJGMtxQbTmLRduHZwl5Kzulm7zv7lmzMMcaa1r5Q=; b=aoRZTxUWNqt58TRqHIWFNKKVS+EvuzlZ6UFmPnAmYEkblENUvndjGVxO1O+WZCBM1oIvl5 Okaww2gzcstZRfM2MvD9ugi/nS7WnizTsAge0OKgouCtMuBSZXNx6adCC1qM8Gu0Xt2FX+ asQMjdSbJautc9NMdJUdVQhp7kyyrks= X-MC-Unique: ZnsUwoogNOC0rP5rrUqcSg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=DZXsJGMtxQbTmLRduHZwl5Kzulm7zv7lmzMMcaa1r5Q=; b=Tip4LztqJukQGROBrVHHpS1r+UE+iEYY2QCC5K9JhkGy+gon47qfUAkYshrFkG10Fi C6h4k3Uv526PY9WbCH5u6kXW5CYPcMryBzvIVfEAgd0UPWOdT+fQB5CnjIkOQNvy1trP 4243d4+TGI19dm8U29sLw3GfEybjSsKQrRG7TvCavQbMQqj60Nwa4y6Jhbm0I4SPxRnl iU/mrySx5Srf9lDgsor1dGOHsO0CCOVmdIPsnUxjQSkCs3ZT5dtLqnt6lPrUCZ3sj/LB yTObmxaF6IKt7JMc/6ErgckooY89LjmwQfx92RLgcg1sj5DGS0TxGetCzziHrfAmh9Bp E5Xw== X-Gm-Message-State: AOAM531M7pcIhyzDVnlo5aDeTaEqF5XckBxJzUE/JiDTT4mTepq+bYLq Yl+aGuJ33S2z1lvBMvC/XwWKvP+Gx36WDL2p+C6UhV1kqHIt4y279xEdFXeDTS5upyl1cm5IlQ8 0C16b+GOMXbqHtOc= X-Received: by 2002:a5d:5389:: with SMTP id d9mr27798814wrv.77.1592933262247; Tue, 23 Jun 2020 10:27:42 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxumqHKtuQBc9o/O3WjP5jFJ1dVzNrPWibTpfNDkMg2VkgtB1MkbX/lpx+0Eu1s2viRbmFNLw== X-Received: by 2002:a5d:5389:: with SMTP id d9mr27798796wrv.77.1592933262045; Tue, 23 Jun 2020 10:27:42 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v10 3/5] softmmu/vl: Let -fw_cfg option take a 'gen_id' argument Date: Tue, 23 Jun 2020 19:27:24 +0200 Message-Id: <20200623172726.21040-4-philmd@redhat.com> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200623172726.21040-1-philmd@redhat.com> References: <20200623172726.21040-1-philmd@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8"; text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=207.211.31.120; envelope-from=philmd@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/23 02:55:19 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Laszlo Ersek , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) The 'gen_id' argument refers to a QOM object able to produce data consumable by the fw_cfg device. The producer object must implement the FW_CFG_DATA_GENERATOR interface. Reviewed-by: Laszlo Ersek Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Daniel P. Berrang=C3=A9 --- softmmu/vl.c | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/softmmu/vl.c b/softmmu/vl.c index f669c06ede..a587261f34 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -489,6 +489,11 @@ static QemuOptsList qemu_fw_cfg_opts =3D { .name =3D "string", .type =3D QEMU_OPT_STRING, .help =3D "Sets content of the blob to be inserted from a stri= ng", + }, { + .name =3D "gen_id", + .type =3D QEMU_OPT_STRING, + .help =3D "Sets id of the object generating the fw_cfg blob " + "to be inserted", }, { /* end of list */ } }, @@ -2020,7 +2025,7 @@ static int parse_fw_cfg(void *opaque, QemuOpts *opts,= Error **errp) { gchar *buf; size_t size; - const char *name, *file, *str; + const char *name, *file, *str, *gen_id; FWCfgState *fw_cfg =3D (FWCfgState *) opaque; =20 if (fw_cfg =3D=3D NULL) { @@ -2030,14 +2035,13 @@ static int parse_fw_cfg(void *opaque, QemuOpts *opt= s, Error **errp) name =3D qemu_opt_get(opts, "name"); file =3D qemu_opt_get(opts, "file"); str =3D qemu_opt_get(opts, "string"); + gen_id =3D qemu_opt_get(opts, "gen_id"); =20 - /* we need name and either a file or the content string */ - if (!(nonempty_str(name) && (nonempty_str(file) || nonempty_str(str)))= ) { - error_setg(errp, "invalid argument(s)"); - return -1; - } - if (nonempty_str(file) && nonempty_str(str)) { - error_setg(errp, "file and string are mutually exclusive"); + /* we need the name, and exactly one of: file, content string, gen_id = */ + if (!nonempty_str(name) || + nonempty_str(file) + nonempty_str(str) + nonempty_str(gen_id) !=3D= 1) { + error_setg(errp, "name, plus exactly one of file," + " string and gen_id, are needed"); return -1; } if (strlen(name) > FW_CFG_MAX_FILE_PATH - 1) { @@ -2052,6 +2056,15 @@ static int parse_fw_cfg(void *opaque, QemuOpts *opts= , Error **errp) if (nonempty_str(str)) { size =3D strlen(str); /* NUL terminator NOT included in fw_cfg blo= b */ buf =3D g_memdup(str, size); + } else if (nonempty_str(gen_id)) { + Error *local_err =3D NULL; + + fw_cfg_add_from_generator(fw_cfg, name, gen_id, errp); + if (local_err) { + error_propagate(errp, local_err); + return -1; + } + return 0; } else { GError *err =3D NULL; if (!g_file_get_contents(file, &buf, &size, &err)) { --=20 2.21.3 From nobody Thu May 2 12:32:33 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1592933544; cv=none; d=zohomail.com; s=zohoarc; b=EtBGPyZfTflLrjM7Cvq2MjdM+/t+dnzvNQYypcWnOwGxHjeXejMRJEhafvpjRE2Qej71f3KAebW2JuMvQHGnxp/Ssdp5GG70F3RCnKqPsohttM3meAZrfNo3cIvSM2/gcw4xOFnPC6FzB4/PTjbpLjIzbsyPNKcwoblhbhL5SF4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592933544; 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=gWgKZYj6cuVtbKXzjFGd74SB2pAgnguDqOC2Xe3Mx+s=; b=e33AjmLeB2R3nTWiOjsbC2stSBBPkeYW1XLBD1o38Xuwe297gb8mPrLH0/lPUFu8x1UU7WU0jg3eWyoa7TIp73gujcNAE36CQK7xUsK+9JqWXuxBeOonsXUGMIzE/2XvPfNrZ754wHiJo4tFtkH66BwnBRnx8f0bMvKC3af/25U= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1592933543594308.77237716776483; Tue, 23 Jun 2020 10:32:23 -0700 (PDT) Received: from localhost ([::1]:40306 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jnmmS-0003gZ-4j for importer@patchew.org; Tue, 23 Jun 2020 13:32:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36854) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jnmi8-0005gW-6Y for qemu-devel@nongnu.org; Tue, 23 Jun 2020 13:27:52 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:21155 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jnmi6-0003kg-H8 for qemu-devel@nongnu.org; Tue, 23 Jun 2020 13:27:51 -0400 Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-364-B3Q5oa1JM7y8JX4oSvvCeg-1; Tue, 23 Jun 2020 13:27:48 -0400 Received: by mail-wr1-f69.google.com with SMTP id j5so13936866wro.6 for ; Tue, 23 Jun 2020 10:27:48 -0700 (PDT) Received: from localhost.localdomain (1.red-83-51-162.dynamicip.rima-tde.net. [83.51.162.1]) by smtp.gmail.com with ESMTPSA id v20sm23921818wrb.51.2020.06.23.10.27.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Jun 2020 10:27:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1592933269; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=gWgKZYj6cuVtbKXzjFGd74SB2pAgnguDqOC2Xe3Mx+s=; b=Ti0B+3JE14rLltcAlV6+SlIfOGYjCe37cD6S0ud5Hj3Xmy9ZVuuh6boxtybK/gJzQlHz2e X6IlyETTVcByF5VDvkaqAHbFE70NcINL+tBBRc/rUKJDNte5sPo6FGBsKtECET1iqLXc2L JipzgzAugoaGpksdasu8jNkGAl0shUg= X-MC-Unique: B3Q5oa1JM7y8JX4oSvvCeg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=gWgKZYj6cuVtbKXzjFGd74SB2pAgnguDqOC2Xe3Mx+s=; b=gXzGVZwghcoMS2Im9O3HPUV0KL9CqlcVxJJMi5s8R1YacM8WfKu38v01rYWwIYbaoZ nHfnP2nmG0ljQ6LRv0jUWOPX4jwcpx9L9qDdwFuYJAarY8lGvh2Ex9Pv7oV2iD+ZWzkd hvnG39180WBged273hWYiLX6m2VRSdFqe1957Pe26mgq3UsbPReIFYCH6g+Zr8PsW9b1 jz+BH66whM6opX6v+YOr+iqvgtmDtPUP8zp10kHerYvLmpFgsQ/rt43H02YQpWut2Nud WA1Se4GbUy1D6zcrP7r805euKGJWkrVhZmNs07AVIBqkqVoRaWZdAv951lAm5yJ1pfo7 BIwQ== X-Gm-Message-State: AOAM530HTS3PV/uDsQkxdMevYJQUrUiD79b2YjQtlKhQS13yrkMz6bGc W8v/S62Rjku4JQlOlKnSOUfTtNAmuaTan0b6aGDieuLV23le5IHRRxepDuscgaR9A2N/K2wHPz9 CLCx3Xg0QB7EKtyg= X-Received: by 2002:a1c:4c0d:: with SMTP id z13mr24005044wmf.97.1592933266762; Tue, 23 Jun 2020 10:27:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxGja2LFQ9PLn+M7uCUD6oJylvUjeO5NAnm9qImOUH1O2T7lOcDG7b9EpWIHcXCospfIGeWFg== X-Received: by 2002:a1c:4c0d:: with SMTP id z13mr24005032wmf.97.1592933266509; Tue, 23 Jun 2020 10:27:46 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v10 4/5] softmmu/vl: Allow -fw_cfg 'gen_id' option to use the 'etc/' namespace Date: Tue, 23 Jun 2020 19:27:25 +0200 Message-Id: <20200623172726.21040-5-philmd@redhat.com> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200623172726.21040-1-philmd@redhat.com> References: <20200623172726.21040-1-philmd@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8"; text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=205.139.110.120; envelope-from=philmd@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/23 01:53:54 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , Laszlo Ersek , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Names of user-provided fw_cfg items are supposed to start with "opt/". However FW_CFG_DATA_GENERATOR items are generated by QEMU, so allow the "etc/" namespace in this specific case. Reviewed-by: Laszlo Ersek Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Daniel P. Berrang=C3=A9 --- docs/specs/fw_cfg.txt | 4 ++++ softmmu/vl.c | 8 +++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/docs/specs/fw_cfg.txt b/docs/specs/fw_cfg.txt index bc16daa38a..3e6d586f66 100644 --- a/docs/specs/fw_cfg.txt +++ b/docs/specs/fw_cfg.txt @@ -258,4 +258,8 @@ Prefix "opt/org.qemu/" is reserved for QEMU itself. Use of names not beginning with "opt/" is potentially dangerous and entirely unsupported. QEMU will warn if you try. =20 +Use of names not beginning with "opt/" is tolerated with 'gen_id' (that +is, the warning is suppressed), but you must know exactly what you're +doing. + All externally provided fw_cfg items are read-only to the guest. diff --git a/softmmu/vl.c b/softmmu/vl.c index a587261f34..4d0c2c9038 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -2049,7 +2049,13 @@ static int parse_fw_cfg(void *opaque, QemuOpts *opts= , Error **errp) FW_CFG_MAX_FILE_PATH - 1); return -1; } - if (strncmp(name, "opt/", 4) !=3D 0) { + if (nonempty_str(gen_id)) { + /* + * In this particular case where the content is populated + * internally, the "etc/" namespace protection is relaxed, + * so do not emit a warning. + */ + } else if (strncmp(name, "opt/", 4) !=3D 0) { warn_report("externally provided fw_cfg item names " "should be prefixed with \"opt/\""); } --=20 2.21.3 From nobody Thu May 2 12:32:33 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1592933340; cv=none; d=zohomail.com; s=zohoarc; b=deVodaDlOdehCcPNbQOgtCJDWc1DPjVic44SGvppHH3gvzWzkF+L0BbaqR/mjmLc04m9OiipFR9En7LjkYb3lP+VFO7AM1fWO6a8OvBrZeHCoDXQLom1I4/mFy8cZxqToZzY+kcCzXAGNCSC6BwAWEX0jp0l7aSneQ6sZb3mQzI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592933340; 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=LRhf/BOyEtnWuCwhaLT5z/wF75mx5JS0IrqRF4jhdTg=; b=kPqC33GjBIczriiRpV/eYdjTlFgInFAjKRS0xQ1fNEwA+alrUOPQXEUlDlUGmu148KChX3hJqfaG+6QcgmaAivwIN32xfFEKGi2BzJ35yI1j6tw6lD0iU6u5uZDtM+AJbwqZKJcMKTC1nGAutmApG6gVkVwhhZrfNlz5y4Asy04= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1592933340436465.10235975984233; Tue, 23 Jun 2020 10:29:00 -0700 (PDT) Received: from localhost ([::1]:59894 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jnmjB-00073u-1m for importer@patchew.org; Tue, 23 Jun 2020 13:28:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36886) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jnmiD-0005o3-UK for qemu-devel@nongnu.org; Tue, 23 Jun 2020 13:27:57 -0400 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:36700 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jnmiB-0003nw-NN for qemu-devel@nongnu.org; Tue, 23 Jun 2020 13:27:57 -0400 Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-216-YIPWi4X3M3ecJ5CHdcWV9Q-1; Tue, 23 Jun 2020 13:27:52 -0400 Received: by mail-wm1-f69.google.com with SMTP id p24so5106725wmc.1 for ; Tue, 23 Jun 2020 10:27:52 -0700 (PDT) Received: from localhost.localdomain (1.red-83-51-162.dynamicip.rima-tde.net. [83.51.162.1]) by smtp.gmail.com with ESMTPSA id u20sm3458369wmm.15.2020.06.23.10.27.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Jun 2020 10:27:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1592933274; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=LRhf/BOyEtnWuCwhaLT5z/wF75mx5JS0IrqRF4jhdTg=; b=UwlntGE4TdUnqJ0lKkp9wgy/6GfB46bIoVVt67ZhIijof3Of392u6txcDjzfob47nY/8aI lb/ju4PJ2J+Psj7MGBl0E+iTV9t0N6cxz2qsnzI4tjZC1OXDDuOlRlta2j262B4aweN4Vv XEGyB7Dfc7zvchW3SCqAA8Q3HdwdeC4= X-MC-Unique: YIPWi4X3M3ecJ5CHdcWV9Q-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=LRhf/BOyEtnWuCwhaLT5z/wF75mx5JS0IrqRF4jhdTg=; b=ityTBFujwgZSAPAEIUu8OQo2f08QNXLdqZ4OMCpEqXFaV4pvCyYaltwC3DToDdyHHw n+Our5E+jEIwfAu6X8Ne8/O68HdLyCL8sv7oV6rDQTcQLllKrTWL4cd53c64Mo+RrFMM p3h6TdF9uTniGL/uOPq0rc1aHHgLtlqTu5n4JLam4MzJA1OcZtHx1+LIs1O18EygwuaX v+B2++gLEoH5j+3XMpFMJii3G92CZAxvvp+r8kqnbLGro46Ll/6Mr7oVLUnL7ZeVuTBj 59rGqFK6yq8LB2MgwfdENjpsO7l76zog5KbXXhmp9qZ+mV8qMb2wXIFUlQN4wfZuV2mJ hC/g== X-Gm-Message-State: AOAM530N1YcF8gyJusuzP2mPRoLbNj9f+hSB4uy9B+uRF8ja44B46wok 9SCRTANjoaC79WNPZiIa+90+DPwlzo2mv7rUHPaIkrnAyCaUClzaBm/O08UM9gQXbVQmwmKuOqY BlMUe5eC/wJ9+gz0= X-Received: by 2002:adf:ef01:: with SMTP id e1mr16362850wro.116.1592933271419; Tue, 23 Jun 2020 10:27:51 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwVH+lAMrCKFvJtm5krPJ4aHcjOIwJIpESAFUrEE0UFl1sZWgRtYJp6WBmDO1iKzncX49nXsw== X-Received: by 2002:adf:ef01:: with SMTP id e1mr16362827wro.116.1592933271166; Tue, 23 Jun 2020 10:27:51 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v10 5/5] crypto/tls-cipher-suites: Produce fw_cfg consumable blob Date: Tue, 23 Jun 2020 19:27:26 +0200 Message-Id: <20200623172726.21040-6-philmd@redhat.com> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200623172726.21040-1-philmd@redhat.com> References: <20200623172726.21040-1-philmd@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8"; text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=205.139.110.61; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/23 01:55:08 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Laszlo Ersek , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Since our format is consumable by the fw_cfg device, we can implement the FW_CFG_DATA_GENERATOR interface. Example of use to dump the cipher suites (if tracing enabled): $ qemu-system-x86_64 -S \ -object tls-cipher-suites,id=3Dmysuite1,priority=3D@SYSTEM \ -fw_cfg name=3Detc/path/to/ciphers,gen_id=3Dmysuite1 \ -trace qcrypto\* 1590664444.197123:qcrypto_tls_cipher_suite_priority priority: @SYSTEM 1590664444.197219:qcrypto_tls_cipher_suite_info data=3D[0x13,0x02] versio= n=3DTLS1.3 name=3DTLS_AES_256_GCM_SHA384 1590664444.197228:qcrypto_tls_cipher_suite_info data=3D[0x13,0x03] versio= n=3DTLS1.3 name=3DTLS_CHACHA20_POLY1305_SHA256 1590664444.197233:qcrypto_tls_cipher_suite_info data=3D[0x13,0x01] versio= n=3DTLS1.3 name=3DTLS_AES_128_GCM_SHA256 1590664444.197236:qcrypto_tls_cipher_suite_info data=3D[0x13,0x04] versio= n=3DTLS1.3 name=3DTLS_AES_128_CCM_SHA256 1590664444.197240:qcrypto_tls_cipher_suite_info data=3D[0xc0,0x30] versio= n=3DTLS1.2 name=3DTLS_ECDHE_RSA_AES_256_GCM_SHA384 1590664444.197245:qcrypto_tls_cipher_suite_info data=3D[0xcc,0xa8] versio= n=3DTLS1.2 name=3DTLS_ECDHE_RSA_CHACHA20_POLY1305 1590664444.197250:qcrypto_tls_cipher_suite_info data=3D[0xc0,0x14] versio= n=3DTLS1.0 name=3DTLS_ECDHE_RSA_AES_256_CBC_SHA1 1590664444.197254:qcrypto_tls_cipher_suite_info data=3D[0xc0,0x2f] versio= n=3DTLS1.2 name=3DTLS_ECDHE_RSA_AES_128_GCM_SHA256 1590664444.197258:qcrypto_tls_cipher_suite_info data=3D[0xc0,0x13] versio= n=3DTLS1.0 name=3DTLS_ECDHE_RSA_AES_128_CBC_SHA1 1590664444.197261:qcrypto_tls_cipher_suite_info data=3D[0xc0,0x2c] versio= n=3DTLS1.2 name=3DTLS_ECDHE_ECDSA_AES_256_GCM_SHA384 1590664444.197266:qcrypto_tls_cipher_suite_info data=3D[0xcc,0xa9] versio= n=3DTLS1.2 name=3DTLS_ECDHE_ECDSA_CHACHA20_POLY1305 1590664444.197270:qcrypto_tls_cipher_suite_info data=3D[0xc0,0xad] versio= n=3DTLS1.2 name=3DTLS_ECDHE_ECDSA_AES_256_CCM 1590664444.197274:qcrypto_tls_cipher_suite_info data=3D[0xc0,0x0a] versio= n=3DTLS1.0 name=3DTLS_ECDHE_ECDSA_AES_256_CBC_SHA1 1590664444.197278:qcrypto_tls_cipher_suite_info data=3D[0xc0,0x2b] versio= n=3DTLS1.2 name=3DTLS_ECDHE_ECDSA_AES_128_GCM_SHA256 1590664444.197283:qcrypto_tls_cipher_suite_info data=3D[0xc0,0xac] versio= n=3DTLS1.2 name=3DTLS_ECDHE_ECDSA_AES_128_CCM 1590664444.197287:qcrypto_tls_cipher_suite_info data=3D[0xc0,0x09] versio= n=3DTLS1.0 name=3DTLS_ECDHE_ECDSA_AES_128_CBC_SHA1 1590664444.197291:qcrypto_tls_cipher_suite_info data=3D[0x00,0x9d] versio= n=3DTLS1.2 name=3DTLS_RSA_AES_256_GCM_SHA384 1590664444.197296:qcrypto_tls_cipher_suite_info data=3D[0xc0,0x9d] versio= n=3DTLS1.2 name=3DTLS_RSA_AES_256_CCM 1590664444.197300:qcrypto_tls_cipher_suite_info data=3D[0x00,0x35] versio= n=3DTLS1.0 name=3DTLS_RSA_AES_256_CBC_SHA1 1590664444.197304:qcrypto_tls_cipher_suite_info data=3D[0x00,0x9c] versio= n=3DTLS1.2 name=3DTLS_RSA_AES_128_GCM_SHA256 1590664444.197308:qcrypto_tls_cipher_suite_info data=3D[0xc0,0x9c] versio= n=3DTLS1.2 name=3DTLS_RSA_AES_128_CCM 1590664444.197312:qcrypto_tls_cipher_suite_info data=3D[0x00,0x2f] versio= n=3DTLS1.0 name=3DTLS_RSA_AES_128_CBC_SHA1 1590664444.197316:qcrypto_tls_cipher_suite_info data=3D[0x00,0x9f] versio= n=3DTLS1.2 name=3DTLS_DHE_RSA_AES_256_GCM_SHA384 1590664444.197320:qcrypto_tls_cipher_suite_info data=3D[0xcc,0xaa] versio= n=3DTLS1.2 name=3DTLS_DHE_RSA_CHACHA20_POLY1305 1590664444.197325:qcrypto_tls_cipher_suite_info data=3D[0xc0,0x9f] versio= n=3DTLS1.2 name=3DTLS_DHE_RSA_AES_256_CCM 1590664444.197329:qcrypto_tls_cipher_suite_info data=3D[0x00,0x39] versio= n=3DTLS1.0 name=3DTLS_DHE_RSA_AES_256_CBC_SHA1 1590664444.197333:qcrypto_tls_cipher_suite_info data=3D[0x00,0x9e] versio= n=3DTLS1.2 name=3DTLS_DHE_RSA_AES_128_GCM_SHA256 1590664444.197337:qcrypto_tls_cipher_suite_info data=3D[0xc0,0x9e] versio= n=3DTLS1.2 name=3DTLS_DHE_RSA_AES_128_CCM 1590664444.197341:qcrypto_tls_cipher_suite_info data=3D[0x00,0x33] versio= n=3DTLS1.0 name=3DTLS_DHE_RSA_AES_128_CBC_SHA1 1590664444.197345:qcrypto_tls_cipher_suite_count count: 29 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Laszlo Ersek Reviewed-by: Daniel P. Berrang=C3=A9 --- v10: Removed Laszlo Acked-by due to logical changes --- crypto/tls-cipher-suites.c | 11 +++++++++++ qemu-options.hx | 18 ++++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/crypto/tls-cipher-suites.c b/crypto/tls-cipher-suites.c index 5b403f86c9..b3dba00010 100644 --- a/crypto/tls-cipher-suites.c +++ b/crypto/tls-cipher-suites.c @@ -13,6 +13,7 @@ #include "qom/object_interfaces.h" #include "crypto/tlscreds.h" #include "crypto/tls-cipher-suites.h" +#include "hw/nvram/fw_cfg.h" #include "trace.h" =20 /* @@ -88,11 +89,20 @@ static void qcrypto_tls_cipher_suites_complete(UserCrea= table *uc, } } =20 +static GByteArray *qcrypto_tls_cipher_suites_fw_cfg_gen_data(Object *obj, + Error **errp) +{ + return qcrypto_tls_cipher_suites_get_data(QCRYPTO_TLS_CIPHER_SUITES(ob= j), + errp); +} + static void qcrypto_tls_cipher_suites_class_init(ObjectClass *oc, void *da= ta) { UserCreatableClass *ucc =3D USER_CREATABLE_CLASS(oc); + FWCfgDataGeneratorClass *fwgc =3D FW_CFG_DATA_GENERATOR_CLASS(oc); =20 ucc->complete =3D qcrypto_tls_cipher_suites_complete; + fwgc->get_data =3D qcrypto_tls_cipher_suites_fw_cfg_gen_data; } =20 static const TypeInfo qcrypto_tls_cipher_suites_info =3D { @@ -103,6 +113,7 @@ static const TypeInfo qcrypto_tls_cipher_suites_info = =3D { .class_init =3D qcrypto_tls_cipher_suites_class_init, .interfaces =3D (InterfaceInfo[]) { { TYPE_USER_CREATABLE }, + { TYPE_FW_CFG_DATA_GENERATOR_INTERFACE }, { } } }; diff --git a/qemu-options.hx b/qemu-options.hx index 4f519f35fd..ce54c7359c 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -4585,6 +4585,24 @@ SRST string as described at https://gnutls.org/manual/html_node/Priority-Strings.html. =20 + An example of use of this object is to control UEFI HTTPS Boot. + The tls-cipher-suites object exposes the ordered list of permitted + TLS cipher suites from the host side to the guest firmware, via + fw_cfg. The list is represented as an array of IANA_TLS_CIPHER + objects. The firmware uses the IANA_TLS_CIPHER array for configuri= ng + guest-side TLS. + + In the following example, the priority at which the host-side poli= cy + is retrieved is given by the ``priority`` property. + Given that QEMU uses GNUTLS, ``priority=3D@SYSTEM`` may be used to + refer to /etc/crypto-policies/back-ends/gnutls.config. + + .. parsed-literal:: + + # |qemu_system| \ + -object tls-cipher-suites,id=3Dmysuite0,priority=3D@SYSTE= M \ + -fw_cfg name=3Detc/edk2/https/ciphers,gen_id=3Dmysuite0 + ``-object filter-buffer,id=3Did,netdev=3Dnetdevid,interval=3Dt[,queue= =3Dall|rx|tx][,status=3Don|off][,position=3Dhead|tail|id=3D][,insert=3D= behind|before]`` Interval t can't be 0, this filter batches the packet delivery: all packets arriving in a given interval on netdev netdevid are --=20 2.21.3