Skip to content

Auto-regenerate expired self-signed certificates #1590

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lzwind wants to merge 2 commits into
base: master
Choose a base branch
from
+29 −3
Open

Auto-regenerate expired self-signed certificates #1590

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8b56e1b
Auto-regenerate expired self-signed certificates
lzwind Jun 2, 2026
b76057b
Fix cupsGetCredentialsExpiration() called with a file path
lzwind Jul 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion cups/tls-gnutls.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1833,10 +1833,23 @@ _httpTLSStart(http_t *http) // I - Connection to server
// Use the CA certs...
cupsCopyString(crtfile, cacrtfile, sizeof(crtfile));
cupsCopyString(keyfile, cakeyfile, sizeof(keyfile));

have_creds = true;
}
}
else
{
// CUPS-managed self-signed certs: use them only if they have
// not expired, otherwise let the auto-create code path below
// regenerate them (Issue #1519). cupsGetCredentialsExpiration()
// expects a PEM string, not a file path, so load the cert via
// cupsCopyCredentials() first.
char *creds = cupsCopyCredentials(tls_keypath, cn);
// PEM-encoded certificate

have_creds = !access(crtfile, R_OK) && !access(keyfile, R_OK);
have_creds = creds && cupsGetCredentialsExpiration(creds) > time(NULL);
free(creds);
}
}

if (!have_creds && tls_auto_create && cn)
Expand Down
17 changes: 15 additions & 2 deletions cups/tls-openssl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1897,10 +1897,23 @@ _httpTLSStart(http_t *http) // I - Connection to server
// Use the CA certs...
cupsCopyString(crtfile, cacrtfile, sizeof(crtfile));
cupsCopyString(keyfile, cakeyfile, sizeof(keyfile));

have_creds = true;
}
}

have_creds = !access(crtfile, R_OK) && !access(keyfile, R_OK);
else
{
// CUPS-managed self-signed certs: use them only if they have
// not expired, otherwise let the auto-create code path below
// regenerate them (Issue #1519). cupsGetCredentialsExpiration()
// expects a PEM string, not a file path, so load the cert via
// cupsCopyCredentials() first.
char *creds = cupsCopyCredentials(tls_keypath, cn);
// PEM-encoded certificate

have_creds = creds && cupsGetCredentialsExpiration(creds) > time(NULL);
free(creds);
}
}

if (!have_creds && tls_auto_create && cn)
Expand Down