All of lore.kernel.org
 help / color / mirror / Atom feed
From: Quirin Gylstorff <Quirin.Gylstorff@siemens.com>
To: cip-dev@lists.cip-project.org, felix.moessbauer@siemens.com,
	jan.kiszka@siemens.com
Subject: [cip-dev][isar-cip-core][PATCH v3 2/6] sign-swu-cms: check if key and cert are valid
Date: Tue,  5 Mar 2024 17:10:55 +0100	[thread overview]
Message-ID: <20240305161128.2777211-3-Quirin.Gylstorff@siemens.com> (raw)
In-Reply-To: <20240305161128.2777211-1-Quirin.Gylstorff@siemens.com>

From: Quirin Gylstorff <quirin.gylstorff@siemens.com>

This avoids a broken update binary.

Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
---
 .../swupdate-certificates/files/sign-swu-cms  | 29 +++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

diff --git a/recipes-devtools/swupdate-certificates/files/sign-swu-cms b/recipes-devtools/swupdate-certificates/files/sign-swu-cms
index 7bd04ef..d844e01 100644
--- a/recipes-devtools/swupdate-certificates/files/sign-swu-cms
+++ b/recipes-devtools/swupdate-certificates/files/sign-swu-cms
@@ -1,9 +1,34 @@
 #!/bin/sh
 in_file=$1
 out_file=$2
+inkey="/usr/share/swupdate-signing/swupdate-sign.key"
+cert="/usr/share/swupdate-signing/swupdate-sign.crt"
+
+error_msg() {
+	echo "$1" 1>&2
+	exit 1
+}
+
+if ! openssl rsa -check -noout -in "$inkey"; then
+	error_msg "key '$inkey' is not a rsa key "
+fi
+
+# if openssl > 3.0 we have the x509 check option
+if openssl version | grep -q "3.[0-9].[0-9]"; then
+	if ! openssl x509 -check -noout -in "$cert"; then
+		error_msg  "certificate '$cert' is not a certificate"
+	fi
+fi
+
+key_md5=$(openssl rsa -modulus -noout -in "$inkey" | openssl md5)
+cert_md5=$(openssl x509 -modulus -noout -in "$cert" | openssl md5)
+if [ "$key_md5" != "$cert_md5" ]; then
+	error_msg "key '$inkey' does not match certificate '$cert' "
+fi
+
 openssl cms \
 	-sign -in "$in_file" \
 	-out "$out_file" \
-	-signer "/usr/share/swupdate-signing/swupdate-sign.crt" \
-	-inkey "/usr/share/swupdate-signing/swupdate-sign.key" \
+	-signer "$cert" \
+	-inkey "$inkey" \
 	-outform DER -noattr -binary
-- 
2.43.0



  parent reply	other threads:[~2024-03-05 16:11 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-03-05 16:10 [cip-dev][isar-cip-core][PATCH v3 0/6] Make swupdate signing more robust Quirin Gylstorff
2024-03-05 16:10 ` [cip-dev][isar-cip-core][PATCH v3 1/6] swupdate: check output of sign-swu Quirin Gylstorff
2024-03-05 16:10 ` Quirin Gylstorff [this message]
2024-03-05 16:10 ` [cip-dev][isar-cip-core][PATCH v3 3/6] doc: Add section about SWUpdate signing to README.swupdate.md Quirin Gylstorff
2024-03-05 16:10 ` [cip-dev][isar-cip-core][PATCH v3 4/6] fix do not add files to each image recipe Quirin Gylstorff
2024-03-05 16:10 ` [cip-dev][isar-cip-core][PATCH v3 5/6] format: classes/efibootguard fix spacing Quirin Gylstorff
2024-03-05 16:10 ` [cip-dev][isar-cip-core][PATCH v3 6/6] format: classes/swupdate fix parenthesis Quirin Gylstorff
2024-03-12  8:40 ` [cip-dev][isar-cip-core][PATCH v3 0/6] Make swupdate signing more robust Jan Kiszka
2024-03-12 18:12   ` Gylstorff Quirin
2024-03-12 18:50     ` Gylstorff Quirin
2024-03-12 19:21       ` Jan Kiszka
2024-03-13  7:57         ` Gylstorff Quirin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240305161128.2777211-3-Quirin.Gylstorff@siemens.com \
    --to=quirin.gylstorff@siemens.com \
    --cc=cip-dev@lists.cip-project.org \
    --cc=felix.moessbauer@siemens.com \
    --cc=jan.kiszka@siemens.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.