summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortb <>2023-04-25 19:48:24 +0000
committertb <>2023-04-25 19:48:24 +0000
commitc7d8f40ceb118368f3ddb75b6f72df6736a7e954 (patch)
tree33e68fd34d1d2677c8379a23b2cb066dce5d292b
parentc15f0d490350cb45d0df52ab77bd6a5f6183b63c (diff)
downloadopenbsd-c7d8f40ceb118368f3ddb75b6f72df6736a7e954.tar.gz
openbsd-c7d8f40ceb118368f3ddb75b6f72df6736a7e954.tar.bz2
openbsd-c7d8f40ceb118368f3ddb75b6f72df6736a7e954.zip
bio_asn1: adjust for more recent churn
-rw-r--r--src/regress/lib/libcrypto/bio/Makefile4
-rw-r--r--src/regress/lib/libcrypto/bio/bio_asn1.c4
2 files changed, 6 insertions, 2 deletions
diff --git a/src/regress/lib/libcrypto/bio/Makefile b/src/regress/lib/libcrypto/bio/Makefile
index 3084f06d32..0402e3939a 100644
--- a/src/regress/lib/libcrypto/bio/Makefile
+++ b/src/regress/lib/libcrypto/bio/Makefile
@@ -1,4 +1,4 @@
1# $OpenBSD: Makefile,v 1.6 2023/04/25 15:29:17 tb Exp $ 1# $OpenBSD: Makefile,v 1.7 2023/04/25 19:48:24 tb Exp $
2 2
3PROGS += bio_asn1 3PROGS += bio_asn1
4PROGS += bio_chain 4PROGS += bio_chain
@@ -9,7 +9,9 @@ LDADD = -lcrypto
9DPADD = ${LIBCRYPTO} 9DPADD = ${LIBCRYPTO}
10WARNINGS = Yes 10WARNINGS = Yes
11CFLAGS += -DLIBRESSL_INTERNAL -Werror 11CFLAGS += -DLIBRESSL_INTERNAL -Werror
12CFLAGS += -I${.CURDIR}/../../../../lib/libcrypto/asn1/
12CFLAGS += -I${.CURDIR}/../../../../lib/libcrypto/bio/ 13CFLAGS += -I${.CURDIR}/../../../../lib/libcrypto/bio/
14CFLAGS += -I${.CURDIR}/../../../../lib/libcrypto/bytestring/
13 15
14LDADD_bio_asn1 = ${CRYPTO_INT} 16LDADD_bio_asn1 = ${CRYPTO_INT}
15 17
diff --git a/src/regress/lib/libcrypto/bio/bio_asn1.c b/src/regress/lib/libcrypto/bio/bio_asn1.c
index ac7f48ced8..abb1642372 100644
--- a/src/regress/lib/libcrypto/bio/bio_asn1.c
+++ b/src/regress/lib/libcrypto/bio/bio_asn1.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: bio_asn1.c,v 1.2 2023/03/31 06:07:44 tb Exp $ */ 1/* $OpenBSD: bio_asn1.c,v 1.3 2023/04/25 19:48:24 tb Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2023 Theo Buehler <tb@openbsd.org> 4 * Copyright (c) 2023 Theo Buehler <tb@openbsd.org>
@@ -27,6 +27,8 @@
27#include <openssl/objects.h> 27#include <openssl/objects.h>
28#include <openssl/pkcs7.h> 28#include <openssl/pkcs7.h>
29 29
30#include "asn1_local.h"
31
30/* 32/*
31 * Minimal reproducer for the BIO_new_NDEF() write after free fixed in 33 * Minimal reproducer for the BIO_new_NDEF() write after free fixed in
32 * bio_ndef.c r1.13. 34 * bio_ndef.c r1.13.