From patchwork Tue Jul 9 11:08:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Glembotzki X-Patchwork-Id: 1958339 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=LFX8N2i6; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=Fd65ptxw; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=googlegroups.com (client-ip=2a00:1450:4864:20::340; helo=mail-wm1-x340.google.com; envelope-from=swupdate+bncbdy5juxlviebbvfxws2amgqedmzeqvi@googlegroups.com; receiver=patchwork.ozlabs.org) Received: from mail-wm1-x340.google.com (mail-wm1-x340.google.com [IPv6:2a00:1450:4864:20::340]) (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 4WJJLw72SCz1ySg for ; Tue, 9 Jul 2024 21:15:36 +1000 (AEST) Received: by mail-wm1-x340.google.com with SMTP id 5b1f17b1804b1-42725d3ae3esf2338375e9.3 for ; Tue, 09 Jul 2024 04:15:36 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1720523734; cv=pass; d=google.com; s=arc-20160816; b=kde7MK5Btqn4zceMQqis+1S+eD7BAOsiH+YQgsu+uhTNOjhCU44ByK+Z/YZ31f7zsV QCqF3wv9OaNm6KrFvubXaQn/59SL2QftQAQZ0tPSYPWkejLyuofXb6mHJMSfexXNZ6NH HMAQlTsQsq+XtQpVgGt4Ir01M6qQrRXtyNs+ec4GuaMEESWyENuRiaDlNKZtgXlM2pia v4HJUi9M9urC16y+qeh/Ke2Tmai0UdHIsPoOBTjz1iMG5AaNbQoa9pBYGYv39t+yYbwM LmHO1t89tgvvxuLP+mpe0D66c+q4Mm0XY4vg/tuLN++U7t6VSdT5VHRugj+ca9TXtacF 20pQ== 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=L0HhHYmfz/P0DVoJ9yBOQJJ2Q9kWOnTrnH6NAtSUK58=; fh=dpPxtt+nrnETmH1nhZ6pQvqTeDqAuQYVMPWXL5amZ9Q=; b=RlRoyPAUYp0fErCwS0gMp+0MEVJgHuOWadcfiGh/qHVxEdtR9DF/pjZ4MiVTHTCaqE 2ruJ0Mn20QKKVEZpE2bG3ILSwU2UGao06N6x0Xn6QQbHSV/NZVuf+f2VT833PScY0cUM WI7mvu1Bh8pp+rFGcyPIFPFrLax++p25mejyxCTi2KE6e02j5Bg3DIYKKOrjbmPGuhwo aBQ79Q/kYLoPRWyQJyKWspUeX3Pq3x4vUCCGOmwz38G0r5vrJGicrnnGBFTqNqgtPjoP pFG/Xo4YH+1+5uvy1RBeSewM2bISfnF4pDvL6LZYxZFcV8jQzIQQAQ5WikrYCZmo8cLd aUxw==; darn=patchwork.ozlabs.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=nso4+0Hl; spf=pass (google.com: domain of m.glembo@gmail.com designates 2a00:1450:4864:20::630 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=1720523734; x=1721128534; 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=L0HhHYmfz/P0DVoJ9yBOQJJ2Q9kWOnTrnH6NAtSUK58=; b=LFX8N2i6MP+3VB5H76RkrZ1mOEXoGJq5R/szxQB9cJR+G9aYswdXXJrHZ9st9UnAJW V52hYgru4DKgEh+DUlckX02zjBbrG9B6sZeBnUxIh6LRCsqWLIGNeymFqR0te7H7iKki qNQQIH36ky2WZ/2F5ShtNLMeNPHZ+tGeZSoQ36xXw8UAREe4gan4jhp/tJnxBrG9Taaz ib32FmSfxaj963HyBmLs+tD5sW8eh4lhQ490D6HWMG8xFATml7g9tVVdSs8sZgAWJJvM 2JkeBoPk1FctRj2OqJssGs29SK333Tto9sdqddLoK6A/122cPetIglgO3bKuf5HQS+fW 6MTw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1720523734; x=1721128534; 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=L0HhHYmfz/P0DVoJ9yBOQJJ2Q9kWOnTrnH6NAtSUK58=; b=Fd65ptxw246sOfAbFHjNNBzz/e+T4/v27u9BoLa9HbAnF16PFdzKSU41Yd9Ms9iFGQ t4MU3+sdgOmn3xZwMzqbsxrmr9T69j3Ls+wqGTLbtH8oxYYQY9KiQspsUzrK8bj5Xblf c1O5zrCS2yPPT1Smx6mgfugp3AAVlkXe9uHxkRvg3Xc2t2nU9TmhDiswA0tkNMb0i1l+ E+5fCH+B5It7lLO2lnjoLLs/AHhcrsTNNjSxiEJxJVaRcRMWDHYo78e6RMNlJNGxAvp7 oervCvCf7u463y144O7+/np8MpBo6tZ/yW9ABvU2aw2xU2r208l5yFIme47Ow6lXIJSA 4K1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720523734; x=1721128534; 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=L0HhHYmfz/P0DVoJ9yBOQJJ2Q9kWOnTrnH6NAtSUK58=; b=jnZTCoUFz9KdWssjV7sHIkYsRFTy/NQJyLblOBasejKiUH2NDzGy0rFyBEuJsntMj9 tExL34Uj5U6Ayf0QVoJh84X2STk/5igdpAYMWj2AeZMhwU/12RJRUDaJX2bkXZ8ruXGk feAUN1MdUFZtRWYJ3ml6o53mmXY4gETqCb9r91oGszkPcGjrK+4fvy64DVsRA+RFhxJ+ kDaR+MQjDY2CtxN/IbXvHE0waffi7D+t77UEgV62wea0zc2Xgc7BPEL4qxKgayr/LkLv 7VngFWiM6lNUJEmu7N+akY9SND3y2a1uQl/pE6X3q0NRJmKkZAyFn+k0aQTr0AnB8tuH QGWg== Sender: swupdate@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCXQyNvKpeN0KptGpexMGkgwmpoQYUmzSbhq7FLyNWWvYlgv4Ov3jdxyImrw7d6Cs86oyYF3q/AI06xK/0mwiHKtiAYUFI4Kwkewmrc3Hg== X-Gm-Message-State: AOJu0Yx/f5SwUDog/Lo0ZaObzJ8PgYh0AqTTY4f6JuDQ4qj/uMofeMEy 3r8CZe2UoSfL0MH8of3J27zWhjs1fJFv48xmo+MdwjmsnTFCjL2I X-Google-Smtp-Source: AGHT+IGEiwQlPl2J1AK1giDCcQuA8KgEpS9IWVerCnO29JO2VYlEfhCVuzjeLY7oTsIfX7iq+NmyFA== X-Received: by 2002:a05:600c:1592:b0:426:60d7:d299 with SMTP id 5b1f17b1804b1-426707cf5ecmr11924145e9.7.1720523733406; Tue, 09 Jul 2024 04:15:33 -0700 (PDT) X-BeenThere: swupdate@googlegroups.com Received: by 2002:a05:600c:4fd2:b0:426:73d7:f1f5 with SMTP id 5b1f17b1804b1-42673d7f4e8ls2783065e9.1.-pod-prod-07-eu; Tue, 09 Jul 2024 04:15:31 -0700 (PDT) X-Received: by 2002:a05:600c:3b8d:b0:426:6765:d6b0 with SMTP id 5b1f17b1804b1-426707db70emr15625445e9.15.1720523729095; Tue, 09 Jul 2024 04:15:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1720523729; cv=none; d=google.com; s=arc-20160816; b=XS88pcJkAttuOwBZ6G0/Ms/QQphib8BjcV4FDEqpqVXuaDe7aKyP+69zlHXqbrllXJ 0XSdvfMjljqVujCHckomLYJaNrHLzjLnTBCqpNduIGLsGACaqJx9y6ekLAv+gQ32w1Uv n/84wP+1LluiEqrzEKc9TwCNa0/ITqN+DJ1sV/UI+jgn/XEryyERrn4fFdGgFZRN8M9o FtUDBrhTfq/SfA2recE2RkLbG1HBe5oBaFyX8rAT9gStnIvKBQ2hhITRh38pQtRsAw1J Q46dfXwbJyKKHAIZNXysjOuy75y+wWJbwDePy2W/PpIqgqw35VAI2cJjWtJt//DWIXct sWiQ== 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=7vxyRfNzxa/4X/+u4mXNXUoGsGl+t5hsh0He5k350yE=; fh=zydHuzCQWrku2OPQyZfraJZFcOpEXLQ/YBcu3QNiBd0=; b=uFuSsXvc6xCjx5LdvCh7HNDxsXqSm4Eezw4oQM2crSeFXWxg6fFdrqx4gZbmeWjcAH mKVvDyKEh35yEpDQzKlYNjxi/TaKqEepQI1OmmypCy1On2N3JWdM9hR3X4iLsgkAOSN0 Xb5bxl0nlte/LliAbVpIs4G6Q87uVxo3f/pkj1/Tb1ZZ2ENeGmuLABOYCWekmP82KA6g IXHCciiVqfblCtutaLn7d4vtupcOec0QKr+3SSEk3Cox3UA2KqTQFfFJzOZtN7y+lEdW +ormSxqmod4hrcf37m8ciM+1lGU0dGqlBfCrnQU0dUkuMG3AVbykGA/rNAQyOemNdXT1 VIyw==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=nso4+0Hl; spf=pass (google.com: domain of m.glembo@gmail.com designates 2a00:1450:4864:20::630 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-x630.google.com (mail-ej1-x630.google.com. [2a00:1450:4864:20::630]) by gmr-mx.google.com with ESMTPS id 5b1f17b1804b1-426725584d2si424525e9.0.2024.07.09.04.15.29 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 09 Jul 2024 04:15:29 -0700 (PDT) Received-SPF: pass (google.com: domain of m.glembo@gmail.com designates 2a00:1450:4864:20::630 as permitted sender) client-ip=2a00:1450:4864:20::630; Received: by mail-ej1-x630.google.com with SMTP id a640c23a62f3a-a77c349bb81so438136566b.3 for ; Tue, 09 Jul 2024 04:15:29 -0700 (PDT) X-Received: by 2002:a17:907:3d88:b0:a77:ba92:b1d8 with SMTP id a640c23a62f3a-a780b512eb7mr182316066b.0.1720523728153; Tue, 09 Jul 2024 04:15:28 -0700 (PDT) Received: from PC-2635.irisgmbh.local (dslb-002-203-138-100.002.203.pools.vodafone-ip.de. [2.203.138.100]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a780a6bc8adsm70739166b.14.2024.07.09.04.15.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Jul 2024 04:15:27 -0700 (PDT) From: Michael Glembotzki To: swupdate@googlegroups.com Cc: Michael Glembotzki Subject: [swupdate] [V3][PATCH 19/21] mongoose: Use mg_file_read for cert/key Date: Tue, 9 Jul 2024 13:08:55 +0200 Message-ID: <20240709111440.8215-20-Michael.Glembotzki@iris-sensing.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240709111440.8215-1-Michael.Glembotzki@iris-sensing.com> References: <20240709111440.8215-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=nso4+0Hl; spf=pass (google.com: domain of m.glembo@gmail.com designates 2a00:1450:4864:20::630 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 2fed8bcd..b47b9f55 100644 --- a/mongoose/mongoose_interface.c +++ b/mongoose/mongoose_interface.c @@ -900,8 +900,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