Pārlūkot izejas kodu

define expiry date in file expiry-datetime

Fabian Peter Hammerle 8 gadi atpakaļ
vecāks
revīzija
8157d336fe
4 mainītis faili ar 17 papildinājumiem un 2 dzēšanām
  1. 2 1
      Makefile
  2. 1 0
      expiry-datetime
  3. 1 0
      gpgsm-params-template
  4. 13 1
      prepare-gpgsm-params

+ 2 - 1
Makefile

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

+ 1 - 0
expiry-datetime

@@ -0,0 +1 @@
+2017-07-02T12:03:28+02:00

+ 1 - 0
gpgsm-params-template

@@ -6,6 +6,7 @@ Serial: random
 Name-DN: CN=client,C=AT
 Hash-Algo: SHA256
 Issuer-DN: CN=Fabian Peter Hammerle,C=AT
+Not-After: {not-after}
 Subject-Key-Id: {subject-keygrip}
 Signing-Key: {issuer-keygrip}
 Authority-Key-Id: {issuer-keygrip}

+ 13 - 1
prepare-gpgsm-params

@@ -1,12 +1,19 @@
 #!/usr/bin/env python3
 # PYTHON_ARGCOMPLETE_OK
 
+import dateutil.parser
+import pytz
 
-def fill_template(template, subject_keygrip, issuer_keygrip):
+
+def fill_template(template, subject_keygrip, issuer_keygrip, expiry_datetime):
 
     print(template.read().strip().format(**{
         'subject-keygrip': subject_keygrip,
         'issuer-keygrip': issuer_keygrip,
+        'not-after': dateutil.parser.parse(expiry_datetime)
+                        .astimezone(pytz.utc)
+                        .replace(tzinfo=None)
+                        .isoformat(sep=' '),
     }))
 
 
@@ -29,6 +36,11 @@ def _init_argparser():
         type=str,
         required=True,
     )
+    argparser.add_argument(
+        '--expiry-datetime',
+        type=str,
+        required=True,
+    )
     return argparser