From patchwork Fri Apr 8 15:10:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Peter_M=C3=BCller?= X-Patchwork-Id: 5469 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4KZhX26N6Qz3x1s for ; Fri, 8 Apr 2022 15:10:42 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4KZhX034Q9z3XN; Fri, 8 Apr 2022 15:10:40 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4KZhX02fvTz2ybk; Fri, 8 Apr 2022 15:10:40 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4KZhWz2pySz2xNS for ; Fri, 8 Apr 2022 15:10:39 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4KZhWy31Lkz1ly for ; Fri, 8 Apr 2022 15:10:38 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1649430638; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ktK4XcblHtUSwJekg6ptRkwLFL4N3A7IysDZVXKL+Ho=; b=xbSZn98UF5D/2T0nG5pP+GKL5j0rrMV3aoSDBDt3x3SZxxte7578+jrWOXHw9xiMxCXytL tNLYK5ettdLCNYDw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1649430638; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ktK4XcblHtUSwJekg6ptRkwLFL4N3A7IysDZVXKL+Ho=; b=EOUIcuAsx/WSijM49WddE73J2NW0F2wK2nOb+USiQcen4JZ6zGJ9P1lZlIX9xmwJvdmp9y vm3DgDOnGt+5Yh7MtfcduZyJ7f0Zpb8opAEBvZd6Aa+icIrTPXeDKgd4X0g44d9oQh9coc o/crNV7AJyWPvs/we1AND4w5OlD4Z0bV+jvrqR1Cy3ao1SFDCD5pQW0pGGSD2gSxlJjdQm jqllXaBblJ2vkWWNVt07ErP4IFRzv2EJzvIYcVrokY+iIFPlN2GVDgzBVEy2OOA8nWVFZi 3TK4qFX6VSfTJ0WiUgWfOOkXhWv+cInG2M9jtT/wR5pkB4CTjzF6PTILxyNM2Q== Message-ID: <9a3bc372-db7a-24c2-478c-6bc481864672@ipfire.org> Date: Fri, 8 Apr 2022 15:10:37 +0000 MIME-Version: 1.0 Content-Language: en-US To: "IPFire: Development" From: =?utf-8?q?Peter_M=C3=BCller?= Subject: [PATCH 1/3] downloadsource.sh: Change checksum algorithm to BLAKE2 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Reported-by: Arne Fitzenreiter Signed-off-by: Peter Müller --- src/installer/downloadsource.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/installer/downloadsource.sh b/src/installer/downloadsource.sh index c74f9e232..47086b2b7 100644 --- a/src/installer/downloadsource.sh +++ b/src/installer/downloadsource.sh @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2010 IPFire Team # +# Copyright (C) 2007-2022 IPFire Team # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -48,17 +48,17 @@ if ! download -O "${OUTPUT}" "${URL}"; then exit 1 fi -# Download went well. Checking for MD5 sum -if download -O "${OUTPUT}.md5" "${URL}.md5" &>/dev/null; then +# Download went well. Checking for BLAKE2 sum +if download -O "${OUTPUT}.b2" "${URL}.b2" &>/dev/null; then # Read downloaded checksum - read -r md5sum rest < "${OUTPUT}.md5" - rm -f "${OUTPUT}.md5" + read -r b2sum rest < "${OUTPUT}.b2" + rm -f "${OUTPUT}.b2" # Compute checkum of downloaded image file - read -r md5sum_image rest <<< "$(md5sum "${OUTPUT}")" + read -r b2sum_image rest <<< "$(b2sum "${OUTPUT}")" - if [ "${md5sum}" != "${md5sum_image}" ]; then - echo "MD5 sum mismatch: ${md5sum} != ${md5sum_image}" >&2 + if [ "${b2sum}" != "${b2sum_image}" ]; then + echo "BLAKE2 checksum mismatch: ${b2sum} != ${b2sum_image}" >&2 exit 2 fi fi From patchwork Fri Apr 8 15:10:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Peter_M=C3=BCller?= X-Patchwork-Id: 5470 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4KZhXL2wKnz3x1s for ; Fri, 8 Apr 2022 15:10:58 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4KZhXK3NKqz3XN; Fri, 8 Apr 2022 15:10:57 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4KZhXK3S0Jz2yNd; Fri, 8 Apr 2022 15:10:57 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4KZhXJ5hP5z2xNS for ; Fri, 8 Apr 2022 15:10:56 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4KZhXH6sGqz1ly for ; Fri, 8 Apr 2022 15:10:55 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1649430656; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=hMoTPSceS7MAD+zkv58fmTMaBeQkKZjw51jZ3x8bM3o=; b=6lhnHLBUZpSpQu4t7yOKbC/h/zb57VIx7nufee7AdYNyW/oIjyJBb4Ys4szmSvRMd0IQv5 p3jCkdtgUP4XjyDA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1649430656; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=hMoTPSceS7MAD+zkv58fmTMaBeQkKZjw51jZ3x8bM3o=; b=CAHd3otUUDvPeu94nhmA0KbkwYCM/SKTQqsTq6LHMfuvkrmT8TuhH3RiDCKJ/MgrjvjeKh cssBcXHtVoKYu7Kd8uunRdO6MgobkAyaQu5QQMn8Rk93s8UeFnCjnitx6tWjmsvLP9WQLQ oMr2XgLFZILaee88ieskZ7AbUN0XAKC9k7VKvhuJzpgWg4OztXvXiKIAJ+InrTOri6OJ6c 7FaoUj/VSQWcdPNFwWIbqjGDajDLGOUXNErWFw46m+B9Kjp1o+CA2Ph8NEAkR7sBope4nF vhq6EHqX6BC/c2Z9glQMRGlVjJF7w1M+6eD0+YfKQ8SnKJEyEwH9OszvHOiTcQ== Message-ID: <814ae2bf-c453-ce55-74eb-e2fb11b5900e@ipfire.org> Date: Fri, 8 Apr 2022 15:10:54 +0000 MIME-Version: 1.0 Subject: [PATCH 2/3] installer: Update translation message Content-Language: en-US To: development@lists.ipfire.org References: <9a3bc372-db7a-24c2-478c-6bc481864672@ipfire.org> From: =?utf-8?q?Peter_M=C3=BCller?= In-Reply-To: <9a3bc372-db7a-24c2-478c-6bc481864672@ipfire.org> X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Signed-off-by: Peter Müller --- src/installer/main.c | 2 +- src/installer/po/ar.po | 2 +- src/installer/po/ca.po | 2 +- src/installer/po/cs_CZ.po | 2 +- src/installer/po/da.po | 4 ++-- src/installer/po/de.po | 4 ++-- src/installer/po/el_GR.po | 2 +- src/installer/po/es.po | 4 ++-- src/installer/po/fa.po | 4 ++-- src/installer/po/fr.po | 4 ++-- src/installer/po/hr.po | 4 ++-- src/installer/po/hu.po | 4 ++-- src/installer/po/id.po | 2 +- src/installer/po/it.po | 4 ++-- src/installer/po/ja.po | 4 ++-- src/installer/po/jv.po | 2 +- src/installer/po/km_KH.po | 2 +- src/installer/po/nl.po | 4 ++-- src/installer/po/pl.po | 4 ++-- src/installer/po/pt.po | 2 +- src/installer/po/pt_BR.po | 4 ++-- src/installer/po/pt_PT.po | 2 +- src/installer/po/ro.po | 2 +- src/installer/po/ro_RO.po | 4 ++-- src/installer/po/ru.po | 4 ++-- src/installer/po/rw.po | 2 +- src/installer/po/sk.po | 2 +- src/installer/po/sq.po | 2 +- src/installer/po/sr.po | 2 +- src/installer/po/su.po | 2 +- src/installer/po/sv.po | 4 ++-- src/installer/po/th.po | 2 +- src/installer/po/tk.po | 2 +- src/installer/po/tr.po | 4 ++-- src/installer/po/uk.po | 2 +- src/installer/po/uz@Latn.po | 2 +- src/installer/po/vi.po | 2 +- src/installer/po/zh.po | 2 +- 38 files changed, 54 insertions(+), 54 deletions(-) diff --git a/src/installer/main.c b/src/installer/main.c index 06dd9caf5..51e69751a 100644 --- a/src/installer/main.c +++ b/src/installer/main.c @@ -539,7 +539,7 @@ int main(int argc, char *argv[]) { } else { char reason[STRING_SIZE] = "-"; if (rc == 2) - snprintf(reason, sizeof(STRING_SIZE), _("MD5 checksum mismatch")); + snprintf(reason, sizeof(STRING_SIZE), _("BLAKE2 checksum mismatch")); snprintf(message, sizeof(message), _("The installation image could not be downloaded.\n Reason: %s\n\n%s"), diff --git a/src/installer/po/ar.po b/src/installer/po/ar.po index 9c1bc249d..09064c578 100644 --- a/src/installer/po/ar.po +++ b/src/installer/po/ar.po @@ -107,7 +107,7 @@ msgstr "" #: main.c:510 #, c-format -msgid "MD5 checksum mismatch" +msgid "BLAKE2 checksum mismatch" msgstr "" #: main.c:513 diff --git a/src/installer/po/ca.po b/src/installer/po/ca.po index 923f1da6d..3e906f3f7 100644 --- a/src/installer/po/ca.po +++ b/src/installer/po/ca.po @@ -106,7 +106,7 @@ msgstr "" #: main.c:510 #, c-format -msgid "MD5 checksum mismatch" +msgid "BLAKE2 checksum mismatch" msgstr "" #: main.c:513 diff --git a/src/installer/po/cs_CZ.po b/src/installer/po/cs_CZ.po index f00b8fb47..099bd5f26 100644 --- a/src/installer/po/cs_CZ.po +++ b/src/installer/po/cs_CZ.po @@ -106,7 +106,7 @@ msgstr "" #: main.c:510 #, c-format -msgid "MD5 checksum mismatch" +msgid "BLAKE2 checksum mismatch" msgstr "" #: main.c:513 diff --git a/src/installer/po/da.po b/src/installer/po/da.po index 04e8c1e8b..29138fd7e 100644 --- a/src/installer/po/da.po +++ b/src/installer/po/da.po @@ -107,8 +107,8 @@ msgstr "Henter installationsbillede..." #: main.c:510 #, c-format -msgid "MD5 checksum mismatch" -msgstr "MD5 checksum mismatch" +msgid "BLAKE2 checksum mismatch" +msgstr "BLAKE2 checksum mismatch" #: main.c:513 #, c-format diff --git a/src/installer/po/de.po b/src/installer/po/de.po index 279982a5f..2f2a7856a 100644 --- a/src/installer/po/de.po +++ b/src/installer/po/de.po @@ -110,8 +110,8 @@ msgstr "Lade Installationsimage herunter..." #: main.c:510 #, c-format -msgid "MD5 checksum mismatch" -msgstr "MD5-Prüfsummen stimmen nicht überein" +msgid "BLAKE2 checksum mismatch" +msgstr "BLAKE2-Prüfsummen stimmen nicht überein" #: main.c:513 #, c-format diff --git a/src/installer/po/el_GR.po b/src/installer/po/el_GR.po index 831523053..ede86b2f6 100644 --- a/src/installer/po/el_GR.po +++ b/src/installer/po/el_GR.po @@ -106,7 +106,7 @@ msgstr "" #: main.c:510 #, c-format -msgid "MD5 checksum mismatch" +msgid "BLAKE2 checksum mismatch" msgstr "" #: main.c:513 diff --git a/src/installer/po/es.po b/src/installer/po/es.po index a3036c671..280a00f1a 100644 --- a/src/installer/po/es.po +++ b/src/installer/po/es.po @@ -108,8 +108,8 @@ msgstr "Descargando la imagen de instalación..." #: main.c:510 #, c-format -msgid "MD5 checksum mismatch" -msgstr "Discordancia suma de verificación MD5 " +msgid "BLAKE2 checksum mismatch" +msgstr "Discordancia suma de verificación BLAKE2" #: main.c:513 #, c-format diff --git a/src/installer/po/fa.po b/src/installer/po/fa.po index 5420f9ae7..1e96546f4 100644 --- a/src/installer/po/fa.po +++ b/src/installer/po/fa.po @@ -107,8 +107,8 @@ msgstr "در حال دانلود ایمیج برای برپا سازی..." #: main.c:510 #, c-format -msgid "MD5 checksum mismatch" -msgstr "ناهماهنگی در کنرل جمعی MD5" +msgid "BLAKE2 checksum mismatch" +msgstr "ناهماهنگی در کنرل جمعی BLAKE2" #: main.c:513 #, c-format diff --git a/src/installer/po/fr.po b/src/installer/po/fr.po index 9c6bcd60d..aad2bc31e 100644 --- a/src/installer/po/fr.po +++ b/src/installer/po/fr.po @@ -117,8 +117,8 @@ msgstr "Téléchargement de l'image d'installation..." #: main.c:510 #, c-format -msgid "MD5 checksum mismatch" -msgstr "Erreur de vérification contrôle MD5" +msgid "BLAKE2 checksum mismatch" +msgstr "Erreur de vérification contrôle BLAKE2" #: main.c:513 #, c-format diff --git a/src/installer/po/hr.po b/src/installer/po/hr.po index abfec72ac..ecd4c4884 100644 --- a/src/installer/po/hr.po +++ b/src/installer/po/hr.po @@ -106,8 +106,8 @@ msgstr "Preuzimanje instalacijske slike" #: main.c:510 #, c-format -msgid "MD5 checksum mismatch" -msgstr "MD5 checksum se ne podudara" +msgid "BLAKE2 checksum mismatch" +msgstr "BLAKE2 checksum se ne podudara" #: main.c:513 #, c-format diff --git a/src/installer/po/hu.po b/src/installer/po/hu.po index c69fd4bf6..fc7e1dc66 100644 --- a/src/installer/po/hu.po +++ b/src/installer/po/hu.po @@ -107,8 +107,8 @@ msgstr "Telepítési kép letöltése..." #: main.c:510 #, c-format -msgid "MD5 checksum mismatch" -msgstr "MD5 ellenőrzés sikertelen" +msgid "BLAKE2 checksum mismatch" +msgstr "BLAKE2 ellenőrzés sikertelen" #: main.c:513 #, c-format diff --git a/src/installer/po/id.po b/src/installer/po/id.po index 96f3d4de2..d5809b826 100644 --- a/src/installer/po/id.po +++ b/src/installer/po/id.po @@ -106,7 +106,7 @@ msgstr "" #: main.c:510 #, c-format -msgid "MD5 checksum mismatch" +msgid "BLAKE2 checksum mismatch" msgstr "" #: main.c:513 diff --git a/src/installer/po/it.po b/src/installer/po/it.po index 730ab70df..fe5d52ee0 100644 --- a/src/installer/po/it.po +++ b/src/installer/po/it.po @@ -108,8 +108,8 @@ msgstr "Scaricamento immagine di installazione..." #: main.c:510 #, c-format -msgid "MD5 checksum mismatch" -msgstr "Checksum MD5 non corrispondente" +msgid "BLAKE2 checksum mismatch" +msgstr "Checksum BLAKE2 non corrispondente" #: main.c:513 #, c-format diff --git a/src/installer/po/ja.po b/src/installer/po/ja.po index f45b101d8..5008672d1 100644 --- a/src/installer/po/ja.po +++ b/src/installer/po/ja.po @@ -107,8 +107,8 @@ msgstr "インストール・イメージをダウンロードしています・ #: main.c:510 #, c-format -msgid "MD5 checksum mismatch" -msgstr "MD5検査合計が不正です。" +msgid "BLAKE2 checksum mismatch" +msgstr "BLAKE2検査合計が不正です。" #: main.c:513 #, c-format diff --git a/src/installer/po/jv.po b/src/installer/po/jv.po index 0cee8b509..b30426ae8 100644 --- a/src/installer/po/jv.po +++ b/src/installer/po/jv.po @@ -106,7 +106,7 @@ msgstr "" #: main.c:510 #, c-format -msgid "MD5 checksum mismatch" +msgid "BLAKE2 checksum mismatch" msgstr "" #: main.c:513 diff --git a/src/installer/po/km_KH.po b/src/installer/po/km_KH.po index a7e10a514..772b04ad2 100644 --- a/src/installer/po/km_KH.po +++ b/src/installer/po/km_KH.po @@ -106,7 +106,7 @@ msgstr "" #: main.c:510 #, c-format -msgid "MD5 checksum mismatch" +msgid "BLAKE2 checksum mismatch" msgstr "" #: main.c:513 diff --git a/src/installer/po/nl.po b/src/installer/po/nl.po index eab31aa15..8ef5619cd 100644 --- a/src/installer/po/nl.po +++ b/src/installer/po/nl.po @@ -107,8 +107,8 @@ msgstr "Bezig met downloaden van het installatie bestand..." #: main.c:510 #, c-format -msgid "MD5 checksum mismatch" -msgstr "MD5 checksum verschil" +msgid "BLAKE2 checksum mismatch" +msgstr "BLAKE2 checksum verschil" #: main.c:513 #, c-format diff --git a/src/installer/po/pl.po b/src/installer/po/pl.po index 6a5fc1f99..70ab67ca7 100644 --- a/src/installer/po/pl.po +++ b/src/installer/po/pl.po @@ -109,8 +109,8 @@ msgstr "Pobieranie pliku obrazu instalacji..." #: main.c:510 #, c-format -msgid "MD5 checksum mismatch" -msgstr "Niezgodność sumy kontrolnej MD5" +msgid "BLAKE2 checksum mismatch" +msgstr "Niezgodność sumy kontrolnej BLAKE2" #: main.c:513 #, c-format diff --git a/src/installer/po/pt.po b/src/installer/po/pt.po index 8a9373062..218137bcc 100644 --- a/src/installer/po/pt.po +++ b/src/installer/po/pt.po @@ -106,7 +106,7 @@ msgstr "" #: main.c:510 #, c-format -msgid "MD5 checksum mismatch" +msgid "BLAKE2 checksum mismatch" msgstr "" #: main.c:513 diff --git a/src/installer/po/pt_BR.po b/src/installer/po/pt_BR.po index f9140e561..1c9282d64 100644 --- a/src/installer/po/pt_BR.po +++ b/src/installer/po/pt_BR.po @@ -110,8 +110,8 @@ msgstr "Baixando imagem de instalação..." #: main.c:510 #, c-format -msgid "MD5 checksum mismatch" -msgstr "Assinatura MD5 incompatível" +msgid "BLAKE2 checksum mismatch" +msgstr "Assinatura BLAKE2 incompatível" #: main.c:513 #, c-format diff --git a/src/installer/po/pt_PT.po b/src/installer/po/pt_PT.po index 625115742..34a82444a 100644 --- a/src/installer/po/pt_PT.po +++ b/src/installer/po/pt_PT.po @@ -107,7 +107,7 @@ msgstr "" #: main.c:510 #, c-format -msgid "MD5 checksum mismatch" +msgid "BLAKE2 checksum mismatch" msgstr "" #: main.c:513 diff --git a/src/installer/po/ro.po b/src/installer/po/ro.po index 738650f7c..14442618b 100644 --- a/src/installer/po/ro.po +++ b/src/installer/po/ro.po @@ -106,7 +106,7 @@ msgstr "" #: main.c:510 #, c-format -msgid "MD5 checksum mismatch" +msgid "BLAKE2 checksum mismatch" msgstr "" #: main.c:513 diff --git a/src/installer/po/ro_RO.po b/src/installer/po/ro_RO.po index 57294a300..4dc708a2a 100644 --- a/src/installer/po/ro_RO.po +++ b/src/installer/po/ro_RO.po @@ -107,8 +107,8 @@ msgstr "Se descarca imaginea de instalare" #: main.c:510 #, c-format -msgid "MD5 checksum mismatch" -msgstr "Nepotrivire verificare MD5" +msgid "BLAKE2 checksum mismatch" +msgstr "Nepotrivire verificare BLAKE2" #: main.c:513 #, c-format diff --git a/src/installer/po/ru.po b/src/installer/po/ru.po index b11e2e9a0..4ae486144 100644 --- a/src/installer/po/ru.po +++ b/src/installer/po/ru.po @@ -107,8 +107,8 @@ msgstr "Скачивание образа установки..." #: main.c:510 #, c-format -msgid "MD5 checksum mismatch" -msgstr "MD5 хеш не совпал" +msgid "BLAKE2 checksum mismatch" +msgstr "BLAKE2 хеш не совпал" #: main.c:513 #, c-format diff --git a/src/installer/po/rw.po b/src/installer/po/rw.po index 5eae4b55e..4fe7692b3 100644 --- a/src/installer/po/rw.po +++ b/src/installer/po/rw.po @@ -106,7 +106,7 @@ msgstr "" #: main.c:510 #, c-format -msgid "MD5 checksum mismatch" +msgid "BLAKE2 checksum mismatch" msgstr "" #: main.c:513 diff --git a/src/installer/po/sk.po b/src/installer/po/sk.po index b285caee3..53bdea1a3 100644 --- a/src/installer/po/sk.po +++ b/src/installer/po/sk.po @@ -106,7 +106,7 @@ msgstr "" #: main.c:510 #, c-format -msgid "MD5 checksum mismatch" +msgid "BLAKE2 checksum mismatch" msgstr "" #: main.c:513 diff --git a/src/installer/po/sq.po b/src/installer/po/sq.po index ef3f20d8e..d141a8347 100644 --- a/src/installer/po/sq.po +++ b/src/installer/po/sq.po @@ -107,7 +107,7 @@ msgstr "" #: main.c:510 #, c-format -msgid "MD5 checksum mismatch" +msgid "BLAKE2 checksum mismatch" msgstr "" #: main.c:513 diff --git a/src/installer/po/sr.po b/src/installer/po/sr.po index 86dd1ef3a..05b43b2f7 100644 --- a/src/installer/po/sr.po +++ b/src/installer/po/sr.po @@ -106,7 +106,7 @@ msgstr "" #: main.c:510 #, c-format -msgid "MD5 checksum mismatch" +msgid "BLAKE2 checksum mismatch" msgstr "" #: main.c:513 diff --git a/src/installer/po/su.po b/src/installer/po/su.po index fd66e4e52..fe941bfdf 100644 --- a/src/installer/po/su.po +++ b/src/installer/po/su.po @@ -106,7 +106,7 @@ msgstr "" #: main.c:510 #, c-format -msgid "MD5 checksum mismatch" +msgid "BLAKE2 checksum mismatch" msgstr "" #: main.c:513 diff --git a/src/installer/po/sv.po b/src/installer/po/sv.po index 9cdc32bcb..b81ddde04 100644 --- a/src/installer/po/sv.po +++ b/src/installer/po/sv.po @@ -107,8 +107,8 @@ msgstr "Laddar ned installationsavbild..." #: main.c:510 #, c-format -msgid "MD5 checksum mismatch" -msgstr "MD5 kontrollsumma stämmer ej" +msgid "BLAKE2 checksum mismatch" +msgstr "BLAKE2 kontrollsumma stämmer ej" #: main.c:513 #, c-format diff --git a/src/installer/po/th.po b/src/installer/po/th.po index 2d6b33284..026d05c03 100644 --- a/src/installer/po/th.po +++ b/src/installer/po/th.po @@ -106,7 +106,7 @@ msgstr "" #: main.c:510 #, c-format -msgid "MD5 checksum mismatch" +msgid "BLAKE2 checksum mismatch" msgstr "" #: main.c:513 diff --git a/src/installer/po/tk.po b/src/installer/po/tk.po index 0bc6e8082..5c58d4dbb 100644 --- a/src/installer/po/tk.po +++ b/src/installer/po/tk.po @@ -106,7 +106,7 @@ msgstr "" #: main.c:510 #, c-format -msgid "MD5 checksum mismatch" +msgid "BLAKE2 checksum mismatch" msgstr "" #: main.c:513 diff --git a/src/installer/po/tr.po b/src/installer/po/tr.po index d66d840a2..ea0b5a62e 100644 --- a/src/installer/po/tr.po +++ b/src/installer/po/tr.po @@ -109,8 +109,8 @@ msgstr "Yükleme dosyası indiriliyor..." #: main.c:510 #, c-format -msgid "MD5 checksum mismatch" -msgstr "MD5 checksum uyuşmuyor" +msgid "BLAKE2 checksum mismatch" +msgstr "BLAKE2 checksum uyuşmuyor" #: main.c:513 #, c-format diff --git a/src/installer/po/uk.po b/src/installer/po/uk.po index cd8deb10b..0d8958f82 100644 --- a/src/installer/po/uk.po +++ b/src/installer/po/uk.po @@ -106,7 +106,7 @@ msgstr "" #: main.c:510 #, c-format -msgid "MD5 checksum mismatch" +msgid "BLAKE2 checksum mismatch" msgstr "" #: main.c:513 diff --git a/src/installer/po/uz@Latn.po b/src/installer/po/uz@Latn.po index 345fb0933..be11221d9 100644 --- a/src/installer/po/uz@Latn.po +++ b/src/installer/po/uz@Latn.po @@ -106,7 +106,7 @@ msgstr "" #: main.c:510 #, c-format -msgid "MD5 checksum mismatch" +msgid "BLAKE2 checksum mismatch" msgstr "" #: main.c:513 diff --git a/src/installer/po/vi.po b/src/installer/po/vi.po index 7fbce462e..7aaa0449f 100644 --- a/src/installer/po/vi.po +++ b/src/installer/po/vi.po @@ -106,7 +106,7 @@ msgstr "" #: main.c:510 #, c-format -msgid "MD5 checksum mismatch" +msgid "BLAKE2 checksum mismatch" msgstr "" #: main.c:513 diff --git a/src/installer/po/zh.po b/src/installer/po/zh.po index 67ed5c801..43c2f8321 100644 --- a/src/installer/po/zh.po +++ b/src/installer/po/zh.po @@ -106,7 +106,7 @@ msgstr "" #: main.c:510 #, c-format -msgid "MD5 checksum mismatch" +msgid "BLAKE2 checksum mismatch" msgstr "" #: main.c:513 From patchwork Fri Apr 8 15:11:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Peter_M=C3=BCller?= X-Patchwork-Id: 5471 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4KZhXl0552z3x1s for ; Fri, 8 Apr 2022 15:11:19 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4KZhXk4N3jz3vN; Fri, 8 Apr 2022 15:11:18 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4KZhXk4LSjz2ybk; Fri, 8 Apr 2022 15:11:18 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4KZhXj621Dz2xNS for ; Fri, 8 Apr 2022 15:11:17 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4KZhXj0dLkznj for ; Fri, 8 Apr 2022 15:11:16 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1649430677; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=R+rnxpxr1UUvQFGRuz5M1wAGAo3r8tvBB/B+w6qqArg=; b=dUv+utp1+vcq1V2fgBKa6ByCz4Aqu2bl3nfW2qFrRw7r+suA6aPkeU98e9hT3Wk8ePaHmJ 4laZLQ43fsJHsoCg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1649430677; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=R+rnxpxr1UUvQFGRuz5M1wAGAo3r8tvBB/B+w6qqArg=; b=azKCeRAktuKc8hZ5IjEwETxpKVxAoCckedgodH7H0mCAVJYff/g8px6Z5PkjTFJx6LNZNr esUnvBNtsViI1D2c69MUv7NnY33Y/o1n8MCv6RYq0+0G0/HuUVy755m8B6nu4flmQWpSa8 oyDINErdv1cfSW7FDYn00MeFqRA3sINAbcdYrFK9G4Zw0N0OA2Am9JW2UJV0fwHy6sh21I aDV3rBhlUkYlohOfOk3OED0gkC03oB24CfCA7DHpLPnF55Bci4EII1c6ylC0Wh7QGTLS++ Rxw7vmwu8x2aOBVhhAYcq58sCtaUrNc8pLwRE3jbROix+sSBik5Up4jwckNgbg== Message-ID: <725ba25a-94f5-f8fe-f9cb-a26fa7d48373@ipfire.org> Date: Fri, 8 Apr 2022 15:11:15 +0000 MIME-Version: 1.0 Subject: [PATCH 3/3] backupiso: Change checksum algorithm to BLAKE2 Content-Language: en-US To: development@lists.ipfire.org References: <9a3bc372-db7a-24c2-478c-6bc481864672@ipfire.org> <814ae2bf-c453-ce55-74eb-e2fb11b5900e@ipfire.org> From: =?utf-8?q?Peter_M=C3=BCller?= In-Reply-To: <814ae2bf-c453-ce55-74eb-e2fb11b5900e@ipfire.org> X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Reported-by: Arne Fitzenreiter Signed-off-by: Peter Müller --- src/scripts/backupiso | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/scripts/backupiso b/src/scripts/backupiso index fe5376741..ef017e3be 100644 --- a/src/scripts/backupiso +++ b/src/scripts/backupiso @@ -80,30 +80,30 @@ then wget --quiet -c ${URL}${ISO} fi -echo "Fetching ${URL}${ISO}.md5" -wget --quiet -O ${ISO}.md5 ${URL}${ISO}.md5 +echo "Fetching ${URL}${ISO}.b2" +wget --quiet -O ${ISO}.b2 ${URL}${ISO}.b2 -echo "Checking md5 of ${ISO}" -md5sum --status -c ${ISO}.md5 +echo "Checking BLAKE2 checksum of ${ISO}" +b2sum --status -c ${ISO}.b2 if [ $? -eq 0 ] || [ $? -eq 24 ] then - echo "md5 is OK" + echo "BLAKE2 checksum is OK" else - echo "md5 mismatch" + echo "BLAKE2 checksum mismatch" echo "Fetching again ${URL}${ISO}" wget --quiet -O ${ISO} ${URL}${ISO} - echo "Checking again md5 of ${ISO}" - md5sum --status -c ${ISO}.md5 + echo "Checking BLAKE2 checksum of ${ISO} again" + b2sum --status -c ${ISO}.b2 if [ $? -eq 0 ] || [ $? -eq 24 ] then - echo "md5 is OK" + echo "BLAKE2 checksum is OK" else - echo "md5 mismatch" - echo "aborting backup because md5 mismatch" + echo "BLAKE2 checksum mismatch" + echo "aborting backup because BLAKE2 checksum mismatch" exit 1 fi fi -rm ${ISO}.md5 +rm ${ISO}.b2 echo "Remastering iso" mkdir -p backupiso.tmp.${TS}