diff options
author | Theo Buehler <tb@cvs.openbsd.org> | 2024-09-04 04:34:15 +0000 |
---|---|---|
committer | Theo Buehler <tb@cvs.openbsd.org> | 2024-09-04 04:34:15 +0000 |
commit | 72879fa9c6e81cf4286cae5b3631b95150b2d51b (patch) | |
tree | 9f0316d815c5fff734e90ff07d1593a082e6446a /regress | |
parent | f9fbda689ab60198f910fce10f81af9a7091dfc7 (diff) |
Add regress against OpenSSL 3.2
OpenSSL 1.1 is dead. This directory will use the default version in ports
(currently 3.2) for regress testing.
Diffstat (limited to 'regress')
-rw-r--r-- | regress/usr.sbin/rpki-client/openssl/Makefile | 10 | ||||
-rw-r--r-- | regress/usr.sbin/rpki-client/openssl/unistd.h | 28 |
2 files changed, 38 insertions, 0 deletions
diff --git a/regress/usr.sbin/rpki-client/openssl/Makefile b/regress/usr.sbin/rpki-client/openssl/Makefile new file mode 100644 index 00000000000..2d5ce4cd64b --- /dev/null +++ b/regress/usr.sbin/rpki-client/openssl/Makefile @@ -0,0 +1,10 @@ +# $OpenBSD: Makefile,v 1.1 2024/09/04 04:34:14 tb Exp $ + +EOPENSSL = eopenssl32 + +LDADD += -Wl,-rpath,/usr/local/lib/${EOPENSSL} -L/usr/local/lib/${EOPENSSL} +CFLAGS += -I${.CURDIR}/ -I/usr/local/include/${EOPENSSL}/ + +.PATH: ${.CURDIR}/.. + +.include <bsd.regress.mk> diff --git a/regress/usr.sbin/rpki-client/openssl/unistd.h b/regress/usr.sbin/rpki-client/openssl/unistd.h new file mode 100644 index 00000000000..9aa40242b1f --- /dev/null +++ b/regress/usr.sbin/rpki-client/openssl/unistd.h @@ -0,0 +1,28 @@ +/* + * Public domain + * compatibility shim for OpenSSL 3 + * overloading unistd.h is a ugly guly hack for this issue but works here + */ + +#include_next <unistd.h> + +#include <openssl/cms.h> +#include <openssl/stack.h> + +#ifndef DECLARE_STACK_OF +#define DECLARE_STACK_OF DEFINE_STACK_OF +#endif + +static inline int +CMS_get_version(CMS_ContentInfo *cms, long *version) +{ + *version = 3; + return 1; +} + +static inline int +CMS_SignerInfo_get_version(CMS_SignerInfo *si, long *version) +{ + *version = 3; + return 1; +} |