From patchwork Tue Jul 9 11:08:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Glembotzki X-Patchwork-Id: 1958333 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=lA1JSBe+; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=cWNctjz9; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=googlegroups.com (client-ip=2a00:1450:4864:20::53d; helo=mail-ed1-x53d.google.com; envelope-from=swupdate+bncbdy5juxlviebbt5xws2amgqe4q7gonq@googlegroups.com; receiver=patchwork.ozlabs.org) Received: from mail-ed1-x53d.google.com (mail-ed1-x53d.google.com [IPv6:2a00:1450:4864:20::53d]) (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 4WJJLp6kcVz1ySg for ; Tue, 9 Jul 2024 21:15:30 +1000 (AEST) Received: by mail-ed1-x53d.google.com with SMTP id 4fb4d7f45d1cf-57851ae6090sf4312239a12.3 for ; Tue, 09 Jul 2024 04:15:30 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1720523728; cv=pass; d=google.com; s=arc-20160816; b=qptN5vpARs/pzdiNmGw6YvZXl6cREg8305uLJvXvpZzgYYRfcoMAyvjq5KfFp1z3Ri vK5K1tPS7sB0rXCMBJQjflPCrrjZK54yiMhvt8PH3ROGtrjBSC5UynsvfOLzTWMYE9Dq McHWqvnNCz3qT9WytjIU91l0vvCkVulAV/agWUqvoH6QIBZuW6DGhmj4NQli1FNSOiWC EVNmqwDZIp6mJxjHWYiiIEcJhefFSWchTNIPpII+iNRPMLqOEBz/HnwkldBp8obNP2+V /6j2oxAM7gkZoQseqeq5YZhPvcM+ZqFUGLI9BJ8FpdQVd1wIbbYGV8GzN/hK0NnxksSt gZFA== 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=9iZqyuwzVaNDEcIqfw2ucLnCSq7/DXSgtb41NflIT6Q=; fh=fXEZmu+CaOFjwxZBLZy7KhRIgeWOFkMvxinoEPt2J2w=; b=JZ1xbaV9IttS7HkeC9YiTaSFnz4aPg8xJLAG5IUVdpZUA5hVHaG6KNxft6der8v5ld 639qRXX0QaTmz2Mt4x3zh/y4x3kKFxzcMHaXxFWR0oOzgd+bk27xP4oj0huQi5oeMPkP /g2JUJK/H9w4ZkqgE426tuxKA8FRGepSkPuAqpu6n8QG/rCRl3/cw+1GmYZIgNlqHMPR 0DcxwH33IyjuVIEWXCrUcUjT9wJF2FiCEi+GTd/zxUO6ucjJE4CkBnqL7fmNLjsblJih XDxvR0udl2LaziywB+Ewp1QH17nhzvga4IB9NdKgEkjfSwdMhjWcpLOynNc1MLAd+BkV lfEg==; darn=patchwork.ozlabs.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=VyZRjbKy; spf=pass (google.com: domain of m.glembo@gmail.com designates 2a00:1450:4864:20::52e 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=1720523728; x=1721128528; 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=9iZqyuwzVaNDEcIqfw2ucLnCSq7/DXSgtb41NflIT6Q=; b=lA1JSBe+OltsZopcMu0Hy8SqgJFQXaql+4DC9dG9QNXfoLBXJ94WXTQACmW9KVK3Zc ISuTrrv19VNmCNC3k8BnnU7gchZJ5IDMtFPGqejOXcPhw+weWfCRo3t0W/wmVjEdfCuq GEbcoSn4+mc6t2wxobB91NoHsGRWP5fh2FtiwbW/okylP8ryVrIChcGzW6H3gYRt2Y8H R8k/bYDnLtwZSvjfHcE7QevUmUXKyrd5Hl3WKrSk3ZRh3pFxenFv8oMDQ8vHjmu3hcbv wxFkNr+/LrLpVqEQk+l69tIEWOg6m4stRhZA5Kq4sKntXJBFoRtA12Fa9ZrmOKkEEv2n Fe7Q== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1720523728; x=1721128528; 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=9iZqyuwzVaNDEcIqfw2ucLnCSq7/DXSgtb41NflIT6Q=; b=cWNctjz9heHkvRkWcW75wleZPY5IaOqN8RrJOgRD4ImoGUweHKTjFNRlAqhkWnXBr0 laI0t14pWsFNGlOdx3jlntDWu873B+SrgEZzlWAlhQQez1bxu7zyW2oRKvuA8yBYG88W DA14QOf61tD41D++ZRVnrv3pA0ZJc0jSeLN5eNINmTnWCuloxj2ZiH6vey+Efumq1aau ozxJx7JQXZv4rISTwooiMaBix0xusDsgga2XDuF9KKue1oVHqfnPE8821t3Mu7MYvO0m svcEWEvDvR2RsGW+7lm0JKEXJIV5Xk+ZjnmR724wx0oBW8jRfAfdddfM3u591xBZGmYv wHmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720523728; x=1721128528; 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=9iZqyuwzVaNDEcIqfw2ucLnCSq7/DXSgtb41NflIT6Q=; b=q+Rav9t5FBR2htDaQu0blPheHJOWpRkxZxgyRzQHc9v79jtuIHz7bIsA+S1x4WO8No Qi35K73gFQsH5s0DYVZV2ERflYBjV3K/La6qAuqguOmGN02Oltg0Zj6/kARFi4OBIUrV M6Wd7y6cKY/GAd/84XOQJyr5++KktlWtwgryfgfZyxOQIBFvxoIALbkyNlrfue9EgTLK FdT0bqpTIIJEKvd+w0siVysCWyCzFyQb+qrzgQvDR/QmaBO11zurstmZ17oWxPUAxsuQ viJuwobNbjHU1IJuib6j/yCRvrE9r+Q0bfLPqhkdtzllAJ2QlTztS9hAfHs65yjCLP+v N9Kg== Sender: swupdate@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCVDphC9Uqp6UAF3VCDndPIp6bHKxqAW1AchTamesyQsJyeF+IPhlo8Z2bWVSbJ9qmIJVzGkNkN5UpEYyWlykpZirgDrhdBsxGxw3TFokQ== X-Gm-Message-State: AOJu0Yy4JwdsJuUNyu+Q+8WgprBG+EeQZklr1pDwS/3hCPEPM3dfGdZg rC8yZZSFLIVlxehYOU7sOa3WK21LGvsQ5thbIOXn6IPZKiu89bUc X-Google-Smtp-Source: AGHT+IHl3LKewYyCCxTsYR1VsBsx54CoA2UUCliOVflgmfU+8NVaEXi40zr6jwwmkNRNQ6kYAT7qQw== X-Received: by 2002:a05:6402:354b:b0:57d:5c96:72aa with SMTP id 4fb4d7f45d1cf-594b6ee2ecdmr1942895a12.0.1720523727963; Tue, 09 Jul 2024 04:15:27 -0700 (PDT) X-BeenThere: swupdate@googlegroups.com Received: by 2002:aa7:cd6a:0:b0:58f:749f:1c6c with SMTP id 4fb4d7f45d1cf-58f74ae6031ls1815875a12.1.-pod-prod-01-eu; Tue, 09 Jul 2024 04:15:25 -0700 (PDT) X-Received: by 2002:a17:906:35ce:b0:a77:c6c4:2baa with SMTP id a640c23a62f3a-a780b6b1f63mr127122466b.21.1720523725130; Tue, 09 Jul 2024 04:15:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1720523725; cv=none; d=google.com; s=arc-20160816; b=wRV6B+bDtnFQgiV3mNyK1na9mF1nV9gxO9YiQAHXgWabiKF2tmLFKYZcDY+teqLTKE XOp913oI3Wq44tFXcE7fbJ8c0nFyRkm7PxFKItiRQv+rSVlomIZAk40E6oJdUOvCgQW5 B2cQupTdJsKJp2+HSpezeBH35WCCKLPej+feOwEfsgDstLzr13vvQ/YCL5nVPssZ6Fs/ dJtHFocI5hHRCeuK7/Q1kM9IgTBbwcRV+2oKmHX/dn+v9J6fauzeB4eXtGCw71ODBG2h fbdGzGqGgfK4CS7HkQxenq5+ERHtPEOMuXl9hLwGSyt4LZZ1qnlFRGqgkDDW0C62gsym jahQ== 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=0weX0x6CEChWfVGVSB91K7RH6CiUJmRHMO69AFWU+rx7PAzcihHjKfYLOtR+M7+B0J 5+UPKhhfbsmDSElmOfhlyzy0p8w9YIuZgKCRT3x5A2PDn9rA3AaSJeLtq5eBRkJXGES6 1yx8VmVDivsOsiPXaunGwBblpcLbapxWox6oYWWGgHYuIA3EUvKMUu6YFTCKDMGBERG+ EhkTk/UeV6EN9AXMwsez18xrRnCGosOVahgWAxZi1W9aMlLr9GqqmSCR7aqhRoRwNWqY RDqheBeKRte1G4I/l6z5lQ2Sr3Bgy9rAP4nR8A6LEsYB5C8fsp5cd5Q7IbdupwGs7229 bKQw==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=VyZRjbKy; spf=pass (google.com: domain of m.glembo@gmail.com designates 2a00:1450:4864:20::52e as permitted sender) smtp.mailfrom=m.glembo@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from mail-ed1-x52e.google.com (mail-ed1-x52e.google.com. [2a00:1450:4864:20::52e]) by gmr-mx.google.com with ESMTPS id a640c23a62f3a-a780a7f7fbesi4144666b.2.2024.07.09.04.15.25 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 09 Jul 2024 04:15:25 -0700 (PDT) Received-SPF: pass (google.com: domain of m.glembo@gmail.com designates 2a00:1450:4864:20::52e as permitted sender) client-ip=2a00:1450:4864:20::52e; Received: by mail-ed1-x52e.google.com with SMTP id 4fb4d7f45d1cf-58b447c513aso5918807a12.2 for ; Tue, 09 Jul 2024 04:15:25 -0700 (PDT) X-Received: by 2002:a17:906:27da:b0:a77:cc47:a693 with SMTP id a640c23a62f3a-a780b89ed15mr135286366b.63.1720523724401; Tue, 09 Jul 2024 04:15:24 -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.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Jul 2024 04:15:24 -0700 (PDT) From: Michael Glembotzki To: swupdate@googlegroups.com Cc: Michael Glembotzki Subject: [swupdate] [V3][PATCH 15/21] mongoose: Makefile: Rename MG_ENABLE_SSL with MG_TLS Date: Tue, 9 Jul 2024 13:08:51 +0200 Message-ID: <20240709111440.8215-16-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=VyZRjbKy; spf=pass (google.com: domain of m.glembo@gmail.com designates 2a00:1450:4864:20::52e 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;