Skip to content
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

Warn user of expired cert #1411

Open
wants to merge 13 commits into
base: develop
Choose a base branch
from
+42 −5
Open

Warn user of expired cert #1411

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
44ffcfc
Warn user of expired cert
michaelortmann Feb 13, 2023
59031d8
Fix proto
Oct 2, 2023
e73b4cf
Merge remote-tracking branch 'upstream/develop' into exp
Oct 2, 2023
c7fb9e4
print exp cert when owner logged in and daily
Oct 2, 2023
fbd8276
Fix whitespace
Oct 2, 2023
43d2548
Update warning message
vanosg Jul 9, 2024
7b02019
Update warning message spacing
vanosg Jul 9, 2024
11897a9
ifdef tls calls
vanosg Jul 9, 2024
486705a
Merge remote-tracking branch 'upstream/develop' into exp
michaelortmann Jul 9, 2024
3a3dc51
Use X509_cmp_current_time()
michaelortmann Jul 9, 2024
d217294
Add compatibility with openssl 0.9.8+
michaelortmann Jul 9, 2024
2f28d56
Enhance openssl function / library / version check / message
michaelortmann Jul 9, 2024
89b1a8c
Merge remote-tracking branch 'upstream/develop' into exp
michaelortmann Jul 9, 2024
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
1 change: 1 addition & 0 deletions src/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -681,6 +681,7 @@ static void core_secondly()
logs[j].f = NULL;
}
}
verify_cert_expiry();
}
}
if (nowtm.tm_min == notify_users_at)
Expand Down
1 change: 1 addition & 0 deletions src/proto.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,6 +310,7 @@ int readtclprog(char *fname);

/* tls.c */
#ifdef TLS
void verify_cert_expiry();
michaelortmann marked this conversation as resolved.
Show resolved Hide resolved
int ssl_handshake(int, int, int, int, char *, IntFunc);
char *ssl_fpconv(char *in, char *out);
const char *ssl_getuid(int sock);
Expand Down
8 changes: 8 additions & 0 deletions src/tls.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,13 @@ static int ssl_seed(void)
return 0;
}

void verify_cert_expiry() {
michaelortmann marked this conversation as resolved.
Show resolved Hide resolved
X509 *x509;
if ((x509 = SSL_CTX_get0_certificate(ssl_ctx)) &&
(ASN1_TIME_cmp_time_t(X509_get0_notAfter(x509), time(NULL)) < 0))
putlog(LOG_MISC, "*", "WARNING: certificate expired: %s", tls_certfile);
}

/* Prepares and initializes SSL stuff
*
* Creates a context object, supporting SSLv2/v3 & TLSv1 protocols;
Expand Down Expand Up @@ -157,6 +164,7 @@ int ssl_init()
tls_certfile, ERR_error_string(ERR_get_error(), NULL));
fatal("Unable to load TLS certificate (ssl-certificate config setting)!", 0);
}
verify_cert_expiry();
if (SSL_CTX_use_PrivateKey_file(ssl_ctx, tls_keyfile, SSL_FILETYPE_PEM) != 1) {
putlog(LOG_MISC, "*", "ERROR: TLS: unable to load private key from %s: %s",
tls_keyfile, ERR_error_string(ERR_get_error(), NULL));
Expand Down