From patchwork Sat Jun 15 19:11:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Glembotzki X-Patchwork-Id: 1948211 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=D/Jupu/I; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=YQ1Wnj7b; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=googlegroups.com (client-ip=2a00:1450:4864:20::537; helo=mail-ed1-x537.google.com; envelope-from=swupdate+bncbdy5juxlviebb7wsw6zqmgqe6qw6yqa@googlegroups.com; receiver=patchwork.ozlabs.org) Received: from mail-ed1-x537.google.com (mail-ed1-x537.google.com [IPv6:2a00:1450:4864:20::537]) (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 4W1mFZ6C7Mz20Pb for ; Sun, 16 Jun 2024 05:20:34 +1000 (AEST) Received: by mail-ed1-x537.google.com with SMTP id 4fb4d7f45d1cf-57a460247f3sf1905011a12.3 for ; Sat, 15 Jun 2024 12:20:34 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1718479232; cv=pass; d=google.com; s=arc-20160816; b=UosdWAT1/T9kPQF922Db4Js6hn1TbMXhZ5i+7yYKG+8drP7AbRWF9c4vADX1I7Esq1 rY+kJCttCjV60cXUFCfG1YAa1eYAtLQ6JdWDxbgMiGX3xo/9g8Qhra7DLowJulErJPzb /kWsbEXSxaEuWSyndS0AiPOpVpGtiqxmF/44vlfbBaVOD8n/0QXjCP95GHLBdRa430DE VVeXuT0NVBamHw2Cu1eeugdyGfhkv8YfUswz3SCacXO7ssvDd7jdp/XOgxFxog4EFqI4 1ozRJFIAdt1nwEzy6mPdbm59rVc2CUq/SnI28N+LA7sBzMUTwHVX8kT8M9rROhJDC5fY Ngcg== 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=X8jDADxhnXraBCkPgTWHcyYNdsmTj9y571povC9X4mE=; fh=Be9aZ8udEJj0yoDfOoouQmfhfgoUyK/sJ5OQ6RC6CpE=; b=nAXw2YKwCVOFtcbCMQBeGIDF7R0WNs5LfEZckrLKr4JdKoHr+8K1v3tWkezi4o9a+I dekFRn1n5+bUkRsXCUevP29KVpsPfh2hBYcOaLDuiSXx43wX1RRmiZwnfxuip1Rg8Qnn OwFx1YDzaAAuEivRgv7VQ37Wi8x3kWGrG4Yfn3XF/D5/MgPk+udf5RwwSk9SXZoawd9a mYZmXsYhXUQ1fqerkI1osrBaB9qXMQOLmMdhKrgQRc74f6g5HmItiTn1NKdvlZGosSDM o5jalLu/W5dzYL+vLpBPvXvjoOJkZrZ2DaN9/p4mbwCsbmkKZbg4KM6F2xJxWkArifqo 3eTA==; darn=patchwork.ozlabs.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b="DHr/6+6l"; spf=pass (google.com: domain of m.glembo@gmail.com designates 2a00:1450:4864:20::62a 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=1718479232; x=1719084032; 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=X8jDADxhnXraBCkPgTWHcyYNdsmTj9y571povC9X4mE=; b=D/Jupu/IDOOs6gRQXAe9n4WXXAJG7wF7JwPdjcolxZVXQ4ILsLL0vYbrIzawf1RztC IbHrJuNW0zbEgIQcsYVddhLfBDWm/fPzeJJN+TbHVK3gbqbqIUR1onOWU7JNwhKPMXU+ QQAZPbj04rBJdRK1eNnUtNtVfwAJa8ixvemUTqZ5M/VK5WZuyhqO+SOQXrTtnGyPigmS gXazZI90M7TA5iDdpqrznZFXgCuiH+cYpUCZ61IGFFI6d6qHBoGoDs8IhpR1bcFPXW31 SuwlpTPBIt18ViADC3VsIv4Kp4haUvF+a8KoRugPBxLemHhsBGTL+lJRb/VmXebmknEf DG0g== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1718479232; x=1719084032; 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=X8jDADxhnXraBCkPgTWHcyYNdsmTj9y571povC9X4mE=; b=YQ1Wnj7bT72ULr0Cjxy6vROHPnAy/qXeZN6TQ3MQYiuXpNG50kbFaGr7hscsIxNE3l CzQX0e6LRNYS1vPjUeJ2UtpjokillKRietpeBVzVSpps4oKw7txZAFXyUL1ZY6WCRsqF sMkCbFHxaY5PILb/2+O3AdY8CKeYUxflferWPjdAxchIu58cGl0gpQ7UUd3DEa10b6re F/81oVPBRWFrakAQsFlQrDpNw0VDGNGjnZxkqDpHL+RmBNEvwgtjqYPGEGdj2dIhvD8W yZyKNulqfIpLRcVCnlXyO4bKYqQevwqU5af1vmsd5dyc1YJjq2BLCHE2l94TjyuTM/KA oYaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718479232; x=1719084032; 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=X8jDADxhnXraBCkPgTWHcyYNdsmTj9y571povC9X4mE=; b=cJypzEuE76ojjvRsQgxfg9reaCdSlb30/g9h0oCqZ8A7PxkmUNUV9omG7427kTqmup KueYq12HyACTmvruXupIQQEdZu2V738vVcsat51qUaox+NqeztNC6F6gT96pEIXiRrFO ZYqQu0qAR8ma+aIsrUCFDsnqZTwn5EIocxsbcyoVnh/Wo3PY4DhEEc6xJZuE1njVC04I C1LDtISDT4pIgtYUzNE5Usx2z4VigTfSFgBcdu5Ttr0riW5O6R8O56KDRoMEGOYxEsuD yUszuOkBzrOcS+KjWyjdXHCHV5KkhD39HfZ17zTJ1T8QcnP58oIbxoHaBqq7Kk0QrpTP EKDg== Sender: swupdate@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCVTvyREhg2P5d/q7vaHZmuj6F+9Eyw3BGf3dDwJ2rA6I9CTcytkL7a86M5wop0PKLvfpfg6BiXxRlpYnpoAt1D2SrKnbkQrrqehI2muMQ== X-Gm-Message-State: AOJu0YxlOajDFJTtLVT2HV/Mj/GWTfe8OKxfIVkTlbuimSwJbld/Wl1n JAExw4NfHpg5ZSMR7HO7+33C5VCxoFQnkZpO+WcpxUNz1uFQIlOx X-Google-Smtp-Source: AGHT+IE20ZH3fi5xAi31oQl1gILqyIryrfqWImLFtkZWbT567tz7PWCXItmgOQw39tUhHa2OlERSfw== X-Received: by 2002:a50:cd0e:0:b0:57c:6a02:31d with SMTP id 4fb4d7f45d1cf-57cbd8f2993mr3570907a12.33.1718479231246; Sat, 15 Jun 2024 12:20:31 -0700 (PDT) X-BeenThere: swupdate@googlegroups.com Received: by 2002:a05:6402:5106:b0:57c:b688:3d74 with SMTP id 4fb4d7f45d1cf-57cb6884529ls117852a12.0.-pod-prod-06-eu; Sat, 15 Jun 2024 12:20:28 -0700 (PDT) X-Received: by 2002:a50:c346:0:b0:578:f472:d9d5 with SMTP id 4fb4d7f45d1cf-57cbd906889mr3660210a12.37.1718479228273; Sat, 15 Jun 2024 12:20:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1718479228; cv=none; d=google.com; s=arc-20160816; b=ZL5nviHTqt/CpVYiXpY/C+doNcC5glNoxDFPjGYyXnqf+1ZlDTny78DmYh1q9VHLb+ 9XNTUauNdC9cIsgpzIeg8gUf9IGWBPYeAq/AgGUGbxcrnP0RtETO0Eha9rAoHgTyfdve WAvQDlyJoES8phi7FPwd0Y0OckfYSErlpnA+AF6Yb/ZwOLewvGeG/Pbmwkwp9MR+4asa kD96l6atCE6ZrkWCh1YGSkVM7Sx795sBwu4URbf2Ndu2gne11KW6I1JpD3nulD5E7NRA 6KUCNAggDIGptTdUYDT1BTsTSOqigmULZeDjPMsDxM9ZZQbywQ2VzutKujlntSCJtTDo /z/g== 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=p55tFtTtRKqVtDFqAeBNGklmUNX40EgBjah2a0FA340=; fh=zydHuzCQWrku2OPQyZfraJZFcOpEXLQ/YBcu3QNiBd0=; b=iZQlZ67ZX1JhxT8zA6/7PYBwk5PGpXm/GwOEgC+tnJm7FSnKjZlshbW7UvZDo8OjCs Oa49rCNIBYy/tnalGvwgcyhCXEAQGmc2vMUrID2xSaxnKTBYwuRXcnXZhc6jYVP0Bumk N+Dh39F8AaCiPrclnIjCqUxFqZHCptCLbbRG778xDMOYcIu9v+SMtgxLhuK+6R9TiAJZ tOevlKoeHBwov6z0lngMCgl04jIxNvboDji7J8+lsZrUpsZR8oBMlDzOMjx3UrJsu1R7 tFdRSDrnBAcJG3RNUGPmWANpTfF8AWgToMn9mlBNsw065Q+BhNI/OyPCd+6mJtr3SO3K 2tmA==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b="DHr/6+6l"; spf=pass (google.com: domain of m.glembo@gmail.com designates 2a00:1450:4864:20::62a 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-x62a.google.com (mail-ej1-x62a.google.com. [2a00:1450:4864:20::62a]) by gmr-mx.google.com with ESMTPS id 4fb4d7f45d1cf-57cb743880asi111232a12.3.2024.06.15.12.20.28 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 15 Jun 2024 12:20:28 -0700 (PDT) Received-SPF: pass (google.com: domain of m.glembo@gmail.com designates 2a00:1450:4864:20::62a as permitted sender) client-ip=2a00:1450:4864:20::62a; Received: by mail-ej1-x62a.google.com with SMTP id a640c23a62f3a-a6f177b78dcso423872666b.1 for ; Sat, 15 Jun 2024 12:20:28 -0700 (PDT) X-Received: by 2002:a17:906:6889:b0:a6f:1b3a:8898 with SMTP id a640c23a62f3a-a6f60cee45emr414363466b.2.1718479227489; Sat, 15 Jun 2024 12:20:27 -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.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 15 Jun 2024 12:20:26 -0700 (PDT) From: Michael Glembotzki To: swupdate@googlegroups.com Cc: Michael Glembotzki Subject: [swupdate] [PATCH 15/21] mongoose: Makefile: Rename MG_ENABLE_SSL with MG_TLS Date: Sat, 15 Jun 2024 21:11:28 +0200 Message-ID: <20240615191941.40301-16-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="DHr/6+6l"; spf=pass (google.com: domain of m.glembo@gmail.com designates 2a00:1450:4864:20::62a 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: , Change was done with 7.0 Signed-off-by: Michael Glembotzki --- mongoose/Makefile | 10 ++++++---- mongoose/mongoose_interface.c | 22 +++++++++++----------- 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/mongoose/Makefile b/mongoose/Makefile index fc9d0e08..4017c55a 100644 --- a/mongoose/Makefile +++ b/mongoose/Makefile @@ -15,13 +15,15 @@ ifneq ($(CONFIG_MONGOOSEIPV6),) KBUILD_CFLAGS += -DMG_ENABLE_IPV6=1 endif ifneq ($(CONFIG_MONGOOSESSL),) -KBUILD_CFLAGS += -DMG_ENABLE_SSL=1 +ifeq ($(CONFIG_SSL_IMPL_OPENSSL),y) +KBUILD_CFLAGS += -DMG_TLS=2 endif -ifeq ($(CONFIG_SSL_IMPL_OPENSSL)$(CONFIG_SSL_IMPL_WOLFSSL),y) -KBUILD_CFLAGS += -DMG_ENABLE_OPENSSL=1 +ifeq ($(CONFIG_SSL_IMPL_WOLFSSL),y) +KBUILD_CFLAGS += -DMG_TLS=5 endif ifeq ($(CONFIG_SSL_IMPL_MBEDTLS),y) -KBUILD_CFLAGS += -DMG_ENABLE_MBEDTLS=1 +KBUILD_CFLAGS += -DMG_TLS=1 +endif endif endif endif diff --git a/mongoose/mongoose_interface.c b/mongoose/mongoose_interface.c index 4f189cd3..2fed8bcd 100644 --- a/mongoose/mongoose_interface.c +++ b/mongoose/mongoose_interface.c @@ -35,8 +35,8 @@ #include "mongoose_multipart.h" #include "util.h" -#ifndef MG_ENABLE_SSL -#define MG_ENABLE_SSL 0 +#ifndef MG_TLS +#define MG_TLS 0 #endif #define MG_PORT "8080" @@ -48,7 +48,7 @@ struct mongoose_options { char *port; char *global_auth_file; char *auth_domain; -#if MG_ENABLE_SSL +#if MG_TLS char *ssl_cert; char *ssl_key; #endif @@ -69,7 +69,7 @@ static unsigned int watchdog_conn = 0; static struct mg_http_serve_opts s_http_server_opts; const char *global_auth_domain; const char *global_auth_file; -#if MG_ENABLE_SSL +#if MG_TLS static bool ssl; static struct mg_tls_opts tls_opts; #endif @@ -719,7 +719,7 @@ static void ev_handler(struct mg_connection *nc, int ev, void *ev_data) multipart_upload_handler(nc, ev, ev_data); if (nc->recv.len < MG_MAX_RECV_SIZE && ev == MG_EV_POLL) nc->is_full = false; -#if MG_ENABLE_SSL +#if MG_TLS } else if (ev == MG_EV_ACCEPT && ssl) { mg_tls_init(nc, &tls_opts); #endif @@ -747,7 +747,7 @@ static int mongoose_settings(void *elem, void __attribute__ ((__unused__)) *dat if (strlen(tmp)) { opts->port = strdup(tmp); } -#if MG_ENABLE_SSL +#if MG_TLS GET_FIELD_STRING_RESET(LIBCFG_PARSER, elem, "ssl_certificate", tmp); if (strlen(tmp)) { opts->ssl_cert = strdup(tmp); @@ -778,7 +778,7 @@ static int mongoose_settings(void *elem, void __attribute__ ((__unused__)) *dat static struct option long_options[] = { {"listing", no_argument, NULL, 'l'}, {"port", required_argument, NULL, 'p'}, -#if MG_ENABLE_SSL +#if MG_TLS {"ssl", no_argument, NULL, 's'}, {"ssl-cert", required_argument, NULL, 'C'}, {"ssl-key", required_argument, NULL, 'K'}, @@ -797,7 +797,7 @@ void mongoose_print_help(void) "\tmongoose arguments:\n" "\t -l, --listing : enable directory listing\n" "\t -p, --port : server port number (default: %s)\n" -#if MG_ENABLE_SSL +#if MG_TLS "\t -s, --ssl : enable ssl support\n" "\t -C, --ssl-cert : ssl certificate to present to clients\n" "\t -K, --ssl-key : key corresponding to the ssl certificate\n" @@ -818,7 +818,7 @@ int start_mongoose(const char *cfgfname, int argc, char *argv[]) char buf[50] = "\0"; int choice; -#if MG_ENABLE_SSL +#if MG_TLS ssl = false; #endif @@ -868,7 +868,7 @@ int start_mongoose(const char *cfgfname, int argc, char *argv[]) case 't': watchdog_conn = strtoul(optarg, NULL, 10); break; -#if MG_ENABLE_SSL +#if MG_TLS case 's': ssl = true; break; @@ -898,7 +898,7 @@ int start_mongoose(const char *cfgfname, int argc, char *argv[]) global_auth_file = opts.global_auth_file; global_auth_domain = opts.auth_domain; -#if MG_ENABLE_SSL +#if MG_TLS if (ssl) { tls_opts.cert = opts.ssl_cert; tls_opts.certkey = opts.ssl_key;