From patchwork Mon Dec 3 13:40:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Gstir X-Patchwork-Id: 1006917 X-Patchwork-Delegate: david.oberhollenzer@sigma-star.at Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=sigma-star.at Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="kqmLogSO"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 437mPj2yF8z9s7W for ; Tue, 4 Dec 2018 00:42:01 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To :From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=mdnZJIVp0CGI+ls+TZ4paA7W3k+ngDjap63dvJbXgd8=; b=kqmLogSOxNCdK0 xs0wstPmSeig9Fn3xWz8iK0kHesiThwhFWEgEe+qzWZ557rtoI4O12o3ki7TgS8zt2sExldhYmZA1 tsmZEDtWIDAn0DGFTFJCwjIhpHTHWs7AjfOzz2AXQhXGAJxnW1lv1Z/QT0iE5UKUgZt9+p72yoKtK 0WGkGMK+wuAGfS2e6JU4QTpAafArk2gUI18+dbYW2CL2laar40Xea7Gq69stnO1EVvxNlw7MiXGUo TUCqp68O/MYUK3HtzEg+ASCKiGtMj6beXwbgtVzemfQqYsZEIiLNQttEFZzM05czJqeO1mm1d2hVL BMIyVEdyWfxl4l+KUEgA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gToU1-0003zo-4D; Mon, 03 Dec 2018 13:41:57 +0000 Received: from lilium.sigma-star.at ([109.75.188.150]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gToTj-0003wg-Fg for linux-mtd@lists.infradead.org; Mon, 03 Dec 2018 13:41:41 +0000 Received: from localhost (localhost [127.0.0.1]) by lilium.sigma-star.at (Postfix) with ESMTP id 887F818013D88; Mon, 3 Dec 2018 14:41:19 +0100 (CET) From: David Gstir To: linux-mtd@lists.infradead.org Subject: [PATCH] mkfs.ubifs: fix default cipher in help output Date: Mon, 3 Dec 2018 14:40:46 +0100 Message-Id: <20181203134046.16708-1-david@sigma-star.at> X-Mailer: git-send-email 2.19.2 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181203_054139_661018_15E8FE97 X-CRM114-Status: GOOD ( 11.71 ) X-Spam-Score: 0.0 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 T_SPF_PERMERROR SPF: test of record failed (permerror) X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: richard@nod.at, David Gstir , david.oberhollenzer@sigma-star.at Sender: "linux-mtd" Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org AES-256-XTS is the default since dd0d9c623e22 ("mkfs.ubifs: Use AES-256-XTS as default"), we want that to be correctly reflected in the help output as well. Signed-off-by: David Gstir --- ubifs-utils/mkfs.ubifs/mkfs.ubifs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ubifs-utils/mkfs.ubifs/mkfs.ubifs.c b/ubifs-utils/mkfs.ubifs/mkfs.ubifs.c index 666dfe6231a2..6e11ec8649c2 100644 --- a/ubifs-utils/mkfs.ubifs/mkfs.ubifs.c +++ b/ubifs-utils/mkfs.ubifs/mkfs.ubifs.c @@ -237,7 +237,7 @@ static const char *helptext = "-P, --padding=NUM specify padding policy for encrypting filenames\n" " (default = 4).\n" "-C, --cipher=NAME Specify cipher to use for file level encryption\n" -" (default is \"AES-128-CBC\").\n" +" (default is \"AES-256-XTS\").\n" "-h, --help display this help text\n\n" "Note, SIZE is specified in bytes, but it may also be specified in Kilobytes,\n" "Megabytes, and Gigabytes if a KiB, MiB, or GiB suffix is used.\n\n"