Merge branch 'main' into fix/eu_integration

Author: peppelinux

pymdoccbor/mdoc/__init__.py

@@ -4,8 +4,15 @@
 import secrets
 import uuid
 
+
 from pycose.headers import Algorithm
 from pycose.keys import CoseKey
+
+from datetime import timezone
+
+from pycose.headers import Algorithm #, KID
+from pycose.keys import CoseKey, EC2Key
+
 from pycose.messages import Sign1Message
 
 from typing import Union
@@ -167,10 +174,12 @@ def sign(
 
         :return: Sign1Message: the signed mso
         """
+
         utcnow = datetime.datetime.utcnow()
         valid_from = datetime.datetime.strptime(
             self.validity["issuance_date"], "%Y-%m-%d"
         )
+
         if settings.PYMDOC_EXP_DELTA_HOURS:
             exp = utcnow + datetime.timedelta(hours=settings.PYMDOC_EXP_DELTA_HOURS)
         else:

pymdoccbor/mso/issuer.py

@@ -1,7 +1,13 @@
 import datetime
 import os
 
-COSEKEY_HAZMAT_CRV_MAP = {"secp256r1": "P_256"}
+from datetime import timezone
+
+COSEKEY_HAZMAT_CRV_MAP = {
+    "secp256r1": "P_256",
+    "secp384r1": "P_384",
+    "secp521r1":  "P_521"
+}
 
 CRV_LEN_MAP = {
     "secp256r1": 32,
@@ -22,17 +28,19 @@
 
 # OR
 
-X509_COUNTRY_NAME = os.getenv("X509_COUNTRY_NAME", "US")
-X509_STATE_OR_PROVINCE_NAME = os.getenv("X509_STATE_OR_PROVINCE_NAME", "California")
-X509_LOCALITY_NAME = os.getenv("X509_LOCALITY_NAME", "San Francisco")
-X509_ORGANIZATION_NAME = os.getenv("X509_ORGANIZATION_NAME", "My Company")
-X509_COMMON_NAME = os.getenv("X509_COMMON_NAME", "mysite.com")
-
-X509_NOT_VALID_BEFORE = os.getenv("X509_NOT_VALID_BEFORE", datetime.datetime.utcnow())
-X509_NOT_VALID_AFTER_DAYS = os.getenv("X509_NOT_VALID_AFTER_DAYS", 10)
-X509_NOT_VALID_AFTER = os.getenv(
-    "X509_NOT_VALID_AFTER",
-    datetime.datetime.utcnow() + datetime.timedelta(days=X509_NOT_VALID_AFTER_DAYS),
+X509_COUNTRY_NAME           = os.getenv('X509_COUNTRY_NAME', "US")
+X509_STATE_OR_PROVINCE_NAME = os.getenv('X509_STATE_OR_PROVINCE_NAME', "California")
+X509_LOCALITY_NAME          = os.getenv('X509_LOCALITY_NAME', "San Francisco")
+X509_ORGANIZATION_NAME      = os.getenv('X509_ORGANIZATION_NAME', "My Company")
+X509_COMMON_NAME            = os.getenv('X509_COMMON_NAME', "mysite.com")
+
+X509_NOT_VALID_BEFORE       = os.getenv('X509_NOT_VALID_BEFORE', datetime.datetime.now(timezone.utc))
+X509_NOT_VALID_AFTER_DAYS   = os.getenv('X509_NOT_VALID_AFTER_DAYS', 10)
+X509_NOT_VALID_AFTER        = os.getenv(
+    'X509_NOT_VALID_AFTER', 
+    datetime.datetime.now(timezone.utc) + datetime.timedelta(
+        days=X509_NOT_VALID_AFTER_DAYS
+    )
 )
 
 X509_SAN_URL = os.getenv(

pymdoccbor/settings.py

@@ -1,7 +1,5 @@
 import re
-
-from glob import glob
-from setuptools import setup
+from setuptools import setup, find_packages
 
 
 def readme():
@@ -27,21 +25,16 @@ def readme():
         "License :: OSI Approved :: Apache Software License",
         "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: 3.11",
+        "Programming Language :: Python :: 3.12",
         "Topic :: Software Development :: Libraries :: Python Modules",
     ],
     url="https://github.com/IdentityPython/pyMDL-MDOC",
     author="Giuseppe De Marco",
     author_email="[email protected]",
     license="License :: OSI Approved :: Apache Software License",
     # scripts=[f'{_pkg_name}/bin/{_pkg_name}'],
-    packages=[f"{_pkg_name}"],
-    package_dir={f"{_pkg_name}": f"{_pkg_name}"},
-    package_data={
-        f"{_pkg_name}": [
-            i.replace(f"{_pkg_name}/", "")
-            for i in glob(f"{_pkg_name}/**", recursive=True)
-        ]
-    },
+    packages=find_packages(include=["pymdoccbor", "pymdoccbor.*"]),
+    include_package_data=True,
     install_requires=[
         "cbor2>=5.4.0,<5.5.0",
         "cwt>=2.3.0,<2.4",