Skip to content

Fix two issues in previous patches #36

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mimizohar merged 2 commits into from
May 4, 2026
Merged

Fix two issues in previous patches #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ba03af0
evmctl: Notify user if first --v3 is passed and then --v2
stefanberger Apr 28, 2026
b5dfa8c
tests: Rename suffix of temporary file and fix an error message
stefanberger Apr 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ OPTIONS
--ignore-violations ignore ToMToU measurement violations
--hmackey path to symmetric key (default: /etc/keys/evm-key-plain)
--v2 create V2 signatures; this is the default
--v3 create V3 signatures; this requires Linux 7.1 or later
--v3 create V3 signatures; this requires Linux 7.2 or later
-v increase verbosity level
-h, --help display this help and exit

Expand Down
13 changes: 12 additions & 1 deletion src/evmctl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3012,7 +3012,7 @@ static void usage(void)
" --hmackey path to symmetric key (default: /etc/keys/evm-key-plain)\n"
#endif
" --v2 create V2 signatures; this is the default\n"
" --v3 create V3 signatures; this requires Linux 7.1 or later\n"
" --v3 create V3 signatures; this requires Linux 7.2 or later\n"
" -v increase verbosity level\n"
" -h, --help display this help and exit\n"
"\n"
Expand Down Expand Up @@ -3176,6 +3176,7 @@ static ENGINE *setup_engine(const char *engine_id)

int main(int argc, char *argv[])
{
bool version_chosen = false;
int err = 0, c, lind;
unsigned long keyid;
char *eptr;
Expand Down Expand Up @@ -3369,9 +3370,19 @@ int main(int argc, char *argv[])
break;
#endif
case 150: /* --v2 */
if (version_chosen &&
g_signature_version != SIGNATURE_V2) {
log_info("Switching to use v2 signatures.\n");
}
version_chosen = true;
g_signature_version = SIGNATURE_V2;
break;
case 151: /* --v3 */
if (version_chosen &&
g_signature_version != SIGNATURE_V3) {
log_info("Switching to use v3 signatures.\n");
}
version_chosen = true;
g_signature_version = SIGNATURE_V3;
break;
case '?':
Expand Down
13 changes: 7 additions & 6 deletions tests/sign_verify.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,11 +216,12 @@ check_sign() {
if [[ "$OPTS" =~ "--v3" ]]; then
# In case of v3 signatures we need to create ima_file_id now.
# All data for it can be found in PREFIX and by hashing $FILE.
echo -en "\x${PREFIX:2:2}\x${PREFIX:6:2}" > "$FILE.tmp"
echo -en "\x${PREFIX:2:2}\x${PREFIX:6:2}" > "$FILE.ima_file_id"
# shellcheck disable=SC2086
openssl dgst $OPENSSL_ENGINE $OPENSSL_KEYFORM -"$ALG" -binary "$FILE" >> "$FILE.tmp"
openssl dgst $OPENSSL_ENGINE $OPENSSL_KEYFORM -"$ALG" -binary "$FILE" >> \
"$FILE.ima_file_id"
cmd="openssl dgst $OPENSSL_ENGINE $OPENSSL_KEYFORM -$ALG -verify ${verifykey} \
-signature $FILE.sig2 $FILE.tmp"
-signature $FILE.sig2 $FILE.ima_file_id"
sigver=3
else
cmd="openssl dgst $OPENSSL_ENGINE $OPENSSL_KEYFORM -$ALG -verify ${verifykey} \
Expand All @@ -230,13 +231,13 @@ check_sign() {
echo - "$cmd"
if ! $cmd; then
color_red_on_failure
echo "Signature v${sigver} verification with openssl is failed."
echo "Signature v${sigver} verification with openssl failed."
color_restore
rm "$FILE.sig2" "$FILE.tmp"
rm -f "$FILE.sig2" "$FILE.ima_file_id"
return "$FAIL"
fi

rm "$FILE.sig2" "$FILE.tmp"
rm -f "$FILE.sig2" "$FILE.ima_file_id"
return "$OK"
}

Expand Down
Loading