From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3E830C33C99 for ; Mon, 2 Dec 2019 23:02:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0ABDA20862 for ; Mon, 2 Dec 2019 23:02:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575327754; bh=EWO9yyehQ75X/ttKInfB4SfjiPSnN2s+T6SAmw2/y+0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=rUL3sASA01l9Xk1vlTf3WD8bTit2jpfw42yoSjZbA6rXuTzNJ4RyNVqDFcqs4CG7e x1+JVt4ff9yrR9Nh06fDSeICeIQ3FR5RYVeq8hlmFKGuv4Iasie1lDKG7LemJpslMb +dVNmig1Oiz1dg9LYzz732coLgk2q5/rx/KmHrhk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725874AbfLBXCd (ORCPT ); Mon, 2 Dec 2019 18:02:33 -0500 Received: from mail.kernel.org ([198.145.29.99]:59500 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725903AbfLBXCc (ORCPT ); Mon, 2 Dec 2019 18:02:32 -0500 Received: from ebiggers-linuxstation.mtv.corp.google.com (unknown [104.132.1.77]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 2E17020718; Mon, 2 Dec 2019 23:02:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575327752; bh=EWO9yyehQ75X/ttKInfB4SfjiPSnN2s+T6SAmw2/y+0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QboUDi0z0TiI6h8RnRGB/k8p9Ua6CLl2GqrLtYNZwHmcUSjn32p0cBvNPxpGi6Xvn rDqePtIQ/sMUv+RjXneslzxp1NLWxMSnQGgmWR6PPGSG6ur/egqlVav7QieqNpq2Zt OYlEaUP+cBpCBgJkd32NxQRwSgcHZiUEXg4F1TLc= From: Eric Biggers To: fstests@vger.kernel.org Cc: linux-fscrypt@vger.kernel.org, Satya Tangirala Subject: [PATCH v2 2/5] fscrypt-crypt-util: add HKDF context constants Date: Mon, 2 Dec 2019 15:01:52 -0800 Message-Id: <20191202230155.99071-3-ebiggers@kernel.org> X-Mailer: git-send-email 2.24.0.393.g34dc348eaf-goog In-Reply-To: <20191202230155.99071-1-ebiggers@kernel.org> References: <20191202230155.99071-1-ebiggers@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org From: Eric Biggers Use #defines rather than hard-coded numbers + comments. Signed-off-by: Eric Biggers --- src/fscrypt-crypt-util.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/fscrypt-crypt-util.c b/src/fscrypt-crypt-util.c index bafc15e0..30f5e585 100644 --- a/src/fscrypt-crypt-util.c +++ b/src/fscrypt-crypt-util.c @@ -1703,6 +1703,10 @@ struct key_and_iv_params { bool file_nonce_specified; }; +#define HKDF_CONTEXT_KEY_IDENTIFIER 1 +#define HKDF_CONTEXT_PER_FILE_KEY 2 +#define HKDF_CONTEXT_PER_MODE_KEY 3 + /* * Get the key and starting IV with which the encryption will actually be done. * If a KDF was specified, a subkey is derived from the master key and the mode @@ -1743,11 +1747,11 @@ static void get_key_and_iv(const struct key_and_iv_params *params, break; case KDF_HKDF_SHA512: if (params->mode_num != 0) { - info[infolen++] = 3; /* HKDF_CONTEXT_PER_MODE_KEY */ + info[infolen++] = HKDF_CONTEXT_PER_MODE_KEY; info[infolen++] = params->mode_num; file_nonce_in_iv = true; } else if (params->file_nonce_specified) { - info[infolen++] = 2; /* HKDF_CONTEXT_PER_FILE_KEY */ + info[infolen++] = HKDF_CONTEXT_PER_FILE_KEY; memcpy(&info[infolen], params->file_nonce, FILE_NONCE_SIZE); infolen += FILE_NONCE_SIZE; -- 2.24.0.393.g34dc348eaf-goog