Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1npYfW-0001j7-Um for mharc-grub-devel@gnu.org; Fri, 13 May 2022 13:01:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39822) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1npYfP-0001dd-2A for grub-devel@gnu.org; Fri, 13 May 2022 13:01:27 -0400 Received: from mail-vs1-xe31.google.com ([2607:f8b0:4864:20::e31]:38672) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1npYfM-0004xD-SC for grub-devel@gnu.org; Fri, 13 May 2022 13:01:26 -0400 Received: by mail-vs1-xe31.google.com with SMTP id q2so9032600vsr.5 for ; Fri, 13 May 2022 10:01:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=efficientek-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=WkTlHHS0jkWLGsEdomdzrY89A2we4LGNmO16oZu8OqA=; b=5kIywAmANMK8RrnT3i3x3660MRRiEDVS3c6GXEy1UjWsKISTrGrCdugdkf22kUOYcH 0jigeiQppz4sWHT8/NfeRZW1MDuFUIvTYnbuhGZiFg5g70Ju9zTRii9yvB+/88OGXF1M ZtfZCjg65xiS4CttMn8wwATIEaEk/NVwXIcnMHES6y9wHiSnRSObViSsSHCiWF0AKyaT q9naDz0NFPgSE6B7VUafXR/3TpHrnl6HkJLvtrffhwaNzJKR1V+79GIHScFLlonf7ALy 0osfWo+EYOPm8U9D/ldKGvaYY6/vk1xC8kJ/cTKN9qP2/6st4f1uAaO+s4Y3Pl7BAIPq 8Mzg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=WkTlHHS0jkWLGsEdomdzrY89A2we4LGNmO16oZu8OqA=; b=esWhvES34kQSOZAXCh6ZnfEwYQnO29S6i+hhN4sQJJLiGQK4K0BJvXXVpGQsxElzvJ ik5c3/WDC6aatKokaeObJENXRmH420NV8C8SK6/iCx7ULDNgs05dfzmSEAxbnyWRhsVA TsVPX6VRnu/n37dL1qUa4cQyARYgLm6l767JRTEifLpny7MTz1wSA9sN63GN5HEnvphg BGAYTHBW8feTNH9VoRdo30Th88eq26yCCKt5RnZ5T44f6CZlv1hLYWdLv0U+rAjrHcWy CEMEdOstYOiymYe42OBlk8dRUUwpssRUfhW8bP60dUAWrrYEtvAPcoLaY8LmFNXDZZ2k BlrA== X-Gm-Message-State: AOAM530URzjbubNGedWhkWi8h7XpdedTSAzewCSzsQI5SklwAGAVmrXm kKNdbG1JvMSwrIY92AU6aZd9vbzGLPdAgTLe X-Google-Smtp-Source: ABdhPJznI3wWeOyA9qBpMOKiepmDS8XPT1wGXbk82ePX0bJLvgUT7RkWArtNOchmMiEtHB5IqEem1A== X-Received: by 2002:a67:e1dd:0:b0:32d:1bad:8f18 with SMTP id p29-20020a67e1dd000000b0032d1bad8f18mr2796992vsl.13.1652461282342; Fri, 13 May 2022 10:01:22 -0700 (PDT) Received: from localhost.localdomain ([37.218.244.249]) by smtp.gmail.com with ESMTPSA id g4-20020a1fe904000000b0034e6f1fd03esm346323vkh.8.2022.05.13.10.01.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 May 2022 10:01:21 -0700 (PDT) From: Glenn Washburn To: grub-devel@gnu.org, Daniel Kiper Cc: Denis 'GNUtoo' Carikli , Patrick Steinhardt , John Lane , Glenn Washburn Subject: [PATCH v2 4/5] cryptodisk: Use enum constants as indexes into cryptomount option array Date: Fri, 13 May 2022 12:00:50 -0500 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::e31; envelope-from=development@efficientek.com; helo=mail-vs1-xe31.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 May 2022 17:01:27 -0000 Signed-off-by: Glenn Washburn --- grub-core/disk/cryptodisk.c | 53 ++++++++++++++++++++++--------------- 1 file changed, 32 insertions(+), 21 deletions(-) diff --git a/grub-core/disk/cryptodisk.c b/grub-core/disk/cryptodisk.c index 94640b502..ecbda7ce9 100644 --- a/grub-core/disk/cryptodisk.c +++ b/grub-core/disk/cryptodisk.c @@ -35,6 +35,17 @@ GRUB_MOD_LICENSE ("GPLv3+"); grub_cryptodisk_dev_t grub_cryptodisk_list; +enum + { + OPTION_UUID, + OPTION_ALL, + OPTION_BOOT, + OPTION_PASSWORD, + OPTION_KEYFILE, + OPTION_KEYFILE_OFFSET, + OPTION_KEYFILE_SIZE + }; + static const struct grub_arg_option options[] = { {"uuid", 'u', 0, N_("Mount by UUID."), 0, 0}, @@ -1163,66 +1174,66 @@ grub_cmd_cryptomount (grub_extcmd_context_t ctxt, int argc, char **args) struct grub_arg_list *state = ctxt->state; struct grub_cryptomount_args cargs = {0}; - if (argc < 1 && !state[1].set && !state[2].set) + if (argc < 1 && !state[OPTION_ALL].set && !state[OPTION_BOOT].set) return grub_error (GRUB_ERR_BAD_ARGUMENT, "device name required"); if (grub_cryptodisk_list == NULL) return grub_error (GRUB_ERR_BAD_MODULE, "no cryptodisk modules loaded"); - if (state[3].set) /* password */ + if (state[OPTION_PASSWORD].set) /* password */ { - cargs.key_data = (grub_uint8_t *) state[3].arg; - cargs.key_len = grub_strlen (state[3].arg); + cargs.key_data = (grub_uint8_t *) state[OPTION_PASSWORD].arg; + cargs.key_len = grub_strlen (state[OPTION_PASSWORD].arg); } - if (state[4].set) /* keyfile */ + if (state[OPTION_KEYFILE].set) /* keyfile */ { char tmp_errmsg[GRUB_MAX_ERRMSG]; const char *p = NULL; grub_file_t keyfile; unsigned long long keyfile_offset = 0, keyfile_size = 0; - if (state[5].set) /* keyfile-offset */ + if (state[OPTION_KEYFILE_OFFSET].set) /* keyfile-offset */ { grub_errno = GRUB_ERR_NONE; - keyfile_offset = grub_strtoull (state[5].arg, &p, 0); + keyfile_offset = grub_strtoull (state[OPTION_KEYFILE_OFFSET].arg, &p, 0); - if (state[5].arg[0] == '\0' || *p != '\0') + if (state[OPTION_KEYFILE_OFFSET].arg[0] == '\0' || *p != '\0') { if (grub_errno != GRUB_ERR_NONE) { grub_strncpy (tmp_errmsg, grub_errmsg, GRUB_MAX_ERRMSG); return grub_error (grub_errno, N_("non-numeric or invalid keyfile offset `%s': %s"), - state[5].arg, tmp_errmsg); + state[OPTION_KEYFILE_OFFSET].arg, tmp_errmsg); } else return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("invalid keyfile offset `%s': non-numeric" " characters at end of number"), - state[5].arg); + state[OPTION_KEYFILE_OFFSET].arg); } } - if (state[6].set) /* keyfile-size */ + if (state[OPTION_KEYFILE_SIZE].set) /* keyfile-size */ { grub_errno = GRUB_ERR_NONE; - keyfile_size = grub_strtoull (state[6].arg, &p, 0); + keyfile_size = grub_strtoull (state[OPTION_KEYFILE_SIZE].arg, &p, 0); - if (state[6].arg[0] == '\0' || *p != '\0') + if (state[OPTION_KEYFILE_SIZE].arg[0] == '\0' || *p != '\0') { if (grub_errno != GRUB_ERR_NONE) { grub_strncpy (tmp_errmsg, grub_errmsg, GRUB_MAX_ERRMSG); return grub_error (grub_errno, N_("non-numeric or invalid keyfile offset `%s': %s"), - state[5].arg, tmp_errmsg); + state[OPTION_KEYFILE_SIZE].arg, tmp_errmsg); } else return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("invalid keyfile offset `%s': non-numeric" " characters at end of number"), - state[6].arg); + state[OPTION_KEYFILE_SIZE].arg); } if (keyfile_size > GRUB_CRYPTODISK_MAX_KEYFILE_SIZE) @@ -1234,7 +1245,7 @@ grub_cmd_cryptomount (grub_extcmd_context_t ctxt, int argc, char **args) return grub_error (GRUB_ERR_OUT_OF_RANGE, N_("key file size is 0")); } - keyfile = grub_file_open (state[4].arg, + keyfile = grub_file_open (state[OPTION_KEYFILE].arg, GRUB_FILE_TYPE_CRYPTODISK_ENCRYPTION_KEY); if (keyfile == NULL) return grub_errno; @@ -1272,7 +1283,7 @@ grub_cmd_cryptomount (grub_extcmd_context_t ctxt, int argc, char **args) return grub_error (GRUB_ERR_FILE_READ_ERROR, (N_("failed to read key file"))); } - if (state[0].set) /* uuid */ + if (state[OPTION_UUID].set) /* uuid */ { int found_uuid; grub_cryptodisk_t dev; @@ -1285,7 +1296,7 @@ grub_cmd_cryptomount (grub_extcmd_context_t ctxt, int argc, char **args) return GRUB_ERR_NONE; } - cargs.check_boot = state[2].set; + cargs.check_boot = state[OPTION_BOOT].set; cargs.search_uuid = args[0]; found_uuid = grub_device_iterate (&grub_cryptodisk_scan_device, &cargs); @@ -1303,9 +1314,9 @@ grub_cmd_cryptomount (grub_extcmd_context_t ctxt, int argc, char **args) } return grub_errno; } - else if (state[1].set || (argc == 0 && state[2].set)) /* -a|-b */ + else if (state[OPTION_ALL].set || (argc == 0 && state[OPTION_BOOT].set)) /* -a|-b */ { - cargs.check_boot = state[2].set; + cargs.check_boot = state[OPTION_BOOT].set; grub_device_iterate (&grub_cryptodisk_scan_device, &cargs); return GRUB_ERR_NONE; } @@ -1317,7 +1328,7 @@ grub_cmd_cryptomount (grub_extcmd_context_t ctxt, int argc, char **args) char *disklast = NULL; grub_size_t len; - cargs.check_boot = state[2].set; + cargs.check_boot = state[OPTION_BOOT].set; diskname = args[0]; len = grub_strlen (diskname); if (len && diskname[0] == '(' && diskname[len - 1] == ')') -- 2.34.1