openbsd/src
1
0
Fork 0
mirror of https://github.com/openbsd/src.git synced 2026-04-23 05:34:18 +00:00
Code Issues Projects Releases Wiki Activity

rpki-client regress: initial plumbing to make this work with OpenSSL 4.0

Browse Source
This commit is contained in:
tb
2026-03-27 19:55:35 +00:00
parent f43b20dd87
commit ddc5737dc1
3 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
regress/usr.sbin/rpki-client/openssl/Makefile
View File

@@ -1,7 +1,11 @@
# $OpenBSD: Makefile,v 1.8 2026/03/27 18:00:17 tb Exp $
# $OpenBSD: Makefile,v 1.9 2026/03/27 19:55:35 tb Exp $
EOPENSSL = eopenssl35
.if ${EOPENSSL} != "eopenssl35"
CFLAGS += -DHAVE_X509_CRL_GET0_SIGALG
.endif
LDADD += -Wl,-rpath,/usr/local/lib/${EOPENSSL} -L/usr/local/lib/${EOPENSSL}
CFLAGS += -I${.CURDIR}/ -I/usr/local/include/${EOPENSSL}/
CFLAGS += -DOPENSSL_SUPPRESS_DEPRECATED

6
regress/usr.sbin/rpki-client/openssl/build/Makefile
View File

@@ -1,7 +1,11 @@
# $OpenBSD: Makefile,v 1.5 2026/03/27 19:54:10 tb Exp $
# $OpenBSD: Makefile,v 1.6 2026/03/27 19:55:35 tb Exp $
EOPENSSL = eopenssl35
.if ${EOPENSSL} != "eopenssl35"
CFLAGS += -DHAVE_X509_CRL_GET0_SIGALG
.endif
regress: all
.if (exists(/usr/local/lib/${EOPENSSL}/libcrypto.a) && \

4
regress/usr.sbin/rpki-client/openssl/unistd.h
View File

@@ -1,4 +1,4 @@
/* $OpenBSD: unistd.h,v 1.4 2025/08/19 11:31:48 job Exp $ */
/* $OpenBSD: unistd.h,v 1.5 2026/03/27 19:55:35 tb Exp $ */
/*
* Public domain
* compatibility shim for OpenSSL 3
@@ -31,6 +31,7 @@ CMS_SignerInfo_get_version(CMS_SignerInfo *si, long *version)
return 1;
}
#if !HAVE_X509_CRL_GET0_SIGALG
static inline const X509_ALGOR *
X509_CRL_get0_tbs_sigalg(const X509_CRL *crl)
{
@@ -39,5 +40,6 @@ X509_CRL_get0_tbs_sigalg(const X509_CRL *crl)
X509_CRL_get0_signature(crl, NULL, &alg);
return alg;
}
#endif
#endif /* ! RPKI_CLIENT_UNISTD_H */