From patchwork Tue May 19 18:20:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 1293645 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=O+dzKW4n; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 49RPNP2YRsz9sRK for ; Wed, 20 May 2020 04:21:39 +1000 (AEST) Received: from localhost ([::1]:38688 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jb6rv-0005dW-Sz for incoming@patchwork.ozlabs.org; Tue, 19 May 2020 14:21:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41578) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jb6r5-0005aw-Lb for qemu-devel@nongnu.org; Tue, 19 May 2020 14:20:43 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:37703 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 1jb6r4-0008Rf-1T for qemu-devel@nongnu.org; Tue, 19 May 2020 14:20:42 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1589912440; 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=V3444O34SL/GwayCaA1FJTGfw9tPsEHVptGLpqLLVps=; b=O+dzKW4nf6KJLcp2jVn4/jC1SgYCqiJkJZ2ZtndHNPSDit1mCy0z5KOFJ+sGfHPjtGcizL FoRZlA9H12hQtBVBS97Z/DgR/JycRbYll17Ol5B9p0qpJgzlg2qqMddrAoPJqr2PeuU5Ti ERHqFOycIw2jZyLM35QoeQ7xCPC5eSM= 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-152-FKw6ZQ1NP_WSPXdmjtvlGA-1; Tue, 19 May 2020 14:20:35 -0400 X-MC-Unique: FKw6ZQ1NP_WSPXdmjtvlGA-1 Received: by mail-wm1-f69.google.com with SMTP id m11so22600wml.5 for ; Tue, 19 May 2020 11:20:35 -0700 (PDT) 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=V3444O34SL/GwayCaA1FJTGfw9tPsEHVptGLpqLLVps=; b=S0pAzznZGvN0xKeBiA0/vQbauBxnTQ90h+hGsmt1dfmVcos6eVni5/aLaACJ+Rwg7Z L0YvxOG7CXfWRpRRfA4LwCLM1wUdo/ny2iVQjFXpOQZmHgXnOll2nlKouU24uZyVV7lx f4ba17Any8G2HlCShLPhDdYch4G5aK07Cf9oXjGU/gcjbiw/5Ta3mMYwml+QSYNdP8u2 KvlVCXlUBaRG+HBEPfireNGqPftJD1EdDuLo3F+KMpET6/EFrl88u29TAIZmguc01keo VtKCVnIFQByGSirTpz/YXMtM9dJ3NBgvOi1Nggch4QTjplR+qtGaA4PVXdm0bNKW1n70 HfXw== X-Gm-Message-State: AOAM533hEQ9DkKSUyE4x9n0daV2ibKC2osdFfVazeDPG8yrwA5e5eAyk 1hAhKAqDC1Ne9kvlO3PKYUnLQnsKWXGCi9iHtEXx/MoxWsCYEMENr2SDqmY70sPW6J7MmE0d3YB kkhclYUJAQ1JG5co= X-Received: by 2002:adf:efd0:: with SMTP id i16mr154514wrp.315.1589912434373; Tue, 19 May 2020 11:20:34 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyzxFMNmnAohAJwiFmq5+zzYKMsSmligrMlyzGfPA7mYZcROJQarYLcSeIko27B4R2I8P5saA== X-Received: by 2002:adf:efd0:: with SMTP id i16mr154423wrp.315.1589912433184; Tue, 19 May 2020 11:20:33 -0700 (PDT) Received: from localhost.localdomain (17.red-88-21-202.staticip.rima-tde.net. [88.21.202.17]) by smtp.gmail.com with ESMTPSA id x17sm228372wrp.71.2020.05.19.11.20.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 May 2020 11:20:32 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v6 1/5] hw/nvram/fw_cfg: Add the FW_CFG_DATA_GENERATOR interface Date: Tue, 19 May 2020 20:20:20 +0200 Message-Id: <20200519182024.14638-2-philmd@redhat.com> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200519182024.14638-1-philmd@redhat.com> References: <20200519182024.14638-1-philmd@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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/05/18 23:56:10 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] 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 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=2E_Berrang=C3=A9?= , Eduardo Habkost , Laszlo Ersek , Gerd Hoffmann , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" The FW_CFG_DATA_GENERATOR allow any object to product blob of data consumable by the fw_cfg device. Signed-off-by: Philippe Mathieu-Daudé --- include/hw/nvram/fw_cfg.h | 49 +++++++++++++++++++++++++++++++++++++++ hw/nvram/fw_cfg.c | 30 ++++++++++++++++++++++++ 2 files changed, 79 insertions(+) diff --git a/include/hw/nvram/fw_cfg.h b/include/hw/nvram/fw_cfg.h index 25d9307018..74b4790fae 100644 --- a/include/hw/nvram/fw_cfg.h +++ b/include/hw/nvram/fw_cfg.h @@ -9,11 +9,40 @@ #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" #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) +#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 + * + * Returns: pointer to start of the generated item data + */ + const void *(*get_data)(Object *obj); + /** + * get_length: + * @obj: the object implementing this interface + * + * Returns: the size of the generated item data in bytes + */ + size_t (*get_length)(Object *obj); +} FWCfgDataGeneratorClass; + typedef struct fw_cfg_file FWCfgFile; #define FW_CFG_ORDER_OVERRIDE_VGA 70 @@ -263,6 +292,26 @@ void fw_cfg_add_file_callback(FWCfgState *s, const char *filename, void *fw_cfg_modify_file(FWCfgState *s, const char *filename, void *data, size_t len); +/** + * fw_cfg_add_from_generator: + * @s: fw_cfg device being modified + * @filename: name of new fw_cfg file item + * @generator_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 + * @generator_id object. The data referenced by the starting pointer 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 name, + * data size, and assigned selector key value. + * + * Returns: the size of the generated item data on success, -1 otherwise. + */ +ssize_t fw_cfg_add_from_generator(FWCfgState *s, const char *filename, + const char *generator_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 8dd50c2c72..e18cb074df 100644 --- a/hw/nvram/fw_cfg.c +++ b/hw/nvram/fw_cfg.c @@ -1032,6 +1032,30 @@ void *fw_cfg_modify_file(FWCfgState *s, const char *filename, return NULL; } +ssize_t fw_cfg_add_from_generator(FWCfgState *s, const char *filename, + const char *generator_id, Error **errp) +{ + FWCfgDataGeneratorClass *k; + Object *o; + size_t sz; + + o = object_resolve_path_component(object_get_objects_root(), generator_id); + if (!o) { + error_setg(errp, "Cannot find object ID %s", generator_id); + return -1; + } + if (!object_dynamic_cast(o, TYPE_FW_CFG_DATA_GENERATOR_INTERFACE)) { + error_setg(errp, "Object '%s' is not a fw_cfg-data-generator subclass", + generator_id); + return -1; + } + k = FW_CFG_DATA_GENERATOR_GET_CLASS(o); + sz = k->get_length(o); + fw_cfg_add_file(s, filename, g_memdup(k->get_data(o), sz), sz); + + return sz; +} + static void fw_cfg_machine_reset(void *opaque) { MachineClass *mc = MACHINE_GET_CLASS(qdev_get_machine()); @@ -1333,12 +1357,18 @@ static const TypeInfo fw_cfg_mem_info = { .class_init = fw_cfg_mem_class_init, }; +static const TypeInfo fw_cfg_data_generator_interface_info = { + .name = TYPE_FW_CFG_DATA_GENERATOR_INTERFACE, + .parent = TYPE_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) From patchwork Tue May 19 18:20:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 1293644 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=crVINwPc; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 49RPNP1CdZz9sTM for ; Wed, 20 May 2020 04:21:39 +1000 (AEST) Received: from localhost ([::1]:38712 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jb6rw-0005eE-F2 for incoming@patchwork.ozlabs.org; Tue, 19 May 2020 14:21:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41582) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jb6r6-0005cu-Qm for qemu-devel@nongnu.org; Tue, 19 May 2020 14:20:44 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:30840 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 1jb6r5-0008Rv-VT for qemu-devel@nongnu.org; Tue, 19 May 2020 14:20:44 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1589912443; 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=AXKHm9sEGpzJKmFxobEwS5Bkzi/fbuyVBY253GTU/xE=; b=crVINwPcV+drVuE0Iqgz6jyK9qNwtce7pr+0DMxnhzXCiVzPvdYzf8lmMqsrDdPv4dPeLU e3CGsMOJQVyHZzrOwDJAOhxACDnIyK23K4NnXRZXcGiInuqeiJi+4SBdJ1sHGrwWXElEKu Z+gD0KfTf0uRLa+iDd0n+S07npVkOiw= Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-116-Lqm4HskPM9mGERR6Qd2JZA-1; Tue, 19 May 2020 14:20:41 -0400 X-MC-Unique: Lqm4HskPM9mGERR6Qd2JZA-1 Received: by mail-wr1-f70.google.com with SMTP id u5so183061wrt.22 for ; Tue, 19 May 2020 11:20:41 -0700 (PDT) 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=AXKHm9sEGpzJKmFxobEwS5Bkzi/fbuyVBY253GTU/xE=; b=XAGAwkchuVtCkDV6b6UgpkgysmEnkmqkgoJogEN0UCqjiDJwcG9Il/dNnv2wiRcuNl akYA6kv1KVUcbDCWN1E3YbJNjVWVN8DJU1FKHDHEBn1AmvQpGHYwO71O6cCxdcBPUW2U F/G8343Jq5lo1kSaXAqF1kFjdmVUQVMDwWHMPCq8ok1fDCIZxhOBI4HCWAR/3OU4k1je 8lplgaEGcfZC5KW0DJgUB30QhjmlnqAgI1MyFVv4bcmJzwLdRXPj8MFQQVUI0chEf4JX E1QsLsLMjmWNjJTG7Wkn8mrlvGU0dZplrcad82B5VBil9XoT0vQFxsh4sfUzi6ekdVum AHrg== X-Gm-Message-State: AOAM533KxWWZhwgmjEVlirhaB6Qsm456BeEBUXGqnEM8WmwoMcINYcvz ExdLh0NGPRdf5XFMW8LpO2BfZVpTjRT3kqimzwTNGCiFqheltPZki8D9BpTMH9p2R65+DXWRAGM lBuThOhVkEAQbRK8= X-Received: by 2002:a5d:6087:: with SMTP id w7mr226338wrt.158.1589912439530; Tue, 19 May 2020 11:20:39 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwk4B8l3Ki5y6mp56jyDKGFOGMBcO9XVVp+fzi7K9ZMNWIFEf8jSQ1K1qE5TDyWsWVL9ba51g== X-Received: by 2002:a5d:6087:: with SMTP id w7mr226320wrt.158.1589912439375; Tue, 19 May 2020 11:20:39 -0700 (PDT) Received: from localhost.localdomain (17.red-88-21-202.staticip.rima-tde.net. [88.21.202.17]) by smtp.gmail.com with ESMTPSA id q144sm581286wme.0.2020.05.19.11.20.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 May 2020 11:20:38 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v6 2/5] softmmu/vl: Let -fw_cfg option take a 'blob_id' argument Date: Tue, 19 May 2020 20:20:21 +0200 Message-Id: <20200519182024.14638-3-philmd@redhat.com> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200519182024.14638-1-philmd@redhat.com> References: <20200519182024.14638-1-philmd@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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/05/18 23:56:10 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] 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 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=2E_Berrang=C3=A9?= , Eduardo Habkost , Laszlo Ersek , Gerd Hoffmann , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" The 'blob_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. Signed-off-by: Philippe Mathieu-Daudé --- softmmu/vl.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/softmmu/vl.c b/softmmu/vl.c index ae5451bc23..f76c53ad2e 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -489,6 +489,10 @@ 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 = "blob_id", + .type = QEMU_OPT_STRING, + .help = "Sets id of the object generating fw_cfg blob to be used", }, { /* end of list */ } }, @@ -2020,7 +2024,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, *blob_id; FWCfgState *fw_cfg = (FWCfgState *) opaque; if (fw_cfg == NULL) { @@ -2030,14 +2034,17 @@ 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"); + blob_id = qemu_opt_get(opts, "blob_id"); /* we need name and either a file or the content string */ - if (!(nonempty_str(name) && (nonempty_str(file) || nonempty_str(str)))) { + if (!(nonempty_str(name) + && (nonempty_str(file) || nonempty_str(str) || nonempty_str(blob_id))) + ) { error_setg(errp, "invalid argument(s)"); return -1; } - if (nonempty_str(file) && nonempty_str(str)) { - error_setg(errp, "file and string are mutually exclusive"); + if (nonempty_str(file) && nonempty_str(str) && nonempty_str(blob_id)) { + error_setg(errp, "file, string and blob_id are mutually exclusive"); return -1; } if (strlen(name) > FW_CFG_MAX_FILE_PATH - 1) { @@ -2052,6 +2059,8 @@ 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(blob_id)) { + return fw_cfg_add_from_generator(fw_cfg, name, blob_id, errp); } else { GError *err = NULL; if (!g_file_get_contents(file, &buf, &size, &err)) { From patchwork Tue May 19 18:20:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 1293656 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=YX8smZQK; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 49RPSV2q7Lz9sTK for ; Wed, 20 May 2020 04:25:14 +1000 (AEST) Received: from localhost ([::1]:51148 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jb6vQ-0003Lz-4x for incoming@patchwork.ozlabs.org; Tue, 19 May 2020 14:25:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41594) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jb6rC-0005eP-AF for qemu-devel@nongnu.org; Tue, 19 May 2020 14:20:50 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:42466 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 1jb6rB-0008SE-CY for qemu-devel@nongnu.org; Tue, 19 May 2020 14:20:50 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1589912447; 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=jq7M0GNbAMnwTwtOhCF9XvyRYicoQZiXqGW42a5oD/A=; b=YX8smZQKsIzTcUet4vxLzf7gLGb8x638jHnYejJvsUqPQZ35/64dqs0bWsMz/kL0Z5CNw4 qXwo9HZ34TOMcoCOYB3MHbxJ0yXcBbKUYcpvVXItTli9bMR0G57SQp3XyXfsnz3iVmtrsd zw3ypiQE/Mp3DKOqPbzHz1kGdezB6+g= 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-391-URk7aF8NNhe3NcaEviA6pw-1; Tue, 19 May 2020 14:20:45 -0400 X-MC-Unique: URk7aF8NNhe3NcaEviA6pw-1 Received: by mail-wr1-f69.google.com with SMTP id e14so196103wrv.11 for ; Tue, 19 May 2020 11:20:45 -0700 (PDT) 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=jq7M0GNbAMnwTwtOhCF9XvyRYicoQZiXqGW42a5oD/A=; b=BU+3h90rQNiJwM33JxkRCd/pT82XclaPcgyf+PCKGwU9bGwQhfFMvqRQI1xCJqAbXF RU4gyOFrodnBLsZMF+HRMMK2yCXgzTwhyHBXsZjJ7mEGiClegKNWhSQVhsryW7gx5PYm ivBUGmz/ZPFJwljMajvGDIK7IGD26MS5/7qt46XfoN2xLhhsOabmDsgrC86l6nO9kBaC u8fhtmuxHrkoRJfrZMs3d8hcqF6cNqpKpGeFpnhZlKXeG12DUh19Sl3q/Jawaev0gTC1 IafYS/u6YJrjY9Q6kR2ApTB99YrbTUN+PnYdf3wplZ/Y4R3P+re1sH1kKXkGwlL69tQa kcRQ== X-Gm-Message-State: AOAM532FNT5hgetYOPyq2YegQxakQJ44dWB4/zrAmaTbpPUBkv6CSFlb Dm9yBXo9EZarparzFjqQJihqQYmZU7NIgKIjG/1TUohY629WE0H0xjFer+K1LStVy6Pl+q6571y U2wG8PFLtSa0emKI= X-Received: by 2002:adf:f702:: with SMTP id r2mr173874wrp.191.1589912444140; Tue, 19 May 2020 11:20:44 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzq4xfSE71w5ZhKwWI8R11/+g1xtfz/aFvWL6CRdzCbcxXMMOyuVM3CQsJJHsW2UDuNewqOYQ== X-Received: by 2002:adf:f702:: with SMTP id r2mr173845wrp.191.1589912443903; Tue, 19 May 2020 11:20:43 -0700 (PDT) Received: from localhost.localdomain (17.red-88-21-202.staticip.rima-tde.net. [88.21.202.17]) by smtp.gmail.com with ESMTPSA id h1sm508829wme.42.2020.05.19.11.20.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 May 2020 11:20:43 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [RFC PATCH v6 3/5] softmmu/vl: Allow -fw_cfg 'blob_id' option to set any file pathname Date: Tue, 19 May 2020 20:20:22 +0200 Message-Id: <20200519182024.14638-4-philmd@redhat.com> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200519182024.14638-1-philmd@redhat.com> References: <20200519182024.14638-1-philmd@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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/05/19 09:19:26 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_H3=0.001, RCVD_IN_MSPIKE_WL=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?Daniel_P=2E_Berrang=C3=A9?= , Eduardo Habkost , Laszlo Ersek , Gerd Hoffmann , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" This is to silent: $ qemu-system-x86_64 \ -object tls-cipher-suites,id=ciphersuite0,priority=@SYSTEM \ -fw_cfg name=etc/edk2/https/ciphers,blob_id=ciphersuite0 qemu-system-x86_64: -fw_cfg name=etc/edk2/https/ciphers,blob_id=ciphersuite0: warning: externally provided fw_cfg item names should be prefixed with "opt/" Signed-off-by: Philippe Mathieu-Daudé --- softmmu/vl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/softmmu/vl.c b/softmmu/vl.c index f76c53ad2e..3b77dcc00d 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -2052,7 +2052,7 @@ 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(blob_id) && strncmp(name, "opt/", 4) != 0) { warn_report("externally provided fw_cfg item names " "should be prefixed with \"opt/\""); } From patchwork Tue May 19 18:20:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 1293653 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=fQs/8P7t; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 49RPS15wd0z9sRK for ; Wed, 20 May 2020 04:24:49 +1000 (AEST) Received: from localhost ([::1]:49838 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jb6v1-0002Nt-HK for incoming@patchwork.ozlabs.org; Tue, 19 May 2020 14:24:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41630) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jb6rV-00061V-Ht for qemu-devel@nongnu.org; Tue, 19 May 2020 14:21:09 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:29760 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 1jb6rT-0008Us-8n for qemu-devel@nongnu.org; Tue, 19 May 2020 14:21:09 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1589912466; 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=LVQVAAvXbqJcDyYus8SsyTCycxmjXkzrJy0FVLgtSug=; b=fQs/8P7tr/O1UTOPK1oN1qGkDvswGxgFYO06bRSPyovhreB8Jbgh4BycshcnyOb2oRpTHV PuQIygPUWv38XLG7yazFfZt7die+eUwFM3kNAmnWI4B+Qy7aJLFJ+OXz0rdUsEcGNxRZSZ Ge4ks27WdpsbYHVveuMwsWNj28MlYRM= 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-422-FBUXAgSxM-a3CCLdDlkl_A-1; Tue, 19 May 2020 14:20:50 -0400 X-MC-Unique: FBUXAgSxM-a3CCLdDlkl_A-1 Received: by mail-wm1-f69.google.com with SMTP id m11so22860wml.5 for ; Tue, 19 May 2020 11:20:50 -0700 (PDT) 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=LVQVAAvXbqJcDyYus8SsyTCycxmjXkzrJy0FVLgtSug=; b=BRSIyRUC2/jt2s/oySSRSzGR9wTrJnMxehWVuhPK1nqew/SGmttzOqr3rnpmKUiVhE ru36ZMxVz7Tt8tPEQsnNkixLhtFgKB+xoV7CVrra6dtPN65Ma9WSISN8uBpjrTRR8sZS Kfo+1LwZpcLYIgWbpAFEZIaIgf8+TdFhyVHXXIN8PXicp8J44Hpen00fliXAwP6aWG2o yWAYO56s5XTW7FQd1FWfuwYrx0RVqzZ8TSTT33Bj/Re+XmhVQ5qQmd3l9qZgOh8stxnh DdiX+3Rq+l9BgJldOSRakswzRuMXgghRC+fOzhIQ5qhRKOIhXyMHqCD+YYJ9G3qbMsSA eo2w== X-Gm-Message-State: AOAM531OhkS0eACK6l7aN0R5IiPs9C+Hk6a9FB+ML0Eh8eF+pibJVA67 LDjEPYiU/hS7+uDUHKuYKKIrYMqUBs6LxoxwY1oejoKhplLZ9QqpruQvVtx7o7tn1fbshcCASSf II1agFtJ5CjfohNU= X-Received: by 2002:a1c:f312:: with SMTP id q18mr643640wmq.175.1589912448955; Tue, 19 May 2020 11:20:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxbccqL21xiOc/RTj3tNHHTOb7oqAs61SOpDqXOBC/cnnoJ8AHVh87T3DWNRuVKFfUvfbIRcQ== X-Received: by 2002:a1c:f312:: with SMTP id q18mr643608wmq.175.1589912448655; Tue, 19 May 2020 11:20:48 -0700 (PDT) Received: from localhost.localdomain (17.red-88-21-202.staticip.rima-tde.net. [88.21.202.17]) by smtp.gmail.com with ESMTPSA id o24sm463708wmm.33.2020.05.19.11.20.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 May 2020 11:20:48 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v6 4/5] crypto: Add tls-cipher-suites object Date: Tue, 19 May 2020 20:20:23 +0200 Message-Id: <20200519182024.14638-5-philmd@redhat.com> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200519182024.14638-1-philmd@redhat.com> References: <20200519182024.14638-1-philmd@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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/05/18 23:19:13 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] 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_H2=-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=2E_Berrang=C3=A9?= , Eduardo Habkost , Laszlo Ersek , Gerd Hoffmann , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Example of use to dump: $ qemu-system-x86_64 -S \ -object tls-cipher-suites,id=mysuite,priority=@SYSTEM,verbose=yes Cipher suites for @SYSTEM: - TLS_AES_256_GCM_SHA384 0x13, 0x02 TLS1.3 - TLS_CHACHA20_POLY1305_SHA256 0x13, 0x03 TLS1.3 - TLS_AES_128_GCM_SHA256 0x13, 0x01 TLS1.3 - TLS_AES_128_CCM_SHA256 0x13, 0x04 TLS1.3 - TLS_ECDHE_RSA_AES_256_GCM_SHA384 0xc0, 0x30 TLS1.2 - TLS_ECDHE_RSA_CHACHA20_POLY1305 0xcc, 0xa8 TLS1.2 - TLS_ECDHE_RSA_AES_256_CBC_SHA1 0xc0, 0x14 TLS1.0 - TLS_ECDHE_RSA_AES_128_GCM_SHA256 0xc0, 0x2f TLS1.2 - TLS_ECDHE_RSA_AES_128_CBC_SHA1 0xc0, 0x13 TLS1.0 - TLS_ECDHE_ECDSA_AES_256_GCM_SHA384 0xc0, 0x2c TLS1.2 - TLS_ECDHE_ECDSA_CHACHA20_POLY1305 0xcc, 0xa9 TLS1.2 - TLS_ECDHE_ECDSA_AES_256_CCM 0xc0, 0xad TLS1.2 - TLS_ECDHE_ECDSA_AES_256_CBC_SHA1 0xc0, 0x0a TLS1.0 - TLS_ECDHE_ECDSA_AES_128_GCM_SHA256 0xc0, 0x2b TLS1.2 - TLS_ECDHE_ECDSA_AES_128_CCM 0xc0, 0xac TLS1.2 - TLS_ECDHE_ECDSA_AES_128_CBC_SHA1 0xc0, 0x09 TLS1.0 - TLS_RSA_AES_256_GCM_SHA384 0x00, 0x9d TLS1.2 - TLS_RSA_AES_256_CCM 0xc0, 0x9d TLS1.2 - TLS_RSA_AES_256_CBC_SHA1 0x00, 0x35 TLS1.0 - TLS_RSA_AES_128_GCM_SHA256 0x00, 0x9c TLS1.2 - TLS_RSA_AES_128_CCM 0xc0, 0x9c TLS1.2 - TLS_RSA_AES_128_CBC_SHA1 0x00, 0x2f TLS1.0 - TLS_DHE_RSA_AES_256_GCM_SHA384 0x00, 0x9f TLS1.2 - TLS_DHE_RSA_CHACHA20_POLY1305 0xcc, 0xaa TLS1.2 - TLS_DHE_RSA_AES_256_CCM 0xc0, 0x9f TLS1.2 - TLS_DHE_RSA_AES_256_CBC_SHA1 0x00, 0x39 TLS1.0 - TLS_DHE_RSA_AES_128_GCM_SHA256 0x00, 0x9e TLS1.2 - TLS_DHE_RSA_AES_128_CCM 0xc0, 0x9e TLS1.2 - TLS_DHE_RSA_AES_128_CBC_SHA1 0x00, 0x33 TLS1.0 total: 29 ciphers Signed-off-by: Philippe Mathieu-Daudé --- include/crypto/tls-cipher-suites.h | 39 +++++++++ crypto/tls-cipher-suites.c | 133 +++++++++++++++++++++++++++++ crypto/Makefile.objs | 1 + 3 files changed, 173 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..31e92916e1 --- /dev/null +++ b/include/crypto/tls-cipher-suites.h @@ -0,0 +1,39 @@ +/* + * QEMU TLS Cipher Suites + * + * 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) + +/* + * IANA registered TLS ciphers: + * https://www.iana.org/assignments/tls-parameters/tls-parameters.xhtml#tls-parameters-4 + */ +typedef struct { + uint8_t data[2]; +} IANA_TLS_CIPHER; + +typedef struct QCryptoTLSCipherSuites { + /* */ + QCryptoTLSCreds parent_obj; + + /* */ + bool verbose; + 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..c6c51359bd --- /dev/null +++ b/crypto/tls-cipher-suites.c @@ -0,0 +1,133 @@ +/* + * 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 "qemu/error-report.h" +#include "crypto/tlscreds.h" +#include "crypto/tls-cipher-suites.h" + +static void parse_cipher_suites(QCryptoTLSCipherSuites *s, + const char *priority_name, Error **errp) +{ +#ifdef CONFIG_GNUTLS + int ret; + unsigned int idx; + const char *name; + const char *err; + gnutls_protocol_t version; + gnutls_priority_t pcache; + + assert(priority_name); + ret = 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; + } + + if (s->verbose) { + fprintf(stderr, "Cipher suites for %s:\n", priority_name); + } + for (size_t i = 0;; i++) { + 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; + } + s->cipher_list = g_renew(IANA_TLS_CIPHER, + s->cipher_list, s->cipher_count + 1); + + name = gnutls_cipher_suite_info(idx, + s->cipher_list[s->cipher_count].data, + NULL, NULL, NULL, &version); + if (name != NULL) { + if (s->verbose) { + fprintf(stderr, "- %-50s\t0x%02x, 0x%02x\t%s\n", name, + s->cipher_list[s->cipher_count].data[0], + s->cipher_list[s->cipher_count].data[1], + gnutls_protocol_get_name(version)); + } + s->cipher_count++; + } + } + if (s->verbose) { + fprintf(stderr, "total: %u ciphers\n", s->cipher_count); + } + gnutls_priority_deinit(pcache); +#else + error_setg(errp, "GNU TLS not available"); +#endif /* CONFIG_GNUTLS */ +} + +static void qcrypto_tls_cipher_suites_complete(UserCreatable *uc, Error **errp) +{ + QCryptoTLSCreds *s = 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_set_verbose(Object *obj, bool value, + Error **errp G_GNUC_UNUSED) +{ + QCRYPTO_TLS_CIPHER_SUITES(obj)->verbose = value; +} + + +static bool qcrypto_tls_cipher_suites_get_verbose(Object *obj, + Error **errp G_GNUC_UNUSED) +{ + return QCRYPTO_TLS_CIPHER_SUITES(obj)->verbose; +} + +static void qcrypto_tls_cipher_suites_finalize(Object *obj) +{ + QCryptoTLSCipherSuites *s = QCRYPTO_TLS_CIPHER_SUITES(obj); + + g_free(s->cipher_list); +} + +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; + + object_class_property_add_bool(oc, "verbose", + qcrypto_tls_cipher_suites_get_verbose, + qcrypto_tls_cipher_suites_set_verbose); +} + +static const TypeInfo qcrypto_tls_cipher_suites_info = { + .parent = TYPE_QCRYPTO_TLS_CREDS, + .name = TYPE_QCRYPTO_TLS_CIPHER_SUITES, + .instance_size = sizeof(QCryptoTLSCipherSuites), + .instance_finalize = qcrypto_tls_cipher_suites_finalize, + .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 c2a371b0b4..ce706d322a 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-y += tls-cipher-suites.o crypto-obj-y += tlscreds.o crypto-obj-y += tlscredsanon.o crypto-obj-y += tlscredspsk.o From patchwork Tue May 19 18:20:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 1293646 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=K9KaKeFA; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 49RPNZ3N5pz9sTY for ; Wed, 20 May 2020 04:21:50 +1000 (AEST) Received: from localhost ([::1]:39018 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jb6s8-0005n4-7M for incoming@patchwork.ozlabs.org; Tue, 19 May 2020 14:21:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41610) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jb6rK-0005kp-7D for qemu-devel@nongnu.org; Tue, 19 May 2020 14:20:58 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:54684 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 1jb6rJ-0008T4-0E for qemu-devel@nongnu.org; Tue, 19 May 2020 14:20:57 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1589912456; 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=G4M1Sk471/wpIRr2uPISQE7oxsTBasuxbJF2aNsWx5U=; b=K9KaKeFA6rdwCgPgovi9w/sopaHItPBQKDx9kR23klJjlrMAyQ9qKrKdcYvTxvBVao4rOz oDOYgBG+141fuxkQAB5mpbY4tXDZcuqxggxW2XJQWMtcraDYKGbuE8AJ26lRHJAQ3c6YDZ SqwzFp87HSWzEBYJdVzBve5DQmqRZUE= 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-110-R6PWDmI2OzqBnFOBMJvlVg-1; Tue, 19 May 2020 14:20:54 -0400 X-MC-Unique: R6PWDmI2OzqBnFOBMJvlVg-1 Received: by mail-wr1-f72.google.com with SMTP id y7so194422wrd.12 for ; Tue, 19 May 2020 11:20:54 -0700 (PDT) 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=G4M1Sk471/wpIRr2uPISQE7oxsTBasuxbJF2aNsWx5U=; b=sr6pFF7KxqjrnOyzc69WHkIMISfpjDk2zL5KkpY+Z6XVECjBnnFxU7DjopQWp7oe0H e9sfkfe6SqRx/1k2wZGTGYklra1AZJ1DXuS1/Ct6lH1D7H19JRNqyjKCv1nm+EgOd5Ij CTPrXSg/AbWjQP3QPUVEkd0duIPj3SX+np3DOYg+blP4EqSvx0VnXuCKmo9KaTvuCKjZ yjFnnC/zUqZz7LiGrNN7PppmEVLGOxSVs0yybpNGNUcIvL8HyogIdBbys22tDpgIaKQ9 7Go/wWNZuz9OFvNqSsP+E0k6hHYTao3px7dGyTLhsGZE3KC4VYUu07KTTMoimMPHh3px NyDQ== X-Gm-Message-State: AOAM5332dFvkdC7ksyaphMh5hI+lC9OrqExyh2yk6fsaS9ebVUBzQxvE rpUl1AZOWn8pj+JRUzVyVUd3xPnYiTQuo+DaP/87F29jWlB2YmZq1qGjoz+Eqz0NjaHisosAyir /zkHyj0Bzz8j2fYw= X-Received: by 2002:a7b:c4da:: with SMTP id g26mr669849wmk.3.1589912453406; Tue, 19 May 2020 11:20:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxCDUw75o4IQMRaKPxCeuqA75BeOP+5lHCao1PqwaGEZPGR24a4wgHmYR1RE27KrFwivzX0oA== X-Received: by 2002:a7b:c4da:: with SMTP id g26mr669828wmk.3.1589912453248; Tue, 19 May 2020 11:20:53 -0700 (PDT) Received: from localhost.localdomain (17.red-88-21-202.staticip.rima-tde.net. [88.21.202.17]) by smtp.gmail.com with ESMTPSA id r9sm280010wra.52.2020.05.19.11.20.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 May 2020 11:20:52 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v6 5/5] crypto/tls-cipher-suites: Product fw_cfg consumable blob Date: Tue, 19 May 2020 20:20:24 +0200 Message-Id: <20200519182024.14638-6-philmd@redhat.com> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200519182024.14638-1-philmd@redhat.com> References: <20200519182024.14638-1-philmd@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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/05/18 23:56:10 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] 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 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=2E_Berrang=C3=A9?= , Eduardo Habkost , Laszlo Ersek , Gerd Hoffmann , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Since our format is consumable by the fw_cfg device, we can implement the FW_CFG_DATA_GENERATOR interface. Signed-off-by: Philippe Mathieu-Daudé Acked-by: Laszlo Ersek --- crypto/tls-cipher-suites.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/crypto/tls-cipher-suites.c b/crypto/tls-cipher-suites.c index c6c51359bd..11872783eb 100644 --- a/crypto/tls-cipher-suites.c +++ b/crypto/tls-cipher-suites.c @@ -14,6 +14,7 @@ #include "qemu/error-report.h" #include "crypto/tlscreds.h" #include "crypto/tls-cipher-suites.h" +#include "hw/nvram/fw_cfg.h" static void parse_cipher_suites(QCryptoTLSCipherSuites *s, const char *priority_name, Error **errp) @@ -101,11 +102,28 @@ static void qcrypto_tls_cipher_suites_finalize(Object *obj) g_free(s->cipher_list); } +static const void *qcrypto_tls_cipher_suites_get_data(Object *obj) +{ + QCryptoTLSCipherSuites *s = QCRYPTO_TLS_CIPHER_SUITES(obj); + + return s->cipher_list; +} + +static size_t qcrypto_tls_cipher_suites_get_length(Object *obj) +{ + QCryptoTLSCipherSuites *s = QCRYPTO_TLS_CIPHER_SUITES(obj); + + return s->cipher_count * sizeof(IANA_TLS_CIPHER); +} + 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_get_data; + fwgc->get_length = qcrypto_tls_cipher_suites_get_length; object_class_property_add_bool(oc, "verbose", qcrypto_tls_cipher_suites_get_verbose, @@ -121,6 +139,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 }, { } } };