From patchwork Sat Jun 15 19:11:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Glembotzki X-Patchwork-Id: 1948217 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=iJBFsGbh; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=IF63jsMv; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=googlegroups.com (client-ip=2a00:1450:4864:20::23e; helo=mail-lj1-x23e.google.com; envelope-from=swupdate+bncbdy5juxlviebbaotw6zqmgqev6kh5bq@googlegroups.com; receiver=patchwork.ozlabs.org) Received: from mail-lj1-x23e.google.com (mail-lj1-x23e.google.com [IPv6:2a00:1450:4864:20::23e]) (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 4W1mFf2Lsdz20fS for ; Sun, 16 Jun 2024 05:20:38 +1000 (AEST) Received: by mail-lj1-x23e.google.com with SMTP id 38308e7fff4ca-2ebec81af32sf1591871fa.1 for ; Sat, 15 Jun 2024 12:20:38 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1718479236; cv=pass; d=google.com; s=arc-20160816; b=FDA3WXntW7Ey52ZoSgRenmLd7BwKkLRihCDDMVGHy9j9kv+//pu7UhgbB0dPMRy2a8 38VIs1oors4+mfxMsAigGzVSG5PycazXX0RBkK22EyEOn0QZ8owzhJOjth2ATo1W1Jtw bhQ8tiHTRT9cKYVxiyY56Qng4l6XHHU8veXA9POWKcMz46GmilHF1CIFPkEURGMzr7nD ONL/dUIsXtmPqaj80ZSkqTV64/F2NyHb74ERTq4/dIGcAvMlFmJBMZCG6YqMPYGqmJld 0qIiaypquOrLDF1aUW0XkuzWBTpPP/pWTtAvvgq4GnLnqzqFMci7iKyqhQeP4XSOkfEQ MHpQ== 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=ZXJ6yKoPoUTh5U8iqrn+CFUH3HzjgqXHMnotdWrkHow=; fh=zsR26JtkIzvPHJWBELCSQbFUbjOOKjW6wQhI3a3lwpg=; b=t7WDGGmG2z6eOyv8cZyHHp2gHAASpiFa/OX3jAynEXYpjNju8yz1QEK+OjDGBSxflN 2nK67v/4A5gCWyFY8S1Gua7vl/atE/Er8lF4KNa1HdGwq7qCt8Q6wxlW8fhHKtsRgnYS M19pWaBQgupHXbt4HVAI450nNmrEtyHAa1Na0pkr5etfjveTevtn1CB80kvFTcYnhb8E RI39imh2K2vQQnd/GrjFZleTwlprnDmZN2vyCqdekLg4m8NmJNRv4UrOJ9NdmvgxPxh9 5VDMqDJ5R+Ti3PeA1a2F8yfoe3fiBljeNTWtICz7IvPI7tmDk4IkQVyJwZ84z5ejw3pS mnKw==; darn=patchwork.ozlabs.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=MvXj04wI; spf=pass (google.com: domain of m.glembo@gmail.com designates 2a00:1450:4864:20::635 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=1718479236; x=1719084036; 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=ZXJ6yKoPoUTh5U8iqrn+CFUH3HzjgqXHMnotdWrkHow=; b=iJBFsGbhk1lWbCOEaYYKnnYqIB8VXcMnEttj2GeTI4MgxVpqGiTP9pR0hyZ6ejkQEC G8WjFdV+5ZkjkmuBswwr9oxJrN2A8tjJGeGCtJrxCkJPVfQcOvMW5GCk4TRC/r8NYyOO vG/TK5JpL7p5PmhfWd+cMS8JV6mvCvLWYnZPIoVTCTEe2hEgVICrbxk1TYo85Y0//NDf NuwSVAjWAHTTJSQLBr1zTptugV7EvzdA+UYpaXdXWE6AhgVtSSeVSnXNNPbKILK0BY3A 0MZLg76QD7Y5/ozEs2Wu1Vu96N39QpEzX4LNJUXNm2XO580scVeqS6e+v6L89YI9U389 DR/w== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1718479236; x=1719084036; 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=ZXJ6yKoPoUTh5U8iqrn+CFUH3HzjgqXHMnotdWrkHow=; b=IF63jsMvbmTbcNizlelq7ZBXO5V9qdZ7aup3c3m3mabSxSH5F40vvc7lAxOQQTnsjx NzwERX7TVGNJ8oP0gWTsgoMJN1xdODZy3Uk/vajo8gIsq05M7/i8qpX9Yz27h5aLioy/ LC+3pQoa7eq2LP93iW9YIDmuKoF2Cpwdf3AN5JWidPMkHlroImu0nnUwIqwJjc6Jbqb+ fMF5KxkpKZVLd6ghNUmDmjY35DEmLAfBLk0/jXt1tNv9Ra8AbJEIOlWSKAiTuF0D5v/r lyCCI4cgZGjpVOnXyPSNJfpoKMfWFQTjxWadIl6ANrrlRCY0meaOrEI7eT9e6k3QxcRB GHww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718479236; x=1719084036; 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=ZXJ6yKoPoUTh5U8iqrn+CFUH3HzjgqXHMnotdWrkHow=; b=vltg2olGQtpkBLm6azHw90Sy+2DudRW3aHZqTLYMU4kRARUsBMltdCX7GqcwsM+6x0 L8w+k4JfIivurUQR2/PA6a09waB5qWI4I0muFlOifu0pCW1NBmwbiScjgqVqw03w8z/d P+tbtzIHCMZze8Wuhgt0fUui275l+Bv+YNInRnrHSZd6WgxNQVR3T4gzkSHHaAcXPIi0 6v8GcugYd3RytbNY/GgKRwsfsJuGFCP4Hgysmh/7n8zFsnGlQuQTO240ceDiQL2kmF+G Ma7mlYh/5jfo/H4bK/d7EmZ+huXEP//GtcmcpdQ2UzZk9lf5venso+sARCDeHeVmmZUq S13w== Sender: swupdate@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCUnL6J8cFJZIO1PQ/qARReRrNCogrWBWlJRIPecQlAxfnab+kebhfu+47pJx6XmwQpdxOMVizrsa4GwpNJFA+hOITU9xUykpkD/LYpI0w== X-Gm-Message-State: AOJu0YyWgs4o8lXcQ2jSwy8jKCKcZoFhYFTFtISr9JOdc5Q8fKXrdjCk tgMzqjfSSB0pmLci33iaxfgqfndeahByH4PnbabpgMe9nddHHc+2 X-Google-Smtp-Source: AGHT+IH6dT3uzwnlwjFqi6sn9q3Wzz6uyJG0y0IBP8bqSAXk5YcV0SnflBRDeg2b5dGSUqRp0aXuzQ== X-Received: by 2002:a05:651c:154a:b0:2ec:143e:2893 with SMTP id 38308e7fff4ca-2ec143e2926mr34081641fa.2.1718479234456; Sat, 15 Jun 2024 12:20:34 -0700 (PDT) X-BeenThere: swupdate@googlegroups.com Received: by 2002:a2e:a309:0:b0:2eb:d7dc:e4 with SMTP id 38308e7fff4ca-2ec0287fe60ls20753661fa.0.-pod-prod-08-eu; Sat, 15 Jun 2024 12:20:31 -0700 (PDT) X-Received: by 2002:a2e:91d4:0:b0:2ec:29b4:ceea with SMTP id 38308e7fff4ca-2ec29b4cfa1mr588001fa.1.1718479231516; Sat, 15 Jun 2024 12:20:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1718479231; cv=none; d=google.com; s=arc-20160816; b=Np2m+FM5q1uq/phutLgF7o0bFDMqAbB0PsJTz2Qi7ZXCcfI4lYh31Xy+43Sx5HvFYl it4u8zZm9BZcBYHh18F4MB2u5eF+msq3hrcy97Yr7DfHyUGJICO7t7d+fMQfTujVkQ0o kOVNoIfw+gyvqVfZ4wOg0lWyHQnw7acbhaBNV8iUJ4Rvt1hd7X+9CdD8/jXEZqh5nQBx rbSXFrtGAETn6Tg1dJqDOFfQOam2ZeLEcme3UUogpepStDVenIrJVSd2KPUBa0Mm7aJp O8wtVsKbbX4kQiTy5M7aij1Qwwoxexf36X6xgxs2wvYNc0z7GeiEFdvWNy5Hdau3lW+Z Yjbg== 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=OQVxAJOiyqQ5wMr8JSanPKJwnxr+MRoQVN5sBv4ucjb5SmBnGXaAeAoNq8BliAhqMe sfNh6pZxLXZCXmctgV9dBk/iMrqRcucyHebN80SBBVjw606H47l8DJOdZFS77FL3EdDb KQ/QNXxMyKC2xMwSbxUaEz138/N8pznWV/ImiGedImpdsvqJ7DKibPQozrd4QGFhpR9d gmF77/UtutUVKyCuEPzhjAd5ouCU6SgcZThkhaDxU7TUa/2+FcDwWTxk1fd2K1eYPEWb qtzIecKXSO0vqfZdUGYfX/gYPGnwA+gu6ZFZTMvugsHchYcESSPRh6Y7KGvRFMavu2Sv KuUA==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=MvXj04wI; spf=pass (google.com: domain of m.glembo@gmail.com designates 2a00:1450:4864:20::635 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-x635.google.com (mail-ej1-x635.google.com. [2a00:1450:4864:20::635]) by gmr-mx.google.com with ESMTPS id 38308e7fff4ca-2ec05c27b5csi1340071fa.1.2024.06.15.12.20.31 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 15 Jun 2024 12:20:31 -0700 (PDT) Received-SPF: pass (google.com: domain of m.glembo@gmail.com designates 2a00:1450:4864:20::635 as permitted sender) client-ip=2a00:1450:4864:20::635; Received: by mail-ej1-x635.google.com with SMTP id a640c23a62f3a-a6f1da33826so464981766b.0 for ; Sat, 15 Jun 2024 12:20:31 -0700 (PDT) X-Received: by 2002:a17:906:354b:b0:a6f:4804:d41a with SMTP id a640c23a62f3a-a6f60dc4f05mr553332366b.55.1718479230600; Sat, 15 Jun 2024 12:20:30 -0700 (PDT) Received: from PC-2635.irisgmbh.local ([2a02:8108:96c0:76fc::80bb]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a6f56db61e0sm327283766b.49.2024.06.15.12.20.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 15 Jun 2024 12:20:30 -0700 (PDT) From: Michael Glembotzki To: swupdate@googlegroups.com Cc: Michael Glembotzki Subject: [swupdate] [PATCH 19/21] mongoose: Use mg_file_read for cert/key Date: Sat, 15 Jun 2024 21:11:32 +0200 Message-ID: <20240615191941.40301-20-Michael.Glembotzki@iris-sensing.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240615191941.40301-1-Michael.Glembotzki@iris-sensing.com> References: <20240615191941.40301-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=MvXj04wI; spf=pass (google.com: domain of m.glembo@gmail.com designates 2a00:1450:4864:20::635 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