pyhanko-cli 0.4.0__tar.gz → 0.4.2__tar.gz

{pyhanko_cli-0.4.0/src/pyhanko_cli.egg-info → pyhanko_cli-0.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyhanko-cli
-Version: 0.4.0
+Version: 0.4.2
 Summary: CLI tools for stamping and signing PDF files
 Author-email: Matthias Valvekens <dev@mvalvekens.be>
 Maintainer-email: Matthias Valvekens <dev@mvalvekens.be>
@@ -27,8 +27,9 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: asn1crypto>=1.5.1
 Requires-Dist: tzlocal>=4.3
-Requires-Dist: pyhanko<0.36,>=0.35.0
-Requires-Dist: pyhanko-certvalidator<0.32,>=0.31.0
+Requires-Dist: pyhanko<0.37,>=0.36.1
+Requires-Dist: pyhanko-certvalidator<0.32,>=0.31.4
+Requires-Dist: pyyaml>=6.0
 Requires-Dist: certifi>=2023.5.7
 Requires-Dist: click!=8.2.0,>=8.1.3
 Requires-Dist: platformdirs>=4.3.8

{pyhanko_cli-0.4.0 → pyhanko_cli-0.4.2}/pyhanko_testing_commons/test_data/certomancer_trust_lists.py

@@ -1,4 +1,4 @@
-from typing import List, Tuple
+from datetime import datetime, timezone
 from urllib.parse import urlparse
 
 from aiohttp.test_utils import TestClient
@@ -123,7 +123,11 @@ def certomancer_pki_as_trusted_list(
     pki_arch: PKIArchitecture, tlso_entity: EntityLabel
 ):
     xml_root = ts_119612.TrustServiceStatusList(
-        scheme_information=ts_119612.SchemeInformation(),
+        scheme_information=ts_119612.SchemeInformation(
+            list_issue_date_time=XmlDateTime.from_datetime(
+                datetime.now(tz=timezone.utc)
+            ),
+        ),
         trust_service_provider_list=ts_119612.TrustServiceProviderList(
             trust_service_provider=tuple(
                 ts_119612.TrustServiceProvider(
@@ -139,7 +143,7 @@ def certomancer_pki_as_trusted_list(
 def certomancer_lotl(
     pki_arch: PKIArchitecture,
     lotl_tlso_entity: EntityLabel,
-    entries: List[Tuple[CertLabel, str, str]],
+    entries: list[tuple[CertLabel, str, str]],
 ):
     pointers = [
         ts_119612.OtherTSLPointer(
@@ -173,10 +177,13 @@ def certomancer_lotl(
 
     xml_root = ts_119612.TrustServiceStatusList(
         scheme_information=ts_119612.SchemeInformation(
-            scheme_information_uri=ts_119612.SchemeInformationURI(uri=tuple()),
+            scheme_information_uri=ts_119612.SchemeInformationURI(uri=()),
             pointers_to_other_tsl=ts_119612.PointersToOtherTSL(
                 other_tslpointer=tuple(pointers)
             ),
+            list_issue_date_time=XmlDateTime.from_datetime(
+                datetime.now(tz=timezone.utc)
+            ),
         ),
     )
     return _sign_tl(xml_root, pki_arch, lotl_tlso_entity)

{pyhanko_cli-0.4.0 → pyhanko_cli-0.4.2}/pyhanko_testing_commons/test_data/data/crypto/certomancer.yml

@@ -96,6 +96,32 @@ keysets:
         path: signer.key.pem
       signer2:
         path: signer2.key.pem
+  testing-ca-mldsa:
+    # NOTE: since we haven't rigged Certomancer with MLDSA support yet,
+    # all but the 3 signer keys are ED25519 keys.
+    path-prefix: keys-mldsa
+    keys:
+      root:
+        path: root_ca.key.pem
+      interm:
+        path: intermediate_ca.key.pem
+      tsa:
+        path: tsa.key.pem
+      tsa2:
+        path: tsa2.key.pem
+      interm-ocsp:
+        path: ocsp.key.pem
+      # important: these need to be serialised seed-only!
+      # This requires -provparam "ml-dsa.output_formats=seed-only", at least on the
+      # current latest system openssl version on macos
+      signer1:
+        path: signer_mldsa44.key.pem
+      signer2:
+        path: signer_mldsa44.key.pem
+      signer1_65:
+        path: signer_mldsa65.key.pem
+      signer1_87:
+        path: signer_mldsa87.key.pem
   testing-ca-ed448:
     path-prefix: keys-ed448
     keys:
@@ -389,6 +415,24 @@ pki-architectures:
           signing-key: tsa
           signing-cert: tsa
           digest-algo: sha512
+  testing-ca-mldsa:
+    template: testing-ca
+    keyset: testing-ca-mldsa
+    certs:
+      signer1_65:
+        template: signer1
+        subject: signer1
+        subject-key: signer1_65
+      signer1_87:
+        template: signer1
+        subject: signer1
+        subject-key: signer1_87
+    services:
+      time-stamping:
+        tsa:
+          signing-key: tsa
+          signing-cert: tsa
+          digest-algo: sha512
   testing-ca-ed448:
     template: testing-ca
     keyset: testing-ca-ed448

pyhanko_cli-0.4.2/pyhanko_testing_commons/test_data/data/crypto/keys-mldsa/intermediate_ca.key.pem

@@ -0,0 +1,3 @@
+-----BEGIN PRIVATE KEY-----
+MC4CAQAwBQYDK2VwBCIEIOda8lQywTHCaJMo41Wty19KxsYRmVkMeVtluXPbZUKz
+-----END PRIVATE KEY-----

pyhanko_cli-0.4.2/pyhanko_testing_commons/test_data/data/crypto/keys-mldsa/ocsp.key.pem

@@ -0,0 +1,3 @@
+-----BEGIN PRIVATE KEY-----
+MC4CAQAwBQYDK2VwBCIEIHe0QdstGVyn93jZ3olw/RhgZg5PPz6+M97NkPxy9C2E
+-----END PRIVATE KEY-----

pyhanko_cli-0.4.2/pyhanko_testing_commons/test_data/data/crypto/keys-mldsa/root_ca.key.pem

@@ -0,0 +1,3 @@
+-----BEGIN PRIVATE KEY-----
+MC4CAQAwBQYDK2VwBCIEIAqHl17UGu2zm3JiOFLmd630o5Dp9Q8PaCMa8odKs5XZ
+-----END PRIVATE KEY-----

pyhanko_cli-0.4.2/pyhanko_testing_commons/test_data/data/crypto/keys-mldsa/signer_mldsa44.key.pem

@@ -0,0 +1,4 @@
+-----BEGIN PRIVATE KEY-----
+MDQCAQAwCwYJYIZIAWUDBAMRBCKAIB/aBy4/Jhodmoqq8yx3Pd4YOI96ML19+Cg6
+Ef7jxMZf
+-----END PRIVATE KEY-----

pyhanko_cli-0.4.2/pyhanko_testing_commons/test_data/data/crypto/keys-mldsa/signer_mldsa65.key.pem

@@ -0,0 +1,4 @@
+-----BEGIN PRIVATE KEY-----
+MDQCAQAwCwYJYIZIAWUDBAMSBCKAIGVTGORNhhtxh6VRoylNkskhaf4m8oDlgwlx
+FgjJuO7B
+-----END PRIVATE KEY-----

pyhanko_cli-0.4.2/pyhanko_testing_commons/test_data/data/crypto/keys-mldsa/signer_mldsa87.key.pem

@@ -0,0 +1,4 @@
+-----BEGIN PRIVATE KEY-----
+MDQCAQAwCwYJYIZIAWUDBAMTBCKAIJLJVt3d4b+5fySpycv+sAuvxGZ1Q09wI96J
+RjgFmN31
+-----END PRIVATE KEY-----

pyhanko_cli-0.4.2/pyhanko_testing_commons/test_data/data/crypto/keys-mldsa/tsa.key.pem

@@ -0,0 +1,3 @@
+-----BEGIN PRIVATE KEY-----
+MC4CAQAwBQYDK2VwBCIEIGmqhL3f2qcnzS6YCeS7OuDWczsjC8Egm89kjpJJKJnT
+-----END PRIVATE KEY-----

pyhanko_cli-0.4.2/pyhanko_testing_commons/test_data/data/crypto/keys-mldsa/tsa2.key.pem

@@ -0,0 +1,3 @@
+-----BEGIN PRIVATE KEY-----
+MC4CAQAwBQYDK2VwBCIEIBnT0PW5V4mwUbPAuKlJoq3HqjEmUbWPv2v4gJl6QuTE
+-----END PRIVATE KEY-----

{pyhanko_cli-0.4.0 → pyhanko_cli-0.4.2}/pyhanko_testing_commons/test_data/data/crypto/testing-ca-setup/pkcs11-setup-certomancer.sh

@@ -10,6 +10,7 @@ cleanup() {
   softhsm2-util --delete-token --token testdsa
   softhsm2-util --delete-token --token tested25519
   softhsm2-util --delete-token --token tested448
+  softhsm2-util --delete-token --token testmldsa
 }
 
 softhsm2-util --init-token --label testecdsa --pin 1234 --so-pin 5678 --free
@@ -17,9 +18,10 @@ softhsm2-util --init-token --label testrsa --pin 1234 --so-pin 5678 --free
 softhsm2-util --init-token --label testdsa --pin 1234 --so-pin 5678 --free
 softhsm2-util --init-token --label tested25519 --pin 1234 --so-pin 5678 --free
 softhsm2-util --init-token --label tested448 --pin 1234 --so-pin 5678 --free
+softhsm2-util --init-token --label testmldsa --pin 1234 --so-pin 5678 --free
 
 alchemise() {
-  uv run --exact --group testing --extra pkcs11 \
+  uv run --exact --group testing-pkcs11-setup \
      certomancer --config "$CERTOMANCER_CONFIG_PATH" alch --cert signer1 \
      --include-chain --pin 1234 --module "$SOFTHSM2_MODULE_PATH" \
      --token-label $1 $2
@@ -30,3 +32,7 @@ alchemise testecdsa testing-ca-ecdsa
 alchemise testdsa testing-ca-dsa
 alchemise tested25519 testing-ca-ed25519
 alchemise tested448 testing-ca-ed448
+
+if [[ "$P11_PQC" = yes ]] ; then
+  alchemise testmldsa testing-ca-mldsa
+fi

pyhanko_cli-0.4.2/pyhanko_testing_commons/test_data/data/pdf/layout-tests/default-font.pdf

@@ -0,0 +1,138 @@
+%PDF-1.7
+%¥±ë
+1 0 obj
+<<
+/Type /Catalog
+/Pages 2 0 R
+>>
+endobj
+2 0 obj
+<<
+/Type /Pages
+/Count 1
+/Kids [ 4 0 R ]
+>>
+endobj
+3 0 obj
+<<
+/Length 0
+>>
+stream
+
+endstream
+endobj
+4 0 obj
+<<
+/Type /Page
+/MediaBox [ 0 0 595 842 ]
+/Resources 11 0 R
+/Contents 8 0 R
+/Parent 2 0 R
+>>
+endobj
+5 0 obj
+<<
+/Type /FontDescriptor
+/FontName /Courier
+/Flags 35
+/FontBBox [ -23 -250 715 805 ]
+/Ascent 629
+/Descent -157
+/CapHeight 629
+/ItalicAngle 0
+/StemV 51
+/MissingWidth 600
+/AvgWidth 600
+/MaxWidth 600
+>>
+endobj
+6 0 obj
+<<
+/BBox [ 0 40 74 0 ]
+/Resources <<
+/Font <<
+/F1 <<
+/Type /Font
+/BaseFont /Courier
+/Subtype /Type1
+/Encoding /WinAnsiEncoding
+/FirstChar 32
+/LastChar 32
+/Widths [ 600 ]
+/FontDescriptor 5 0 R
+>>
+>>
+>>
+/Type /XObject
+/Subtype /Form
+/Length 156
+>>
+stream
+q q 1 0 0 1 0 0 cm 1 0 0 1 10 10 cm /Tx BMC q BT /F1 10 Tf 10 TL /F1 10 Tf 10 TL 0 10 Td (Test Test) Tj T* (test test) Tj T* ET Q EMC Q 3 w 0 0 74 40 re S Q
+endstream
+endobj
+7 0 obj
+<<
+/Length 1
+>>
+stream
+q
+endstream
+endobj
+8 0 obj
+[ 7 0 R 3 0 R 9 0 R 10 0 R ]
+endobj
+9 0 obj
+<<
+/Length 1
+>>
+stream
+Q
+endstream
+endobj
+10 0 obj
+<<
+/Length 63
+>>
+stream
+q 1 0 0 1 30 120 cm /Stamp0eaaa1d6ce1343d682b66ac385aa51bc Do Q
+endstream
+endobj
+11 0 obj
+<<
+/XObject <<
+/Stamp0eaaa1d6ce1343d682b66ac385aa51bc 6 0 R
+>>
+>>
+endobj
+12 0 obj
+<<
+/ModDate (D\07220260624225710\05302\04700\047)
+/Producer (pyHanko 0\0560\0560\056dev1)
+>>
+endobj
+xref
+0 13
+0000000000 65535 f 
+0000000017 00000 n 
+0000000066 00000 n 
+0000000125 00000 n 
+0000000174 00000 n 
+0000000281 00000 n 
+0000000496 00000 n 
+0000000931 00000 n 
+0000000981 00000 n 
+0000001025 00000 n 
+0000001075 00000 n 
+0000001189 00000 n 
+0000001271 00000 n 
+trailer
+<<
+/Root 1 0 R
+/Info 12 0 R
+/ID [ <ff6759a3abc39542eaed5fbab155e8e9> <127f7da69b2fe0e63f113bf55002e384> ]
+/Size 13
+>>
+startxref
+1380
+%%EOF