From patchwork Wed Jun 12 14:36:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Glembotzki X-Patchwork-Id: 1946982 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.a=rsa-sha256 header.s=20230601 header.b=ltn/SegI; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=NhpFx9ds; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=googlegroups.com (client-ip=2a00:1450:4864:20::13d; helo=mail-lf1-x13d.google.com; envelope-from=swupdate+bncbdy5juxlviebbz7gu2zqmgqe4aessbq@googlegroups.com; receiver=patchwork.ozlabs.org) Received: from mail-lf1-x13d.google.com (mail-lf1-x13d.google.com [IPv6:2a00:1450:4864:20::13d]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VzpB44TFTz20Wq for ; Thu, 13 Jun 2024 00:40:44 +1000 (AEST) Received: by mail-lf1-x13d.google.com with SMTP id 2adb3069b0e04-52bbd8ac2c1sf4219283e87.3 for ; Wed, 12 Jun 2024 07:40:44 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1718203241; cv=pass; d=google.com; s=arc-20160816; b=0LuISPX23lJ6HlC1zU4u72G9aFQ1qO23TZFd7qawGDKnWDr3m8L2KtqJI5n2aWaUOg WE2GqpKIZYgCcbbyUk+57O1Lw3QrCSmkmSN2Rxw5VxO2AIzaqpZT22c3xuDSV8GGypuh 8oGbtyTnVIn5/V+D9vrRk93GySfKLUAzUMxcaroLU8OVIcta9lrKUeumvoQDuA5BHXbO 8hIU8kIJIHhxj0c6vcjuM5ldu1rtzJ50QzmEE14WaGckRhqn4/69lW7lbT9V8rob/jPI nMf5K8m0SSNMQVTE092NhRaNJu1ZGmx/5jI0qkb/+sHHuYSwQtFoJQ9elrVreQeR6i9k l+Tg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature :dkim-signature; bh=ymgqYBY/KozEV6xXDJAuqfdrRDg0tewkq9CupMy7d3s=; fh=ZoXkIBlzTMT/6nmaqLWXIETy94QF5d2V44nXHROrC5g=; b=KWA0hw6IRSs7GfVVljQgoqgdx7UYq21miEVi4X+DDXSk4GjbCUg/lwJF2fhFfJEzUs S86fWSCZllL5uAs15VEF5LJatLOKCVsmyd+N6XkFjOLTHo6VHhPafTPoYXXl/mnJw0Fg zIfa21gaHpoUfwHuLWWAA7Vgauia6T5CoLDj2b5JR1sHGh0Cd80yTPDZ56jg28zR2tSA TlDSLLEmxmdikZt2G36fBkIDjQfzosptnvs44XfeICHWNBJ297S5HVYULfTIlzipD55Q wQimcaKW/e916AquiCZnl/3gXAzKpRaaquxyefCT8P9EldpmnQf0l9rujg42YoyeZM9x wJmg==; darn=patchwork.ozlabs.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=F8gTszOp; spf=pass (google.com: domain of m.glembo@gmail.com designates 2a00:1450:4864:20::633 as permitted sender) smtp.mailfrom=m.glembo@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1718203241; x=1718808041; darn=patchwork.ozlabs.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:sender:from:to:cc:subject:date:message-id :reply-to; bh=ymgqYBY/KozEV6xXDJAuqfdrRDg0tewkq9CupMy7d3s=; b=ltn/SegIeNNnaBnnJGL2eF2nf7SW0ybaWRCpHOhDeQuVEdTtHWQPJEWijbxr6OhgGZ LD6wMx2ySes8qUGPRreWoSdBDXTgmBPude+ZQ64CIkU946oXqZ8TfqPM8ia/tJK14yOW lV1Hs8LCw/VnhrvBOI2G+u3S5RyBRk9I6+RGMifGCSGXcB9vZ9RHLJnEA1Fe1cb01K81 erD9mMCxXH2HY9nerJrpyTHlVGOMuKYn0HWleflrjH/mRifNFMk5JyyFGR5O1IUwrvH6 lTwr3pPQIsSfphXLjv0Yi6Glj4D6rEOQWWBQolFli2uSJgVf91KjsdCPqWMnXghRFImF YRLg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1718203241; x=1718808041; darn=patchwork.ozlabs.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=ymgqYBY/KozEV6xXDJAuqfdrRDg0tewkq9CupMy7d3s=; b=NhpFx9dsb5esNpLydedAaoeqXVmVJRr9f3oWa6km74kH3pyjdw91jDL4X2xfjkv2tx ESqnbPBbLCGJ1AfT+6cZdztE8zNvrW+pH9LeQWifIwKggnns0sGtFvTOrPm6tZq31TGG fxJGKRpn3xWOATzfVuMqzPFWHQwC30QC3T9t7zXibUQCL9ww1i7APn68TY6eK/mjN29J NRK4CAKdyOnUnQ6pTsXQodY8KTHv9QZE9W65M/cg6DwzWqc6WoO5SvKxfTu/fCArqnCm GS+l072XN7blkIyBtxJCb3N2HmGT9dW/CLzl0uyFVMYpg7jImoumdaZo+v1cpapjPMAq cI5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718203241; x=1718808041; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :x-beenthere:x-gm-message-state:sender:from:to:cc:subject:date :message-id:reply-to; bh=ymgqYBY/KozEV6xXDJAuqfdrRDg0tewkq9CupMy7d3s=; b=Mo1xWCKXiB7ojA4kgB+NiJ1bhqftm6nLKOnAbGJdp5BdxM5HInxBefqlIjn2lVHUE6 nJN4lZcgEdp1L3vdgNdZDjUMHC/ds9zAsDttOjLhcO4LbPcJQLwTA7nEtnjUX7IGgm08 GwyI6g4btsT8MG8Wq6AQ1thEo2JxiJhsfLIV0i+t1w5iO3aiWB/onksfaqbZRlJMv2P1 c/ZH37Bvtu4BqJmFAfAGbpVLxPeooKCAGsbZVDyEITQc50mAD2pjvnqPvtcsQVZvlVFC TKRFE5EXTNbw9OVoPGbJUx3QdKoFjksFIqhUgpODk05jy0KLEgVlyg3wUOB5/zaGP5dv /1BA== Sender: swupdate@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCUHpL/914bxoR/VCjmLtxQiUI6c9i9+BHw2bTbbFfOy3ox9dFA/gZM42krTJ9DrRePq+x7p0z99DKQMRObim32vVLqrR8y4Eh8dU/2MfA== X-Gm-Message-State: AOJu0YxxzCCWgiSvftC9kLBUZOHQ5qei6kO3yRjsz7lD6H1a0kISg7kf EAOzMrpKZKbh3O35VWbvZc0av/X7qweo1y/G+yNStTNlRX84LXjA X-Google-Smtp-Source: AGHT+IHh+5PumZUKGuBBus8Wx++VCAgEIcWPOpRVj76zzcf6dMiIx2JMB7xSVzSy7SZ1TmLZCpg2ow== X-Received: by 2002:a2e:9546:0:b0:2eb:e258:717f with SMTP id 38308e7fff4ca-2ebfc997fbdmr12267501fa.42.1718203240159; Wed, 12 Jun 2024 07:40:40 -0700 (PDT) X-BeenThere: swupdate@googlegroups.com Received: by 2002:a2e:380b:0:b0:2ea:b32c:c86e with SMTP id 38308e7fff4ca-2eadb2330c2ls516611fa.0.-pod-prod-04-eu; Wed, 12 Jun 2024 07:40:37 -0700 (PDT) X-Received: by 2002:ac2:446d:0:b0:52c:8915:2a0f with SMTP id 2adb3069b0e04-52c9a406bf6mr1079899e87.62.1718203237243; Wed, 12 Jun 2024 07:40:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1718203237; cv=none; d=google.com; s=arc-20160816; b=Oj8ogCKgug/XBc+wJhQGsvJRqj25Gt2i5G4uPV7UnsrIRNPpRi3EyjejYVbXC09nOD XZGWMDV5lSNPsn8Lq22SZTWV49NOn3mwMvNFivA5UPD2leaMwkVQAn6LqBAvZvJ2Le7F hmqmjv8lhXjAXBP4k6jpE/niDhpiG+9msQbxzAAZVTSTRFAnIX+Xd8si9AR42uFayCjV nNBf0NAGlkD5wjNXJqua8S2pA7QBlfG6fBN1MQO+r6DthCzDzcrV9mOmIdBA/ZQ6QNdg mxJ58o7tgYL0bTTNee2fOxRKqwiV3hXptEvh+In+/QMi5M9gEGd60m8vSpqIDvKSnrfC HjPQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=gdSRZM3qYP4/OdAEq26rw5aAQlC8yBy2yJ64cfErvtg=; fh=zydHuzCQWrku2OPQyZfraJZFcOpEXLQ/YBcu3QNiBd0=; b=Ois08tHtiku0hTHG1L4lSGJsQZ5aRpEePQ+F6uTmJfcElTOskYIokLkl4XVQLvKMCT GhqH9wR0TZ64TB9nB3v/dvtHDHp0TxEz8a/ytWNMa+pRL8cnNr0PD+OqyWvKpJ38nz1s 49HO4d6x1TVRAZ07+E8+RT+tQkcizO+09kQonkrs4+oVTUJv1oJ+FldCK5DIHZIOYCbR j5SpjfvJ6bBASdNUNipKSiC/zqUC3Jq8tKAKgDxO1Pe0LucuCqTGW///LUCYTKimRXUO cTFlAidTWp7AcFXACB8GlNz8kllSr8tGjwupYkYTnj2TsvXMzWPQ0kN/cZWGn6Sq+LBN Ytdg==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=F8gTszOp; spf=pass (google.com: domain of m.glembo@gmail.com designates 2a00:1450:4864:20::633 as permitted sender) smtp.mailfrom=m.glembo@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from mail-ej1-x633.google.com (mail-ej1-x633.google.com. [2a00:1450:4864:20::633]) by gmr-mx.google.com with ESMTPS id 2adb3069b0e04-52bc1253260si313372e87.0.2024.06.12.07.40.37 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 12 Jun 2024 07:40:37 -0700 (PDT) Received-SPF: pass (google.com: domain of m.glembo@gmail.com designates 2a00:1450:4864:20::633 as permitted sender) client-ip=2a00:1450:4864:20::633; Received: by mail-ej1-x633.google.com with SMTP id a640c23a62f3a-a6f1c4800easo445593666b.3 for ; Wed, 12 Jun 2024 07:40:37 -0700 (PDT) X-Received: by 2002:a17:906:48d:b0:a6f:85:2d67 with SMTP id a640c23a62f3a-a6f47ff3863mr104136666b.67.1718203236172; Wed, 12 Jun 2024 07:40:36 -0700 (PDT) Received: from localhost.localdomain ([2a02:8108:96c0:76fc::b071]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a6f16b27ac7sm481179166b.54.2024.06.12.07.40.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jun 2024 07:40:35 -0700 (PDT) From: Michael Glembotzki To: swupdate@googlegroups.com Cc: Michael Glembotzki Subject: [swupdate] [PATCH 21/23] mongoose: Use mg_file_read for cert/key Date: Wed, 12 Jun 2024 16:36:19 +0200 Message-ID: <20240612144010.470339-22-Michael.Glembotzki@iris-sensing.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240612144010.470339-1-Michael.Glembotzki@iris-sensing.com> References: <20240612144010.470339-1-Michael.Glembotzki@iris-sensing.com> MIME-Version: 1.0 X-Original-Sender: m.glembo@gmail.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=F8gTszOp; spf=pass (google.com: domain of m.glembo@gmail.com designates 2a00:1450:4864:20::633 as permitted sender) smtp.mailfrom=m.glembo@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Precedence: list Mailing-list: list swupdate@googlegroups.com; contact swupdate+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: swupdate@googlegroups.com X-Google-Group-Id: 605343134186 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , The specification of the cert/key path has been changed. The key/cert content is now expected as mg_str in tls_opts.cert/tls_opts.key. Signed-off-by: Michael Glembotzki --- mongoose/mongoose_interface.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mongoose/mongoose_interface.c b/mongoose/mongoose_interface.c index ba69a9bf..fb052ad3 100644 --- a/mongoose/mongoose_interface.c +++ b/mongoose/mongoose_interface.c @@ -904,8 +904,8 @@ int start_mongoose(const char *cfgfname, int argc, char *argv[]) #if MG_TLS if (ssl) { - tls_opts.cert = opts.ssl_cert; - tls_opts.certkey = opts.ssl_key; + tls_opts.cert = mg_file_read(&mg_fs_posix, opts.ssl_cert); + tls_opts.key = mg_file_read(&mg_fs_posix, opts.ssl_key); } #endif