Skip to content

vtc_tls: openssl-4.0 fixes #7

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
daghf wants to merge 3 commits into
base: main
Choose a base branch
from
Open

vtc_tls: openssl-4.0 fixes #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
37c1b46
vtc_tls: Drop VTC_ASN1_TIME_to_tm compatibility layering
daghf Apr 15, 2026
64fa0cb
vtc_tls: Properly ignore BIO_reset() return
daghf Apr 15, 2026
c50ca58
vtc_tls: Const fixes for openssl-4.0
daghf Apr 15, 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
263 changes: 0 additions & 263 deletions src/vtc_asn_gentm.c
View file
Open in desktop

This file was deleted.

18 changes: 4 additions & 14 deletions src/vtc_tls.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ cert_load(struct vtclog *vl, struct tlsctx *cfg, BIO *src)
vtc_fatal(vl, "Unable to configure cert chain");
}

BIO_reset(src);
(void)BIO_reset(src);
pk = PEM_read_bio_PrivateKey(src, NULL, NULL, NULL);
if (pk == NULL) {
vtc_tlserr(vl);
Expand Down Expand Up @@ -985,10 +985,10 @@ cert_resolve(SSL *s, unsigned long idx)
}

static char *
get_CN(X509_NAME *n)
get_CN(const X509_NAME *n)
{
int i;
X509_NAME_ENTRY *x509_ne;
const X509_NAME_ENTRY *x509_ne;
char *p, *r;

if (!n)
Expand Down Expand Up @@ -1139,9 +1139,6 @@ static const char *OCSP_RESP_STATUS = "tls.ocsp_resp_status";
static const char *OCSP_VERIFY = "tls.ocsp_verify";
static const char *OCSP_THIS_UPDATE = "tls.ocsp_this_update";

int
VTC_ASN1_TIME_to_tm(const ASN1_GENERALIZEDTIME *d, struct tm *tm);

static const char *
var_ocsp_status(const char *what, const struct http *hp,
struct tlsctx *cfg, struct tlsconn *c)
Expand Down Expand Up @@ -1267,14 +1264,7 @@ var_ocsp_status(const char *what, const struct http *hp,
assert(what == OCSP_THIS_UPDATE);
vsb = VSB_new_auto();
AN(vsb);
VTC_ASN1_TIME_to_tm(asn_thisupd, &tm);
/*
* Replace with OpenSSL's ASN1_TIME_to_tm once we get
* rid of EL7.
*
* (git blame and revert the commit matching these
* lines)
*/
ASN1_TIME_to_tm(asn_thisupd, &tm);
VSB_printf(vsb, "%d-%.02d-%.02dT%.02d:%.02d:%.02dZ",
tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday,
tm.tm_hour, tm.tm_min, tm.tm_sec);
Expand Down