From patchwork Fri Feb 23 06:18:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= X-Patchwork-Id: 1903098 X-Patchwork-Delegate: zajec5@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:3::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=patchwork.ozlabs.org) Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) (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 4Th0N16Xj2z23d2 for ; Fri, 23 Feb 2024 17:24:13 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=8xZfVCTys5tSDJGtJfnZhvKpsfvjD58EY40PIdjoZkQ=; b=CQdnB3MIwNbG9u ctYFuQKo0iE4uia67kU7FUrrhtOyQq6EerdESplWEtIF98EbI51H8fORRBPRfdVpqgIF2e2u7gvbW dGWutXyMqpifTxXoF7olo6L0CynePeJVQwSIKicrYc8AYB9QzL7bzDLZeTzWSxToEU/UPUCTpK+/3 LLvCN8sbB9T8M+VrLJ2iWXPJpoDLN1lZ+4MHQF9WP03RxP/c8wpZ9u6oYfb1gJUcX516wj0bwt64G UnHWJlyWuOdvS9dEuf4GOgSiwJs0I/KkyhCTCbHhr3e6hVh6Anpo0cfS0Um2b6G+SIzbHkD+dJ8Nw cuVGbVzMZh+++O+sbe0g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rdOuP-000000087Lq-3ATM; Fri, 23 Feb 2024 06:19:45 +0000 Received: from mail-ej1-x62e.google.com ([2a00:1450:4864:20::62e]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rdOta-000000087G1-0DR6 for openwrt-devel@lists.openwrt.org; Fri, 23 Feb 2024 06:18:58 +0000 Received: by mail-ej1-x62e.google.com with SMTP id a640c23a62f3a-a3f5808b0dfso59278666b.1 for ; Thu, 22 Feb 2024 22:18:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708669129; x=1709273929; darn=lists.openwrt.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=/hajE1mYaVttzUPqwLP4pp5Qs5efTexrstUWZelaho8=; b=Em90PrIhbd51qEJ7Cp9W39BILX53F9uxZvtxXzxSHR7KRoScISeVEPMB/GgG7sF3wZ soZH1u3VoludhEKus/GO8+Vg2McyY7Ut3Q9+gvgLXgtERauMvq7kUXi3j5x6W5EXUS86 j6pFP3mt5hAkwAD3KTbsqXYUj0Z65FdCJwaPGCTfkEVWWmnqvDg79PJ8zmTVgwPg68Jp 51PYO8qnPxOMn6TePULCL769+5UdYKGEc+cF2vYmFQmh+V2+mLbFfcSWqU7K6zO03vpt a/PVmFdyB+m0aDPjgTtpl+LSCz+Olx4w/Qz+gnCBywDv9sKs4aZqFrvUPjiG76b+hq7q WWfw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708669129; x=1709273929; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/hajE1mYaVttzUPqwLP4pp5Qs5efTexrstUWZelaho8=; b=OzPdhnQbWC4KdctiCEkvkk0arGb5XgyoUFATtdZ+snbFdzBimC2Vd30nVaxCk23W7I Q+d06NUMVqnh6eHXoTRFWZH8mAPOpxyHFOPlKqhuvhRptjPTE8atP1eEiGyWVKvFWooz u9+CehkkeCBOKz1hJsh57CkUnxc8XUnVkZVB0fPRvyi1anhQx6eToI82EjWNKYwOdbFY k/Je2Jzwgg10t1rqVu19hPqlVvdGyrlYXwfNe1FR/myisoOSgC/aFLDGfQEvNgDx60ah lHtDhVjemTy927edjKHd+5FDQ1sikd9xELP11+fjTYkwP9ajDc/Y4UELCq/ipw7JBUx9 3IDA== X-Gm-Message-State: AOJu0YyCc+u6Mms/Asf4yAj9OLT3PJBr5107+LGKQryYp4PWeu91i+cY xonvVyjXbgZzYpnK6pxTua+NX5/Hxqq5EvvzE35DcFx8FO1DTVXyuwQweZdg X-Google-Smtp-Source: AGHT+IGFjJZlYIGInrdnHqDe54Tc/bwtYkXvQjGcmUCQOF7KoqYko3CBVkwFgb5yNQkImwLy3A4cJA== X-Received: by 2002:a17:906:d8d1:b0:a3e:526c:3516 with SMTP id re17-20020a170906d8d100b00a3e526c3516mr486262ejb.77.1708669129331; Thu, 22 Feb 2024 22:18:49 -0800 (PST) Received: from localhost.lan (031011218106.poznan.vectranet.pl. [31.11.218.106]) by smtp.gmail.com with ESMTPSA id gs8-20020a1709072d0800b00a3dab486a19sm6522201ejc.118.2024.02.22.22.18.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Feb 2024 22:18:49 -0800 (PST) From: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= To: openwrt-devel@lists.openwrt.org Cc: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= Subject: [PATCH firmware-utils 4/4] pc1crypt: make decrypt/encrypt functions take void * as argument Date: Fri, 23 Feb 2024 07:18:39 +0100 Message-Id: <20240223061839.21956-4-zajec5@gmail.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20240223061839.21956-1-zajec5@gmail.com> References: <20240223061839.21956-1-zajec5@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240222_221854_453436_BFFD5C8D X-CRM114-Status: GOOD ( 10.89 ) X-Spam-Score: 0.0 (/) X-Spam-Report: =?unknown-8bit?q?Spam_detection_software=2C_running_on_the_sy?= =?unknown-8bit?q?stem_=22bombadil=2Einfradead=2Eorg=22=2C?= =?unknown-8bit?q?_has_NOT_identified_this_incoming_email_as_spam=2E__The_ori?= =?unknown-8bit?q?ginal?= =?unknown-8bit?q?_message_has_been_attached_to_this_so_you_can_view_it_or_la?= =?unknown-8bit?q?bel?= =?unknown-8bit?q?_similar_future_email=2E__If_you_have_any_questions=2C_see?= =?unknown-8bit?q?_the_administrator_of_that_system_for_details=2E?= =?unknown-8bit?q?_?= =?unknown-8bit?q?_Content_preview=3A__From=3A_Rafa=C5=82_Mi=C5=82ecki_Make_t?= =?unknown-8bit?q?hem_more_generic_regarding_accepted?= =?unknown-8bit?q?_data_buffers=2E_This_fixes=3A_?= =?unknown-8bit?q?_?= =?unknown-8bit?q?_Content_analysis_details=3A___=280=2E0_points=2C_5=2E0_req?= =?unknown-8bit?q?uired=29?= =?unknown-8bit?q?_?= =?unknown-8bit?q?_pts_rule_name______________description?= =?unknown-8bit?q?_----_----------------------_------------------------------?= =?unknown-8bit?q?--------------------?= =?unknown-8bit?q?_0=2E0_SPF=5FHELO=5FNONE__________SPF=3A_HELO_does_not_publ?= =?unknown-8bit?q?ish_an_SPF_Record?= =?unknown-8bit?q?_-0=2E0_SPF=5FPASS_______________SPF=3A_sender_matches_SPF_?= =?unknown-8bit?q?record?= =?unknown-8bit?q?_-0=2E1_DKIM=5FVALID=5FAU__________Message_has_a_valid_DKIM?= =?unknown-8bit?q?_or_DK_signature_from_author=27s?= =?unknown-8bit?q?_domain?= =?unknown-8bit?q?_-0=2E1_DKIM=5FVALID_____________Message_has_at_least_one_v?= =?unknown-8bit?q?alid_DKIM_or_DK_signature?= =?unknown-8bit?q?_0=2E1_DKIM=5FSIGNED____________Message_has_a_DKIM_or_DK_si?= =?unknown-8bit?q?gnature=2C_not_necessarily_valid?= =?unknown-8bit?q?_-0=2E1_DKIM=5FVALID=5FEF__________Message_has_a_valid_DKIM?= =?unknown-8bit?q?_or_DK_signature_from?= =?unknown-8bit?q?_envelope-from_domain?= =?unknown-8bit?q?_0=2E0_FREEMAIL=5FFROM__________Sender_email_is_commonly_ab?= =?unknown-8bit?q?used_enduser_mail_provider?= =?unknown-8bit?q?_=5Bzajec5=28at=29gmail=2Ecom=5D?= =?unknown-8bit?q?_0=2E2_FREEMAIL=5FENVFROM=5FEND=5FDIGIT_Envelope-from_freem?= =?unknown-8bit?q?ail_username_ends_in?= =?unknown-8bit?q?_digit?= =?unknown-8bit?q?_=5Bzajec5=28at=29gmail=2Ecom=5D?= =?unknown-8bit?q?_-0=2E0_RCVD=5FIN=5FDNSWL=5FNONE_____RBL=3A_Sender_listed_a?= =?unknown-8bit?q?t_https=3A//www=2Ednswl=2Eorg/=2C_no?= =?unknown-8bit?q?_trust?= =?unknown-8bit?b?IFsyYTAwOjE0NTA6NDg2NDoyMDowOjA6MDo2MmUgbGlzdGVkIGluXQ==?= =?unknown-8bit?b?IFtsaXN0LmRuc3dsLm9yZ10=?= =?unknown-8bit?q?_-0=2E0_T=5FSCC=5FBODY=5FTEXT=5FLINE___No_description_avail?= =?unknown-8bit?q?able=2E?= X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org From: Rafał Miłecki Make them more generic regarding accepted data buffers. This fixes: src/pc1crypt.c: In function ‘main’: src/pc1crypt.c:322:26: warning: pointer targets in passing argument 2 of ‘pc1_decrypt_buf’ differ in signedness [-Wpointer-sign] pc1_decrypt_buf(&pc1, buf, datalen); ^~~ src/pc1crypt.c:324:26: warning: pointer targets in passing argument 2 of ‘pc1_encrypt_buf’ differ in signedness [-Wpointer-sign] pc1_encrypt_buf(&pc1, buf, datalen); ^~~ Signed-off-by: Rafał Miłecki --- src/pc1crypt.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/pc1crypt.c b/src/pc1crypt.c index be1038b..458c234 100644 --- a/src/pc1crypt.c +++ b/src/pc1crypt.c @@ -167,18 +167,18 @@ static void pc1_init(struct pc1_ctx *pc1) strcpy(pc1->cle, "Remsaalps!123456"); } -static void pc1_decrypt_buf(struct pc1_ctx *pc1, unsigned char *buf, - unsigned len) +static void pc1_decrypt_buf(struct pc1_ctx *pc1, void *data, unsigned len) { + unsigned char *buf = data; unsigned i; for (i = 0; i < len; i++) buf[i] = pc1_decrypt(pc1, buf[i]); } -static void pc1_encrypt_buf(struct pc1_ctx *pc1, unsigned char *buf, - unsigned len) +static void pc1_encrypt_buf(struct pc1_ctx *pc1, void *data, unsigned len) { + unsigned char *buf = data; unsigned i; for (i = 0; i < len; i++)