bug fix with self signed root cert expiration not using sign_end_days…

… in config
gene-git · May 26, 2024 · 6404c07 · 6404c07
1 parent 8bd3059
commit 6404c07
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/Docs/conf.py b/Docs/conf.py
@@ -9,7 +9,7 @@
 project = "ssl-mgr"
 copyright = '2023, Gene C'
 author = 'Gene C'
-release = '3.4.0'
+release = '3.5.0'
 
 # -- General configuration ---------------------------------------------------
 # https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration

diff --git a/packaging/PKGBUILD b/packaging/PKGBUILD
@@ -12,7 +12,7 @@ pkgname='ssl-mgr'
 pkgdesc='Manage (re)new certificates and handle DANE TLSA key rollover'
 _gitname='ssl-mgr'
 
-pkgver=3.4.0
+pkgver=3.5.0
 pkgrel=1
 url="https://github.com/gene-git/ssl-mgr"
 

diff --git a/src/ssl_mgr/__about__.py b/src/ssl_mgr/__about__.py
@@ -3,4 +3,4 @@
 """
 Project ssl-mgr
 """
-__version__ = "3.4.0"
+__version__ = "3.5.0"
diff --git a/src/ssl_mgr/certs/self_sign_cert.py b/src/ssl_mgr/certs/self_sign_cert.py
@@ -83,7 +83,7 @@ def own_sign_cert(db_dir:str, ssl_ca:'SslCA', ssl_csr:SslCsr):
     issuer = ca_cert.subject
 
     time_start =  datetime.now(timezone.utc)
-    days_to_end = max(30, ca_svc.ca.sign_end_days)
+    days_to_end = max(90, ca_svc.ca.sign_end_days)
     time_end = time_start + timedelta(days=days_to_end)
 
     serial = x509.random_serial_number()
@@ -168,7 +168,7 @@ def _self_signed_root_cert(ssl_cert:'SslCert', ssl_csr:SslCsr):
     issuer = csr_subject
 
     time_start =  datetime.now(timezone.utc)
-    days_to_end = min(30, svc.ca.sign_end_days)
+    days_to_end = max(90, svc.ca.sign_end_days)
     time_end = time_start + timedelta(days=days_to_end)
 
     serial = x509.random_serial_number()