From nobody Mon Feb 9 12:09:51 2026 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=1591723751; cv=none; d=zohomail.com; s=zohoarc; b=UNwlA0m3Zpd5LvgoJf1iLwFI6nYej36i+WrF3cFDEClsW15U1tgR40HC1mBsfgry1O4b7W1VUULhe8+P78Ptyvjt6a7hA/R1HNWJqRzhowLAzIGr5WU+Yzlih3STD1xQ/uCxqE0FP4cQOwp8/9TmJQtMyZtRky2MW5da39byYUw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1591723751; 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=bnuHye+9ACGI1Yv56xc1M8XlF7qOKtZ2bxHpIQ9SYnQ=; b=kXbu4AUV+/+Fn9ynqgPcYlnVe3/NXBOgt6YkDWZRi8lC64GdUslesMqhs5+oSO5iPZBYGUfAwrPp8gjFYD/ycA58vhlX7kZegWIRi2gona3XHsSqqXJvj4aBlWVs5co2g4VCY/Nh+ozSMbJlw8Hzei3OSQQv5ONXovY+E2TPcDU= 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 1591723751888769.8802545483155; Tue, 9 Jun 2020 10:29:11 -0700 (PDT) Received: from localhost ([::1]:37076 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jii3h-0000jc-Sw for importer@patchew.org; Tue, 09 Jun 2020 13:29:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52290) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jihjC-0003cg-Q1 for qemu-devel@nongnu.org; Tue, 09 Jun 2020 13:07:58 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:27148 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 1jihjA-0008T5-Vx for qemu-devel@nongnu.org; Tue, 09 Jun 2020 13:07:58 -0400 Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-272-8tIrTd-eO0eLIn6aJtg10Q-1; Tue, 09 Jun 2020 13:07:50 -0400 Received: by mail-wr1-f72.google.com with SMTP id n6so8871223wrv.6 for ; Tue, 09 Jun 2020 10:07:50 -0700 (PDT) Received: from localhost.localdomain (181.red-88-10-103.dynamicip.rima-tde.net. [88.10.103.181]) by smtp.gmail.com with ESMTPSA id y14sm3523162wma.25.2020.06.09.10.07.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Jun 2020 10:07:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1591722476; 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=bnuHye+9ACGI1Yv56xc1M8XlF7qOKtZ2bxHpIQ9SYnQ=; b=gLvr4g3A05KBW6sD0seu+PpUwoaWQkNYypTamKlRF1ukWNH7Gsqmg1pURSZUM/nRU6zyeW 2z4TDOGIekDx3778rpdOI29eILrtz17pYPc+XpRdN6WjdN5dk08ZQLlvvOHF5zIFWHjF3z LHmi6QpDSkDbSlzxSTwR2io0YkzeOjQ= X-MC-Unique: 8tIrTd-eO0eLIn6aJtg10Q-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=bnuHye+9ACGI1Yv56xc1M8XlF7qOKtZ2bxHpIQ9SYnQ=; b=gncS6UcQS5Ftnb0jyu7Lk29wQ2/M8lg9CLs0nNNKMwWBZZeuqSJto2J866PzYjboIs Hd733zyZ73fK+D/0s5Dz+4ZLdEqV0UtKECRLLLd3zhg9MUGPsnFWnmHC/f7o0VuX3VIb 1kWool/zHTbAuHdV4jKxa5NreSqWvLWXqFhyDTorrFzXEcj2h6zWZ9EbaBnlG6Ncfo7b GzdiJ43jkV+ULNLf3oF791XPQgZKUq9QuBlN//L3PHo3cdRkUJkoqmO+a3B5R+w0cXUf Co0XXW3b2p6SYAPLMdVHhrxc4rT/NLYZawZbK1vIVpNbSDwed2AWa3oj7yBEgEEkbTFy SS6A== X-Gm-Message-State: AOAM531JIdoscxwDUJB8DHg93QR5CFh8gSCd4ZP3Q8YJc6jzbe2WufrX UuJxMJY/9TdWK+EWxMd5Fq82bhfWFZTu1L9ma9kJwXChPWh92kVpXGiDVGEKNhET71RCPnaXjpo VYwtOHEse5mqKUQs= X-Received: by 2002:adf:9205:: with SMTP id 5mr5296664wrj.232.1591722468970; Tue, 09 Jun 2020 10:07:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxpOKtFJBeZwZCQRH+vWCbCGuP54Jw3oO8sTsozLsqw5XERFzlslXkgzC6JWonWxJ2BtsMrCw== X-Received: by 2002:adf:9205:: with SMTP id 5mr5296630wrj.232.1591722468554; Tue, 09 Jun 2020 10:07:48 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Gerd Hoffmann , qemu-devel@nongnu.org Subject: [PATCH v8 4/5] crypto: Add tls-cipher-suites object Date: Tue, 9 Jun 2020 19:07:26 +0200 Message-Id: <20200609170727.9977-5-philmd@redhat.com> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200609170727.9977-1-philmd@redhat.com> References: <20200609170727.9977-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/09 02:41:53 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=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=20P=2E=20Berrang=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Laszlo Ersek , Paolo Bonzini 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 IANA_TLS_CIPHER objects. The firmware uses the IANA_TLS_CIPHER array for configuring guest-side TLS, for example in UEFI HTTPS Boot. 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). [Description from Daniel P. Berrang=C3=A9, edited by Laszlo Ersek.] Example of use to dump the cipher suites: $ qemu-system-x86_64 -S \ -object tls-cipher-suites,id=3Dmysuite,priority=3D@SYSTEM \ -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 Reviewed-by: Laszlo Ersek --- v8: addressed Laszlo's comments - updated trace events format to match other crypto ones - inserted Daniel/Laszlo commit description - describe object in qemu-options.hx --- include/crypto/tls-cipher-suites.h | 38 +++++++++ crypto/tls-cipher-suites.c | 127 +++++++++++++++++++++++++++++ crypto/Makefile.objs | 1 + crypto/trace-events | 5 ++ qemu-options.hx | 19 +++++ 5 files changed, 190 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..3848393a20 --- /dev/null +++ b/include/crypto/tls-cipher-suites.h @@ -0,0 +1,38 @@ +/* + * 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) + +/* + * 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; + +typedef struct QCryptoTLSCipherSuites { + /* */ + QCryptoTLSCreds parent_obj; + + /* */ + IANA_TLS_CIPHER *cipher_list; + unsigned cipher_count; +} QCryptoTLSCipherSuites; + +#endif /* QCRYPTO_TLSCIPHERSUITES_H */ diff --git a/crypto/tls-cipher-suites.c b/crypto/tls-cipher-suites.c new file mode 100644 index 0000000000..f02a041f9a --- /dev/null +++ b/crypto/tls-cipher-suites.c @@ -0,0 +1,127 @@ +/* + * 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 "qemu/error-report.h" +#include "crypto/tlscreds.h" +#include "crypto/tls-cipher-suites.h" +#include "trace.h" + +static void parse_cipher_suites(QCryptoTLSCipherSuites *s, + const char *priority_name, Error **errp) +{ + int ret; + const char *err; + gnutls_priority_t pcache; + enum { M_ENUMERATE, M_GENERATE, M_DONE } mode; + + assert(priority_name); + trace_qcrypto_tls_cipher_suite_priority(priority_name); + ret =3D gnutls_priority_init(&pcache, priority_name, &err); + if (ret < 0) { + error_setg(errp, "Syntax error using priority '%s': %s", + priority_name, gnutls_strerror(ret)); + return; + } + + for (mode =3D M_ENUMERATE; mode < M_DONE; mode++) { + size_t i; + + for (i =3D 0;; i++) { + int ret; + unsigned idx; + const char *name; + IANA_TLS_CIPHER cipher; + gnutls_protocol_t protocol; + + 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 *)&ciphe= r, + NULL, NULL, NULL, &protocol); + if (name =3D=3D NULL) { + continue; + } + + if (mode =3D=3D M_GENERATE) { + const char *version; + + version =3D gnutls_protocol_get_name(protocol); + trace_qcrypto_tls_cipher_suite_info(cipher.data[0], + cipher.data[1], + version, name); + s->cipher_list[s->cipher_count] =3D cipher; + } + s->cipher_count++; + } + + if (mode =3D=3D M_ENUMERATE) { + if (s->cipher_count =3D=3D 0) { + break; + } + s->cipher_list =3D g_new(IANA_TLS_CIPHER, s->cipher_count); + s->cipher_count =3D 0; + } + } + trace_qcrypto_tls_cipher_suite_count(s->cipher_count); + gnutls_priority_deinit(pcache); +} + +static void qcrypto_tls_cipher_suites_complete(UserCreatable *uc, Error **= errp) +{ + QCryptoTLSCreds *s =3D QCRYPTO_TLS_CREDS(uc); + + if (!s->priority) { + error_setg(errp, "'priority' property is not set"); + return; + } + parse_cipher_suites(QCRYPTO_TLS_CIPHER_SUITES(s), s->priority, errp); +} + +static void qcrypto_tls_cipher_suites_finalize(Object *obj) +{ + QCryptoTLSCipherSuites *s =3D QCRYPTO_TLS_CIPHER_SUITES(obj); + + g_free(s->cipher_list); +} + +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(QCryptoTLSCipherSuites), + .instance_finalize =3D qcrypto_tls_cipher_suites_finalize, + .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 c2a371b0b4..1c1b5e21ff 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..c74366d7cc 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 backends 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