Browse Source

make: added new default target cert-bundle.pem

Fabian Peter Hammerle 5 years ago
parent
commit
fa76e03f37
2 changed files with 11 additions and 3 deletions
  1. 1 0
      .gitignore
  2. 10 3
      Makefile

+ 1 - 0
.gitignore

@@ -1,4 +1,5 @@
 /*.key
+/cert-bundle.pem
 /cert-request.pem
 /cert.der
 /cert.pem

+ 10 - 3
Makefile

@@ -1,4 +1,4 @@
-all : cert.pem cert-openssl-text
+all : cert-bundle.pem cert-openssl-text
 
 keygrip.hex : cert-request.pem
 	./sexp-gen/create-gpg-shadow-key-from-x509-cert-req.py \
@@ -18,7 +18,14 @@ cert.pem : cert.der
 	openssl x509 -inform DER -in $< -outform PEM -out $@
 
 cert-openssl-text : cert.pem
-	openssl x509 -in $< -text -noout 
+	openssl x509 -in $< -text -noout
+
+cert-bundle.pem : cert.pem gpgsm-params
+	cat cert.pem > $@
+	gpgsm --armor --export \
+		\&$(shell grep --perl-regexp --only-matching 'Signing-Key: \K\w+' gpgsm-params) \
+		>> $@
 
 clean :
-	-rm keygrip.hex "$(shell cat keygrip.hex).key" gpgsm-params cert.der cert.pem
+	-rm keygrip.hex "$(shell cat keygrip.hex).key" gpgsm-params \
+		cert.der cert.pem cert-bundle.pem