From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.3 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 57CE4C433DF for ; Thu, 2 Jul 2020 10:58:31 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0E3A620772 for ; Thu, 2 Jul 2020 10:58:31 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="aCE6oFwL" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0E3A620772 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:39524 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jqwvG-0006Se-Bd for qemu-devel@archiver.kernel.org; Thu, 02 Jul 2020 06:58:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49750) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jqwuc-00063B-Nb for qemu-devel@nongnu.org; Thu, 02 Jul 2020 06:57:50 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:45250 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 1jqwuZ-0006Tv-S1 for qemu-devel@nongnu.org; Thu, 02 Jul 2020 06:57:50 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593687466; 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=2SIcKgGaawDaQ/7agoENxmtGPMex1JZHuuWtBE2g5rk=; b=aCE6oFwLY3prLz1L/q6dlJQaZAkzNMGL455pB+y1skg8BNy5fhb2kxxfZsEKp0EGBYgC8E Wo3/8mLMTSEKKf16PLu44Y73Bkb2+tUNOgSWweTVWA58xjVwqeYa+rXR1tyaUL8lz6Co+i YjoqPxuV1/kV+CnLrdy7cqFHDd5T0WI= 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-304-LzTx9yeFN4enA1kqMreuAQ-1; Thu, 02 Jul 2020 06:57:40 -0400 X-MC-Unique: LzTx9yeFN4enA1kqMreuAQ-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 912D6107ACCD for ; Thu, 2 Jul 2020 10:57:39 +0000 (UTC) Received: from lacos-laptop-7.usersys.redhat.com (ovpn-113-177.ams2.redhat.com [10.36.113.177]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8A0CC10023A7; Thu, 2 Jul 2020 10:57:38 +0000 (UTC) Subject: Re: [PATCH v10 1/5] crypto: Add tls-cipher-suites object To: =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= , qemu-devel@nongnu.org References: <20200623172726.21040-1-philmd@redhat.com> <20200623172726.21040-2-philmd@redhat.com> From: Laszlo Ersek Message-ID: <735af131-8ed5-ca21-219c-80f4ac84fd30@redhat.com> Date: Thu, 2 Jul 2020 12:57:37 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Firefox/52.0 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: <20200623172726.21040-2-philmd@redhat.com> Content-Language: en-US X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=lersek@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=205.139.110.120; envelope-from=lersek@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/02 04:00:43 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?Daniel_P._Berrang=c3=a9?=" Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On 06/23/20 19:27, Philippe Mathieu-Daudé wrote: > 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=@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é, edited by Laszlo Ersek.] > > Signed-off-by: Philippe Mathieu-Daudé > --- > 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é > + * > + * 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_SUITES) > + > +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é > + * > + * 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#tls-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 = 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 = 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 = g_byte_array_new(); > + > + for (i = 0;; i++) { > + int ret; > + unsigned idx; > + const char *name; > + IANA_TLS_CIPHER cipher; > + gnutls_protocol_t protocol; > + const char *version; > + > + ret = gnutls_priority_get_cipher_suite_index(pcache, i, &idx); > + if (ret == GNUTLS_E_REQUESTED_DATA_NOT_AVAILABLE) { > + break; > + } > + if (ret == GNUTLS_E_UNKNOWN_CIPHER_SUITE) { > + continue; > + } > + > + name = gnutls_cipher_suite_info(idx, (unsigned char *)&cipher, > + NULL, NULL, NULL, &protocol); > + if (name == NULL) { > + continue; > + } > + > + version = 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 = 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 *data) > +{ > + UserCreatableClass *ucc = USER_CREATABLE_CLASS(oc); > + > + ucc->complete = qcrypto_tls_cipher_suites_complete; > +} > + > +static const TypeInfo qcrypto_tls_cipher_suites_info = { > + .parent = TYPE_QCRYPTO_TLS_CREDS, > + .name = TYPE_QCRYPTO_TLS_CIPHER_SUITES, > + .instance_size = sizeof(QCryptoTLSCreds), > + .class_size = sizeof(QCryptoTLSCredsClass), > + .class_init = qcrypto_tls_cipher_suites_class_init, > + .interfaces = (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 += cipher.o > crypto-obj-$(CONFIG_AF_ALG) += afalg.o > crypto-obj-$(CONFIG_AF_ALG) += cipher-afalg.o > crypto-obj-$(CONFIG_AF_ALG) += hash-afalg.o > +crypto-obj-$(CONFIG_GNUTLS) += tls-cipher-suites.o > crypto-obj-y += tlscreds.o > crypto-obj-y += tlscredsanon.o > crypto-obj-y += 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=%p creds=%p hostname=%s authzid=%s endpoint=%d" > qcrypto_tls_session_check_creds(void *session, const char *status) "TLS session check creds session=%p status=%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 *version, const char *name) "data=[0x%02x,0x%02x] version=%s name=%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. > > + ``-object tls-cipher-suites,id=id,priority=priority`` > + 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=id,netdev=netdevid,interval=t[,queue=all|rx|tx][,status=on|off][,position=head|tail|id=][,insert=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 > Acked-by: Laszlo Ersek