fw_cfg: Add FW_CFG_DATA_GENERATOR; crypto: Add tls-cipher-suites
v10 cover fw_cfg: Add FW_CFG_DATA_GENERATOR; crypto: Add tls-cipher-suites
Hi,
This series has 3 parts:
- First we add the tls-cipher-suites object
- We add the ability to QOM objects to produce data consumable by the fw_cfg device,
- Then we let the tls-cipher-suites object implement the FW_CFG_DATA_GENERATOR interface.
This is required by EDK2 'HTTPS Boot' feature [*] to tell the guest which TLS ciphers it can use.
Since v9:
- intent to address Daniel suggestions, rewrite of crypto/* code Since v8:
- addressed Laszlo review comments (reword/typos) Since v7:
- addressed Laszlo review comments
Since v6:
- addressed Laszlo & Daniel review comments
Since v5:
- Complete rewrite after chatting with Daniel Berrangé Since v4:
- Addressed Laszlo comments (see patch#1 description) Since v3:
- Addressed Markus' comments (do not care about heap) Since v2:
- Split of
Since v1:
- Addressed Michael and Laszlo comments.
Phil.
$ git backport-diff -u v9 Key: [----] : patches are identical [####] : number of functional differences between upstream/downstream patch [down] : patch is downstream-only The flags [FC] indicate (F)unctional and (C)ontextual differences, respectively
001/5:[0139] [FC] 'crypto: Add tls-cipher-suites object'
002/5:[0052] [FC] 'hw/nvram/fw_cfg: Add the FW_CFG_DATA_GENERATOR interface' 003/5:[0010] [FC] 'softmmu/vl: Let -fw_cfg option take a 'gen_id' argument' 004/5:[----] [--] 'softmmu/vl: Allow -fw_cfg 'gen_id' option to use the 'etc/' namespace' 005/5:[0018] [FC] 'crypto/tls-cipher-suites: Produce fw_cfg consumable blob'
[*]: https://github.com/tianocore/edk2/blob/master/OvmfPkg/README
v9: https://lists.gnu.org/archive/html/qemu-devel/2020-06/msg04046.html
v8: https://lists.gnu.org/archive/html/qemu-devel/2020-06/msg02428.html
v7: https://lists.gnu.org/archive/html/qemu-devel/2020-05/msg08050.html
v6: https://lists.gnu.org/archive/html/qemu-devel/2020-05/msg05448.html
v5: https://lists.gnu.org/archive/html/qemu-devel/2019-06/msg04525.html
v4: https://lists.gnu.org/archive/html/qemu-devel/2019-03/msg04300.html
v3: https://lists.gnu.org/archive/html/qemu-devel/2019-03/msg02965.html
v2: https://lists.gnu.org/archive/html/qemu-devel/2019-03/msg02522.html
v1: https://lists.gnu.org/archive/html/qemu-devel/2018-12/msg01598.html
Philippe Mathieu-Daudé (5):
crypto: Add tls-cipher-suites object
hw/nvram/fw_cfg: Add the FW_CFG_DATA_GENERATOR interface softmmu/vl: Let -fw_cfg option take a 'gen_id' argument softmmu/vl: Allow -fw_cfg 'gen_id' option to use the 'etc/' namespace crypto/tls-cipher-suites: Produce fw_cfg consumable blob
docs/specs/fw_cfg.txt | 13 ++- include/crypto/tls-cipher-suites.h | 39 +++++++++ include/hw/nvram/fw_cfg.h | 43 ++++++++++ crypto/tls-cipher-suites.c | 126 +++++++++++++++++++++++++++++ hw/nvram/fw_cfg.c | 35 ++++++++ softmmu/vl.c | 37 ++++++--- crypto/Makefile.objs | 1 + crypto/trace-events | 5 ++ qemu-options.hx | 37 +++++++++ 9 files changed, 326 insertions(+), 10 deletions(-) create mode 100644 include/crypto/tls-cipher-suites.h create mode 100644 crypto/tls-cipher-suites.c
Signature · 1 line
2.21.3
PATCH v10 1/5 crypto: Add tls-cipher-suites object
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.]
---
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
include/crypto/tls-cipher-suites.h new file +39 -0
@@ -0,0 +1,39 @@ +/* +* QEMU TLS Cipher Suites Registry (RFC8447) +* +* Copyright (c) 2019 Red Hat, Inc. +* +* Author: Philippe Mathieu-Daudé <[email protected]> +* +* 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 { +/* <private> */ +QCryptoTLSCreds parent_obj; +/* <public> */ +}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 */
crypto/tls-cipher-suites.c new file +115 -0
115 lines not on this page · raw message
crypto/Makefile.objs +1 -0
@@ -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
crypto/trace-events +5 -0
@@ -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"
qemu-options.hx +19 -0
@@ -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=<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
Signature · 1 line
2.21.3
Re: [PATCH v10 1/5] crypto: Add tls-cipher-suites object
Quoted 49 lines · Philippe Mathieu-Daudé
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_CIPHERarray 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é <[email protected]>---
v10: rewrote logic (danpb)
Quoted 9 lines
--- 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
include/crypto/tls-cipher-suites.h line 4
Quoted 11 lines
include/crypto/tls-cipher-suites.h new file +4
-0@@ -0,0 +1,39 @@ +/* +* QEMU TLS Cipher Suites Registry (RFC8447) +* +* Copyright (c) 2019 Red Hat, Inc.
nit-pick, we could make that 2019-2020, likewise other files.
No need to respin just for that though.
Regards,
Daniel
Signature · 3 lines
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
Re: [PATCH v10 1/5] crypto: Add tls-cipher-suites object
In reply to Philippe Mathieu-DaudéQuoted 271 lines · Philippe Mathieu-Daudé
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_CIPHERarray 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é <[email protected]>---
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.cinclude/crypto/tls-cipher-suites.h new file +39
-0@@ -0,0 +1,39 @@ +/* +* QEMU TLS Cipher Suites Registry (RFC8447) +* +* Copyright (c) 2019 Red Hat, Inc. +* +* Author: Philippe Mathieu-Daudé <[email protected]> +* +* 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 { +/* <private> */ +QCryptoTLSCreds parent_obj; +/* <public> */ +}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 */ crypto/tls-cipher-suites.c new file +115
-0@@ -0,0 +1,115 @@ +/* +* QEMU TLS Cipher Suites +* +* Copyright (c) 2019 Red Hat, Inc. +* +* Author: Philippe Mathieu-Daudé <[email protected]> +* +* 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);crypto/Makefile.objs +1
-0@@ -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.ocrypto/trace-events +5
-0@@ -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"qemu-options.hx +12
-0@@ -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-options.hx SRST · line 4590
Quoted 10 lines
qemu-options.hx +7
-0+ 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=<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
PATCH v10 2/5 hw/nvram/fw_cfg: Add the FW_CFG_DATA_GENERATOR interface
In reply to Philippe Mathieu-DaudéThe FW_CFG_DATA_GENERATOR allows any object to produce blob of data consumable by the fw_cfg device.
--- 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(-)
docs/specs/fw_cfg.txt +8 -1
@@ -219,7 +219,7 @@ To check the result, read the "control" field: = Externally Provided Items = -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 -fw_cfg [name=]<item_name>,string=<string> +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 <generator-type>,id=<generated_id>,[generator-specific-options] \ + -fw_cfg [name=]<item_name>,gen_id=<generated_id> + See QEMU man page for more documentation. Using item_name with plain ASCII characters only is recommended.
include/hw/nvram/fw_cfg.h +43 -0
60 lines not on this page · raw message
hw/nvram/fw_cfg.c +35 -0
@@ -1032,6 +1032,35 @@ void *fw_cfg_modify_file(FWCfgState *s, const char *filename,return NULL ; } +void fw_cfg_add_from_generator (FWCfgState *s,const char *filename, +const char *gen_id,Error **errp) +{ +FWCfgDataGeneratorClass *klass; +Error *local_err =NULL ; +GByteArray *array; +Object *obj; +gsize size; + + obj =object_resolve_path_component (object_get_objects_root (), gen_id); +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 =FW_CFG_DATA_GENERATOR_GET_CLASS (obj); + array = klass->get_data (obj, &local_err); +if (local_err) { +error_propagate (errp, local_err); +return ; + } + size = 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 =MACHINE_GET_CLASS (qdev_get_machine ());
@@ -1333,12 +1362,18 @@ static const TypeInfo fw_cfg_mem_info = { .class_init = fw_cfg_mem_class_init, }; +static const TypeInfo fw_cfg_data_generator_interface_info = { + .parent =TYPE_INTERFACE , + .name =TYPE_FW_CFG_DATA_GENERATOR_INTERFACE , + .class_size =sizeof (FWCfgDataGeneratorClass), +};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); }type_init (fw_cfg_register_types)
Signature · 1 line
2.21.3
Re: [PATCH v10 2/5] hw/nvram/fw_cfg: Add the FW_CFG_DATA_GENERATOR interface
Quoted 10 lines · Philippe Mathieu-Daudé
The
FW_CFG_DATA_GENERATORallows any object to produce blob of data consumable by thefw_cfgdevice.Reviewed-by Laszlo Ersek <[email protected]>Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- 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(-)
Regards,
Daniel
Signature · 3 lines
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
PATCH v10 3/5 softmmu/vl: Let -fw_cfg option take a 'gen_id' argument
In reply to Philippe Mathieu-Daudé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.
--- softmmu/vl.c | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-)
softmmu/vl.c +21 -8
@@ -489,6 +489,11 @@ static QemuOptsList qemu_fw_cfg_opts = { .name = "string", .type = QEMU_OPT_STRING, .help = "Sets content of the blob to be inserted from a string", + }, { + .name = "gen_id", + .type = QEMU_OPT_STRING, + .help = "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 = (FWCfgState *) opaque;if (fw_cfg ==NULL ) {
@@ -2030,14 +2035,13 @@ static int parse_fw_cfg(void *opaque, QemuOpts *opts, Error **errp) name =qemu_opt_get (opts,"name" ); file =qemu_opt_get (opts,"file" ); str =qemu_opt_get (opts,"string" ); + gen_id =qemu_opt_get (opts,"gen_id" ); -/* 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) !=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 =strlen (str);/* NUL terminator NOT included in fw_cfg blob */ buf =g_memdup (str, size); + }else if (nonempty_str (gen_id)) { +Error *local_err =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 =NULL ;if (!g_file_get_contents (file, &buf, &size, &err)) {
Signature · 1 line
2.21.3
Re: [PATCH v10 3/5] softmmu/vl: Let -fw_cfg option take a 'gen_id' argument
Quoted 9 lines · Philippe Mathieu-Daudé
The '
gen_id' argument refers to a QOM object able to produce data consumable by thefw_cfgdevice. The producer object must implement theFW_CFG_DATA_GENERATORinterface.Reviewed-by Laszlo Ersek <[email protected]>Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- softmmu/vl.c | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-)
Regards,
Daniel
Signature · 3 lines
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
PATCH v10 4/5 softmmu/vl: Allow -fw_cfg 'gen_id' option to use the 'etc/' namespace
In reply to Philippe Mathieu-Daudé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.
--- docs/specs/fw_cfg.txt | 4 ++++ softmmu/vl.c | 8 +++++++- 2 files changed, 11 insertions(+), 1 deletion(-)
docs/specs/fw_cfg.txt +4 -0
@@ -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. +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.
softmmu/vl.c +7 -1
@@ -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 ) !=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 ) !=0 ) {warn_report ("externally provided fw_cfg item names " "should be prefixed with \"opt/\"" ); }
Signature · 1 line
2.21.3
Re: [PATCH v10 4/5] softmmu/vl: Allow -fw_cfg 'gen_id' option to use the 'etc/' namespace
Quoted 10 lines · Philippe Mathieu-Daudé
Names of user-provided
fw_cfgitems are supposed to start with "opt/". HoweverFW_CFG_DATA_GENERATORitems are generated by QEMU, so allow the "etc/" namespace in this specific case.Reviewed-by Laszlo Ersek <[email protected]>Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- docs/specs/fw_cfg.txt | 4 ++++ softmmu/vl.c | 8 +++++++- 2 files changed, 11 insertions(+), 1 deletion(-)
Regards,
Daniel
Signature · 3 lines
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
PATCH v10 5/5 crypto/tls-cipher-suites: Produce fw_cfg consumable blob
In reply to Philippe Mathieu-Daudé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=mysuite1,priority=@SYSTEM \
-fw_cfg name=etc/path/to/ciphers,gen_id=mysuite1 \
-trace qcrypto\*
1590664444.197123:qcrypto_tls_cipher_suite_priority priority: @SYSTEM
1590664444.197219:qcrypto_tls_cipher_suite_info data=[0x13,0x02] version=TLS1.3 name=TLS_AES_256_GCM_SHA384
1590664444.197228:qcrypto_tls_cipher_suite_info data=[0x13,0x03] version=TLS1.3 name=TLS_CHACHA20_POLY1305_SHA256
1590664444.197233:qcrypto_tls_cipher_suite_info data=[0x13,0x01] version=TLS1.3 name=TLS_AES_128_GCM_SHA256
1590664444.197236:qcrypto_tls_cipher_suite_info data=[0x13,0x04] version=TLS1.3 name=TLS_AES_128_CCM_SHA256
1590664444.197240:qcrypto_tls_cipher_suite_info data=[0xc0,0x30] version=TLS1.2 name=TLS_ECDHE_RSA_AES_256_GCM_SHA384
1590664444.197245:qcrypto_tls_cipher_suite_info data=[0xcc,0xa8] version=TLS1.2 name=TLS_ECDHE_RSA_CHACHA20_POLY1305
1590664444.197250:qcrypto_tls_cipher_suite_info data=[0xc0,0x14] version=TLS1.0 name=TLS_ECDHE_RSA_AES_256_CBC_SHA1
1590664444.197254:qcrypto_tls_cipher_suite_info data=[0xc0,0x2f] version=TLS1.2 name=TLS_ECDHE_RSA_AES_128_GCM_SHA256
1590664444.197258:qcrypto_tls_cipher_suite_info data=[0xc0,0x13] version=TLS1.0 name=TLS_ECDHE_RSA_AES_128_CBC_SHA1
1590664444.197261:qcrypto_tls_cipher_suite_info data=[0xc0,0x2c] version=TLS1.2 name=TLS_ECDHE_ECDSA_AES_256_GCM_SHA384
1590664444.197266:qcrypto_tls_cipher_suite_info data=[0xcc,0xa9] version=TLS1.2 name=TLS_ECDHE_ECDSA_CHACHA20_POLY1305
1590664444.197270:qcrypto_tls_cipher_suite_info data=[0xc0,0xad] version=TLS1.2 name=TLS_ECDHE_ECDSA_AES_256_CCM
1590664444.197274:qcrypto_tls_cipher_suite_info data=[0xc0,0x0a] version=TLS1.0 name=TLS_ECDHE_ECDSA_AES_256_CBC_SHA1
1590664444.197278:qcrypto_tls_cipher_suite_info data=[0xc0,0x2b] version=TLS1.2 name=TLS_ECDHE_ECDSA_AES_128_GCM_SHA256
1590664444.197283:qcrypto_tls_cipher_suite_info data=[0xc0,0xac] version=TLS1.2 name=TLS_ECDHE_ECDSA_AES_128_CCM
1590664444.197287:qcrypto_tls_cipher_suite_info data=[0xc0,0x09] version=TLS1.0 name=TLS_ECDHE_ECDSA_AES_128_CBC_SHA1
1590664444.197291:qcrypto_tls_cipher_suite_info data=[0x00,0x9d] version=TLS1.2 name=TLS_RSA_AES_256_GCM_SHA384
1590664444.197296:qcrypto_tls_cipher_suite_info data=[0xc0,0x9d] version=TLS1.2 name=TLS_RSA_AES_256_CCM
1590664444.197300:qcrypto_tls_cipher_suite_info data=[0x00,0x35] version=TLS1.0 name=TLS_RSA_AES_256_CBC_SHA1
1590664444.197304:qcrypto_tls_cipher_suite_info data=[0x00,0x9c] version=TLS1.2 name=TLS_RSA_AES_128_GCM_SHA256
1590664444.197308:qcrypto_tls_cipher_suite_info data=[0xc0,0x9c] version=TLS1.2 name=TLS_RSA_AES_128_CCM
1590664444.197312:qcrypto_tls_cipher_suite_info data=[0x00,0x2f] version=TLS1.0 name=TLS_RSA_AES_128_CBC_SHA1
1590664444.197316:qcrypto_tls_cipher_suite_info data=[0x00,0x9f] version=TLS1.2 name=TLS_DHE_RSA_AES_256_GCM_SHA384
1590664444.197320:qcrypto_tls_cipher_suite_info data=[0xcc,0xaa] version=TLS1.2 name=TLS_DHE_RSA_CHACHA20_POLY1305
1590664444.197325:qcrypto_tls_cipher_suite_info data=[0xc0,0x9f] version=TLS1.2 name=TLS_DHE_RSA_AES_256_CCM
1590664444.197329:qcrypto_tls_cipher_suite_info data=[0x00,0x39] version=TLS1.0 name=TLS_DHE_RSA_AES_256_CBC_SHA1
1590664444.197333:qcrypto_tls_cipher_suite_info data=[0x00,0x9e] version=TLS1.2 name=TLS_DHE_RSA_AES_128_GCM_SHA256
1590664444.197337:qcrypto_tls_cipher_suite_info data=[0xc0,0x9e] version=TLS1.2 name=TLS_DHE_RSA_AES_128_CCM
1590664444.197341:qcrypto_tls_cipher_suite_info data=[0x00,0x33] version=TLS1.0 name=TLS_DHE_RSA_AES_128_CBC_SHA1
1590664444.197345:qcrypto_tls_cipher_suite_count count: 29---
v10: Removed Laszlo Acked-by due to logical changes
--- crypto/tls-cipher-suites.c | 11 +++++++++++ qemu-options.hx | 18 ++++++++++++++++++ 2 files changed, 29 insertions(+)
crypto/tls-cipher-suites.c +11 -0
@@ -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" /*
@@ -88,11 +89,20 @@ static void qcrypto_tls_cipher_suites_complete(UserCreatable *uc, } } +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 (obj), + errp); +} +static void qcrypto_tls_cipher_suites_class_init (ObjectClass *oc,void *data) {UserCreatableClass *ucc =USER_CREATABLE_CLASS (oc); +FWCfgDataGeneratorClass *fwgc =FW_CFG_DATA_GENERATOR_CLASS (oc); ucc->complete = qcrypto_tls_cipher_suites_complete; + fwgc->get_data = qcrypto_tls_cipher_suites_fw_cfg_gen_data; }static const TypeInfo qcrypto_tls_cipher_suites_info = {
@@ -103,6 +113,7 @@ static const TypeInfo qcrypto_tls_cipher_suites_info = { .class_init = qcrypto_tls_cipher_suites_class_init, .interfaces = (InterfaceInfo []) { {TYPE_USER_CREATABLE }, + {TYPE_FW_CFG_DATA_GENERATOR_INTERFACE }, { } } };
qemu-options.hx +18 -0
@@ -4585,6 +4585,24 @@ SRST string as described at https://gnutls.org/manual/html_node/Priority-Strings.html. + 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 configuring + guest-side TLS. + + In the following example, the priority at which the host-side policy + is retrieved is given by the ``priority`` property. + Given that QEMU uses GNUTLS, ``priority=@SYSTEM`` may be used to + refer to /etc/crypto-policies/back-ends/gnutls.config. + + .. parsed-literal:: + + # |qemu_system| \ + -object tls-cipher-suites,id=mysuite0,priority=@SYSTEM \ + -fw_cfg name=etc/edk2/https/ciphers,gen_id=mysuite0 + ``-object filter-buffer,id=id,netdev=netdevid,interval=t[,queue=all|rx|tx][,status=on|off][,position=head|tail|id=<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
Signature · 1 line
2.21.3
Re: [PATCH v10 5/5] crypto/tls-cipher-suites: Produce fw_cfg consumable blob
Quoted 41 lines · Philippe Mathieu-Daudé
Since our format is consumable by the
fw_cfgdevice, we can implement theFW_CFG_DATA_GENERATORinterface.Example of use to dump the cipher suites (if tracing enabled):
$ qemu-system-x86_64 -S \ -object tls-cipher-suites,id=mysuite1,priority=@SYSTEM \ -fw_cfg name=etc/path/to/ciphers,gen_id=mysuite1 \ -trace qcrypto\* 1590664444.197123:qcrypto_tls_cipher_suite_priority priority: @SYSTEM 1590664444.197219:qcrypto_tls_cipher_suite_info data=[0x13,0x02] version=TLS1.3 name=TLS_AES_256_GCM_SHA384 1590664444.197228:qcrypto_tls_cipher_suite_info data=[0x13,0x03] version=TLS1.3 name=TLS_CHACHA20_POLY1305_SHA256 1590664444.197233:qcrypto_tls_cipher_suite_info data=[0x13,0x01] version=TLS1.3 name=TLS_AES_128_GCM_SHA256 1590664444.197236:qcrypto_tls_cipher_suite_info data=[0x13,0x04] version=TLS1.3 name=TLS_AES_128_CCM_SHA256 1590664444.197240:qcrypto_tls_cipher_suite_info data=[0xc0,0x30] version=TLS1.2 name=TLS_ECDHE_RSA_AES_256_GCM_SHA384 1590664444.197245:qcrypto_tls_cipher_suite_info data=[0xcc,0xa8] version=TLS1.2 name=TLS_ECDHE_RSA_CHACHA20_POLY1305 1590664444.197250:qcrypto_tls_cipher_suite_info data=[0xc0,0x14] version=TLS1.0 name=TLS_ECDHE_RSA_AES_256_CBC_SHA1 1590664444.197254:qcrypto_tls_cipher_suite_info data=[0xc0,0x2f] version=TLS1.2 name=TLS_ECDHE_RSA_AES_128_GCM_SHA256 1590664444.197258:qcrypto_tls_cipher_suite_info data=[0xc0,0x13] version=TLS1.0 name=TLS_ECDHE_RSA_AES_128_CBC_SHA1 1590664444.197261:qcrypto_tls_cipher_suite_info data=[0xc0,0x2c] version=TLS1.2 name=TLS_ECDHE_ECDSA_AES_256_GCM_SHA384 1590664444.197266:qcrypto_tls_cipher_suite_info data=[0xcc,0xa9] version=TLS1.2 name=TLS_ECDHE_ECDSA_CHACHA20_POLY1305 1590664444.197270:qcrypto_tls_cipher_suite_info data=[0xc0,0xad] version=TLS1.2 name=TLS_ECDHE_ECDSA_AES_256_CCM 1590664444.197274:qcrypto_tls_cipher_suite_info data=[0xc0,0x0a] version=TLS1.0 name=TLS_ECDHE_ECDSA_AES_256_CBC_SHA1 1590664444.197278:qcrypto_tls_cipher_suite_info data=[0xc0,0x2b] version=TLS1.2 name=TLS_ECDHE_ECDSA_AES_128_GCM_SHA256 1590664444.197283:qcrypto_tls_cipher_suite_info data=[0xc0,0xac] version=TLS1.2 name=TLS_ECDHE_ECDSA_AES_128_CCM 1590664444.197287:qcrypto_tls_cipher_suite_info data=[0xc0,0x09] version=TLS1.0 name=TLS_ECDHE_ECDSA_AES_128_CBC_SHA1 1590664444.197291:qcrypto_tls_cipher_suite_info data=[0x00,0x9d] version=TLS1.2 name=TLS_RSA_AES_256_GCM_SHA384 1590664444.197296:qcrypto_tls_cipher_suite_info data=[0xc0,0x9d] version=TLS1.2 name=TLS_RSA_AES_256_CCM 1590664444.197300:qcrypto_tls_cipher_suite_info data=[0x00,0x35] version=TLS1.0 name=TLS_RSA_AES_256_CBC_SHA1 1590664444.197304:qcrypto_tls_cipher_suite_info data=[0x00,0x9c] version=TLS1.2 name=TLS_RSA_AES_128_GCM_SHA256 1590664444.197308:qcrypto_tls_cipher_suite_info data=[0xc0,0x9c] version=TLS1.2 name=TLS_RSA_AES_128_CCM 1590664444.197312:qcrypto_tls_cipher_suite_info data=[0x00,0x2f] version=TLS1.0 name=TLS_RSA_AES_128_CBC_SHA1 1590664444.197316:qcrypto_tls_cipher_suite_info data=[0x00,0x9f] version=TLS1.2 name=TLS_DHE_RSA_AES_256_GCM_SHA384 1590664444.197320:qcrypto_tls_cipher_suite_info data=[0xcc,0xaa] version=TLS1.2 name=TLS_DHE_RSA_CHACHA20_POLY1305 1590664444.197325:qcrypto_tls_cipher_suite_info data=[0xc0,0x9f] version=TLS1.2 name=TLS_DHE_RSA_AES_256_CCM 1590664444.197329:qcrypto_tls_cipher_suite_info data=[0x00,0x39] version=TLS1.0 name=TLS_DHE_RSA_AES_256_CBC_SHA1 1590664444.197333:qcrypto_tls_cipher_suite_info data=[0x00,0x9e] version=TLS1.2 name=TLS_DHE_RSA_AES_128_GCM_SHA256 1590664444.197337:qcrypto_tls_cipher_suite_info data=[0xc0,0x9e] version=TLS1.2 name=TLS_DHE_RSA_AES_128_CCM 1590664444.197341:qcrypto_tls_cipher_suite_info data=[0x00,0x33] version=TLS1.0 name=TLS_DHE_RSA_AES_128_CBC_SHA1 1590664444.197345:qcrypto_tls_cipher_suite_count count: 29
Quoted 7 lines
Signed-off-by Philippe Mathieu-Daudé <[email protected]>---
v10: Removed Laszlo Acked-by due to logical changes--- crypto/tls-cipher-suites.c | 11 +++++++++++ qemu-options.hx | 18 ++++++++++++++++++ 2 files changed, 29 insertions(+)
Regards,
Daniel
Signature · 3 lines
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
Re: [PATCH v10 5/5] crypto/tls-cipher-suites: Produce fw_cfg consumable blob
In reply to Philippe Mathieu-DaudéQuoted 110 lines · Philippe Mathieu-Daudé
Since our format is consumable by the
fw_cfgdevice, we can implement theFW_CFG_DATA_GENERATORinterface.Example of use to dump the cipher suites (if tracing enabled):
$ qemu-system-x86_64 -S \ -object tls-cipher-suites,id=mysuite1,priority=@SYSTEM \ -fw_cfg name=etc/path/to/ciphers,gen_id=mysuite1 \ -trace qcrypto\* 1590664444.197123:qcrypto_tls_cipher_suite_priority priority: @SYSTEM 1590664444.197219:qcrypto_tls_cipher_suite_info data=[0x13,0x02] version=TLS1.3 name=TLS_AES_256_GCM_SHA384 1590664444.197228:qcrypto_tls_cipher_suite_info data=[0x13,0x03] version=TLS1.3 name=TLS_CHACHA20_POLY1305_SHA256 1590664444.197233:qcrypto_tls_cipher_suite_info data=[0x13,0x01] version=TLS1.3 name=TLS_AES_128_GCM_SHA256 1590664444.197236:qcrypto_tls_cipher_suite_info data=[0x13,0x04] version=TLS1.3 name=TLS_AES_128_CCM_SHA256 1590664444.197240:qcrypto_tls_cipher_suite_info data=[0xc0,0x30] version=TLS1.2 name=TLS_ECDHE_RSA_AES_256_GCM_SHA384 1590664444.197245:qcrypto_tls_cipher_suite_info data=[0xcc,0xa8] version=TLS1.2 name=TLS_ECDHE_RSA_CHACHA20_POLY1305 1590664444.197250:qcrypto_tls_cipher_suite_info data=[0xc0,0x14] version=TLS1.0 name=TLS_ECDHE_RSA_AES_256_CBC_SHA1 1590664444.197254:qcrypto_tls_cipher_suite_info data=[0xc0,0x2f] version=TLS1.2 name=TLS_ECDHE_RSA_AES_128_GCM_SHA256 1590664444.197258:qcrypto_tls_cipher_suite_info data=[0xc0,0x13] version=TLS1.0 name=TLS_ECDHE_RSA_AES_128_CBC_SHA1 1590664444.197261:qcrypto_tls_cipher_suite_info data=[0xc0,0x2c] version=TLS1.2 name=TLS_ECDHE_ECDSA_AES_256_GCM_SHA384 1590664444.197266:qcrypto_tls_cipher_suite_info data=[0xcc,0xa9] version=TLS1.2 name=TLS_ECDHE_ECDSA_CHACHA20_POLY1305 1590664444.197270:qcrypto_tls_cipher_suite_info data=[0xc0,0xad] version=TLS1.2 name=TLS_ECDHE_ECDSA_AES_256_CCM 1590664444.197274:qcrypto_tls_cipher_suite_info data=[0xc0,0x0a] version=TLS1.0 name=TLS_ECDHE_ECDSA_AES_256_CBC_SHA1 1590664444.197278:qcrypto_tls_cipher_suite_info data=[0xc0,0x2b] version=TLS1.2 name=TLS_ECDHE_ECDSA_AES_128_GCM_SHA256 1590664444.197283:qcrypto_tls_cipher_suite_info data=[0xc0,0xac] version=TLS1.2 name=TLS_ECDHE_ECDSA_AES_128_CCM 1590664444.197287:qcrypto_tls_cipher_suite_info data=[0xc0,0x09] version=TLS1.0 name=TLS_ECDHE_ECDSA_AES_128_CBC_SHA1 1590664444.197291:qcrypto_tls_cipher_suite_info data=[0x00,0x9d] version=TLS1.2 name=TLS_RSA_AES_256_GCM_SHA384 1590664444.197296:qcrypto_tls_cipher_suite_info data=[0xc0,0x9d] version=TLS1.2 name=TLS_RSA_AES_256_CCM 1590664444.197300:qcrypto_tls_cipher_suite_info data=[0x00,0x35] version=TLS1.0 name=TLS_RSA_AES_256_CBC_SHA1 1590664444.197304:qcrypto_tls_cipher_suite_info data=[0x00,0x9c] version=TLS1.2 name=TLS_RSA_AES_128_GCM_SHA256 1590664444.197308:qcrypto_tls_cipher_suite_info data=[0xc0,0x9c] version=TLS1.2 name=TLS_RSA_AES_128_CCM 1590664444.197312:qcrypto_tls_cipher_suite_info data=[0x00,0x2f] version=TLS1.0 name=TLS_RSA_AES_128_CBC_SHA1 1590664444.197316:qcrypto_tls_cipher_suite_info data=[0x00,0x9f] version=TLS1.2 name=TLS_DHE_RSA_AES_256_GCM_SHA384 1590664444.197320:qcrypto_tls_cipher_suite_info data=[0xcc,0xaa] version=TLS1.2 name=TLS_DHE_RSA_CHACHA20_POLY1305 1590664444.197325:qcrypto_tls_cipher_suite_info data=[0xc0,0x9f] version=TLS1.2 name=TLS_DHE_RSA_AES_256_CCM 1590664444.197329:qcrypto_tls_cipher_suite_info data=[0x00,0x39] version=TLS1.0 name=TLS_DHE_RSA_AES_256_CBC_SHA1 1590664444.197333:qcrypto_tls_cipher_suite_info data=[0x00,0x9e] version=TLS1.2 name=TLS_DHE_RSA_AES_128_GCM_SHA256 1590664444.197337:qcrypto_tls_cipher_suite_info data=[0xc0,0x9e] version=TLS1.2 name=TLS_DHE_RSA_AES_128_CCM 1590664444.197341:qcrypto_tls_cipher_suite_info data=[0x00,0x33] version=TLS1.0 name=TLS_DHE_RSA_AES_128_CBC_SHA1 1590664444.197345:qcrypto_tls_cipher_suite_count count: 29Signed-off-by Philippe Mathieu-Daudé <[email protected]>---
v10: Removed Laszlo Acked-by due to logical changes--- crypto/tls-cipher-suites.c | 11 +++++++++++ qemu-options.hx | 18 ++++++++++++++++++ 2 files changed, 29 insertions(+)crypto/tls-cipher-suites.c +11
-0@@ -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" /* @@ -88,11 +89,20 @@ static void qcrypto_tls_cipher_suites_complete(UserCreatable *uc, } } +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 (obj), + errp); +} +static void qcrypto_tls_cipher_suites_class_init (ObjectClass *oc,void *data) {UserCreatableClass *ucc =USER_CREATABLE_CLASS (oc); +FWCfgDataGeneratorClass *fwgc =FW_CFG_DATA_GENERATOR_CLASS (oc); ucc->complete = qcrypto_tls_cipher_suites_complete; + fwgc->get_data = qcrypto_tls_cipher_suites_fw_cfg_gen_data; }static const TypeInfo qcrypto_tls_cipher_suites_info = {@@ -103,6 +113,7 @@ static const TypeInfo qcrypto_tls_cipher_suites_info = { .class_init = qcrypto_tls_cipher_suites_class_init, .interfaces = (InterfaceInfo []) { {TYPE_USER_CREATABLE }, + {TYPE_FW_CFG_DATA_GENERATOR_INTERFACE }, { } } };qemu-options.hx +11
-0@@ -4585,6 +4585,24 @@ SRST string as described at https://gnutls.org/manual/html_node/Priority-Strings.html. + 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 configuring + guest-side TLS. + + In the following example, the priority at which the host-side policy + is retrieved is given by the ``priority`` property. + Given that QEMU uses GNUTLS, ``priority=@SYSTEM`` may be used to + refer to /etc/crypto-policies/back-ends/gnutls.config.
qemu-options.hx SRST · line 4608
Quoted 10 lines
qemu-options.hx +7
-0+ + .. parsed-literal:: + + # |qemu_system| \ + -object tls-cipher-suites,id=mysuite0,priority=@SYSTEM \ + -fw_cfg name=etc/edk2/https/ciphers,gen_id=mysuite0 + ``-object filter-buffer,id=id,netdev=netdevid,interval=t[,queue=all|rx|tx][,status=on|off][,position=head|tail|id=<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
Quoted 9 lines · Philippe Mathieu-Daudé
Hi,
This series has 3 parts:
- First we add the tls-cipher-suites object
- We add the ability to QOM objects to produce data consumable by the
fw_cfgdevice,
Quoted 8 lines
- Then we let the tls-cipher-suites object implement the
FW_CFG_DATA_GENERATORinterface.This is required by EDK2 'HTTPS Boot' feature [*] to tell the guest which TLS ciphers it can use.
Since v9:
- intent to address Daniel suggestions, rewrite ofcrypto/*code
I forgot to explain the huge diff due to the rewrite. Daniel suggested to simplify the API by returning a GByteArray:
https://www.mail-archive.com/[email protected]/msg712887.html
https://www.mail-archive.com/[email protected]/msg712923.html
Quoted 12 lines
$ git backport-diff -u v9 Key: [----] : patches are identical [####] : number of functional differences between upstream/downstream patch [down] : patch is downstream-only The flags [FC] indicate (F)unctional and (C)ontextual differences, respectively001/5:[0139] [FC] 'crypto: Add tls-cipher-suites object'
002/5:[0052] [FC] 'hw/nvram/fw_cfg: Add theFW_CFG_DATA_GENERATORinterface' 003/5:[0010] [FC] 'softmmu/vl: Let -fw_cfg option take a 'gen_id' argument' 004/5:[----] [--] 'softmmu/vl: Allow -fw_cfg 'gen_id' option to use the 'etc/' namespace' 005/5:[0018] [FC] 'crypto/tls-cipher-suites: Producefw_cfgconsumable blob'
Quoted 6 lines · Philippe Mathieu-Daudé
Hi,
This series has 3 parts:
- First we add the tls-cipher-suites object
Quoted 8 lines
- We add the ability to QOM objects to produce data consumable by the
fw_cfgdevice,- Then we let the tls-cipher-suites object implement the
FW_CFG_DATA_GENERATORinterface.This is required by EDK2 'HTTPS Boot' feature [*] to tell the guest which TLS ciphers it can use.
On my crypto side, the series is ready to merge.
The code is split 50/50 between crypto subsystem and firmware subsystem, so the question is who wants to merge it ?
If Laszlo wants to merge it, then consider the whole series
to have Acked-by: Daniel P. Berrangé <[email protected]>
If Laszlo wants me to merge it, then I'll just wait for him to give his Ack.
Soft-freeze is fast approaching in less than a week...
Regards,
Daniel
Signature · 3 lines
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
Quoted 16 lines · Daniel P. Berrangé
Quoted 6 lines · Philippe Mathieu-Daudé
Hi,
This series has 3 parts:
- First we add the tls-cipher-suites object
Quoted 8 lines
- We add the ability to QOM objects to produce data consumable by the
fw_cfgdevice,- Then we let the tls-cipher-suites object implement the
FW_CFG_DATA_GENERATORinterface.This is required by EDK2 'HTTPS Boot' feature [*] to tell the guest which TLS ciphers it can use.
Quoted 7 lines
On my crypto side, the series is ready to merge.
The code is split 50/50 between crypto subsystem and firmware subsystem, so the question is who wants to merge it ?
If Laszlo wants to merge it, then consider the whole series
to have Acked-by: Daniel P. Berrangé <[email protected]>
Thanks!
Quoted 5 lines
If Laszlo wants me to merge it, then I'll just wait for him to give his Ack.
Soft-freeze is fast approaching in less than a week...
Yes, but Laszlo isn't available until tomorrow. I prefer to wait until Friday for his feedback first. If he is too busy, then your help is obviously welcomed!
Thanks,
Phil.
Quoted 21 lines · Daniel P. Berrangé
Quoted 6 lines · Philippe Mathieu-Daudé
Hi,
This series has 3 parts:
- First we add the tls-cipher-suites object
Quoted 8 lines
- We add the ability to QOM objects to produce data consumable by the
fw_cfgdevice,- Then we let the tls-cipher-suites object implement the
FW_CFG_DATA_GENERATORinterface.This is required by EDK2 'HTTPS Boot' feature [*] to tell the guest which TLS ciphers it can use.
On my crypto side, the series is ready to merge.
The code is split 50/50 between crypto subsystem and firmware subsystem, so the question is who wants to merge it ?
Quoted 7 lines
If Laszlo wants to merge it, then consider the whole series
to have Acked-by: Daniel P. Berrangé <[email protected]>If Laszlo wants me to merge it, then I'll just wait for him to give his Ack.
Soft-freeze is fast approaching in less than a week...
We should let Phil send a pull request. :)
Thanks!
Laszlo
Quoted 25 lines · Laszlo Ersek
Quoted 24 lines · Daniel P. Berrangé
Quoted 6 lines · Philippe Mathieu-Daudé
Hi,
This series has 3 parts:
- First we add the tls-cipher-suites object
Quoted 8 lines
- We add the ability to QOM objects to produce data consumable by the
fw_cfgdevice,- Then we let the tls-cipher-suites object implement the
FW_CFG_DATA_GENERATORinterface.This is required by EDK2 'HTTPS Boot' feature [*] to tell the guest which TLS ciphers it can use.
On my crypto side, the series is ready to merge.
The code is split 50/50 between crypto subsystem and firmware subsystem, so the question is who wants to merge it ?
If Laszlo wants to merge it, then consider the whole series
to have Acked-by: Daniel P. Berrangé <[email protected]>
Quoted 6 lines
Quoted 4 lines
If Laszlo wants me to merge it, then I'll just wait for him to give his Ack.
Soft-freeze is fast approaching in less than a week...
We should let Phil send a pull request. :)
Fine by me.
Regards,
Daniel
Signature · 3 lines
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
Quoted 26 lines · Daniel P. Berrangé
Quoted 25 lines · Laszlo Ersek
Quoted 24 lines · Daniel P. Berrangé
Quoted 6 lines · Philippe Mathieu-Daudé
Hi,
This series has 3 parts:
- First we add the tls-cipher-suites object
Quoted 8 lines
- We add the ability to QOM objects to produce data consumable by the
fw_cfgdevice,- Then we let the tls-cipher-suites object implement the
FW_CFG_DATA_GENERATORinterface.This is required by EDK2 'HTTPS Boot' feature [*] to tell the guest which TLS ciphers it can use.
On my crypto side, the series is ready to merge.
The code is split 50/50 between crypto subsystem and firmware subsystem, so the question is who wants to merge it ?
If Laszlo wants to merge it, then consider the whole series
to have Acked-by: Daniel P. Berrangé <[email protected]>
Quoted 8 lines
Quoted 6 lines
Quoted 4 lines
If Laszlo wants me to merge it, then I'll just wait for him to give his Ack.
Soft-freeze is fast approaching in less than a week...
We should let Phil send a pull request. :)
Fine by me.
OK will do, thank to both of you!