Parcourir la source

define issuer / authority / signing id in issuer-keygrip.hex

Fabian Peter Hammerle il y a 8 ans
Parent
commit
df34b7ddcd
4 fichiers modifiés avec 12 ajouts et 4 suppressions
  1. 2 1
      Makefile
  2. 2 2
      gpgsm-params-template
  3. 1 0
      issuer-keygrip.hex
  4. 7 1
      prepare-gpgsm-params

+ 2 - 1
Makefile

@@ -1,8 +1,9 @@
 all : gpgsm-params cert.der cert.pem cert.openssl-text
 
-gpgsm-params : gpgsm-params-template subject-keygrip.hex
+gpgsm-params : gpgsm-params-template subject-keygrip.hex issuer-keygrip.hex
 	./prepare-gpgsm-params --template gpgsm-params-template \
 		--subject-keygrip "$(shell cat subject-keygrip.hex)" \
+		--issuer-keygrip "$(shell cat issuer-keygrip.hex)" \
 		> $@
 
 cert.der : gpgsm-params

+ 2 - 2
gpgsm-params-template

@@ -7,8 +7,8 @@ Name-DN: CN=client,C=AT
 Hash-Algo: SHA256
 Issuer-DN: CN=Fabian Peter Hammerle,C=AT
 Subject-Key-Id: {subject-keygrip}
-Signing-Key: C2E04B00B3F087DB143B4BB6411813BA220ED4BA
-Authority-Key-Id: C2E04B00B3F087DB143B4BB6411813BA220ED4BA
+Signing-Key: {issuer-keygrip}
+Authority-Key-Id: {issuer-keygrip}
 # X509v3 Basic Constraints: critical
 #   CA:FALSE
 Extension: 2.5.29.19 c 3003010100

+ 1 - 0
issuer-keygrip.hex

@@ -0,0 +1 @@
+C2E04B00B3F087DB143B4BB6411813BA220ED4BA

+ 7 - 1
prepare-gpgsm-params

@@ -2,10 +2,11 @@
 # PYTHON_ARGCOMPLETE_OK
 
 
-def fill_template(template, subject_keygrip):
+def fill_template(template, subject_keygrip, issuer_keygrip):
 
     print(template.read().strip().format(**{
         'subject-keygrip': subject_keygrip,
+        'issuer-keygrip': issuer_keygrip,
     }))
 
 
@@ -23,6 +24,11 @@ def _init_argparser():
         type=str,
         required=True,
     )
+    argparser.add_argument(
+        '--issuer-keygrip',
+        type=str,
+        required=True,
+    )
     return argparser