Don't generate certificates that expire on Feb 29th (Issue #5643)

diff --git a/CHANGES.md b/CHANGES.md
index 720da4bb6c59f87cbaba59f727d33c449607839b..485a2b614767017a1260d284e2517138a552d158 100644 (file)
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -9,6 +9,8 @@ Changes in CUPS v2.3.1
 - Fixed a crash bug in the web interface (Issue #5621)
 - PPD files containing "custom" option keywords did not work (Issue #5639)
 - Added a workaround for the scheduler's systemd support (Issue #5640)
 - Fixed a crash bug in the web interface (Issue #5621)
 - PPD files containing "custom" option keywords did not work (Issue #5639)
 - Added a workaround for the scheduler's systemd support (Issue #5640)

+- On Windows, TLS certificates generated on February 29 would likely fail
+  (Issue #5643)

 - Added a DigestOptions directive for the `client.conf` file to control whether
   MD5-based Digest authentication is allowed (Issue #5647)
 - Fixed a bug in the handling of printer resource files (Issue #5652)
 - Added a DigestOptions directive for the `client.conf` file to control whether
   MD5-based Digest authentication is allowed (Issue #5647)
 - Fixed a bug in the handling of printer resource files (Issue #5652)

diff --git a/cups/tls-sspi.c b/cups/tls-sspi.c
index 6e3c03b9ec14a74c502b04bb3446ec964ba96bc4..ccbdf8aaf0648d94b0d9019c4885f20fcd58cea0 100644 (file)
--- a/cups/tls-sspi.c
+++ b/cups/tls-sspi.c
@@ -1967,6 +1967,8 @@ http_sspi_make_credentials(
 
   GetSystemTime(&et);
   et.wYear += years;
 
   GetSystemTime(&et);
   et.wYear += years;

+  if (et.wMonth == 2 && et.wDay == 29)
+    et.wDay = 28;                      /* Avoid Feb 29th due to leap years */

 
   ZeroMemory(&exts, sizeof(exts));
 
 
   ZeroMemory(&exts, sizeof(exts));