sync code with last improvements from OpenBSD

This commit is contained in:
purplerain 2023-10-13 19:11:38 +00:00
parent 2ec21d9c19
commit 5903cbe575
Signed by: purplerain
GPG key ID: F42C07F07E2E35B7
36 changed files with 1828 additions and 4203 deletions

View file

@ -1,4 +1,4 @@
/* $OpenBSD: roa.c,v 1.70 2023/09/25 11:08:45 tb Exp $ */
/* $OpenBSD: roa.c,v 1.71 2023/10/13 12:06:49 job Exp $ */
/*
* Copyright (c) 2022 Theo Buehler <tb@openbsd.org>
* Copyright (c) 2019 Kristaps Dzonsons <kristaps@bsd.lv>
@ -257,7 +257,7 @@ roa_parse(X509 **x509, const char *fn, int talid, const unsigned char *der,
goto out;
}
if ((cert = cert_parse_ee_cert(fn, *x509)) == NULL)
if ((cert = cert_parse_ee_cert(fn, talid, *x509)) == NULL)
goto out;
if (cert->asz > 0) {