diff options
author | tb <> | 2023-04-25 19:48:24 +0000 |
---|---|---|
committer | tb <> | 2023-04-25 19:48:24 +0000 |
commit | c7d8f40ceb118368f3ddb75b6f72df6736a7e954 (patch) | |
tree | 33e68fd34d1d2677c8379a23b2cb066dce5d292b | |
parent | c15f0d490350cb45d0df52ab77bd6a5f6183b63c (diff) | |
download | openbsd-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/Makefile | 4 | ||||
-rw-r--r-- | src/regress/lib/libcrypto/bio/bio_asn1.c | 4 |
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 | ||
3 | PROGS += bio_asn1 | 3 | PROGS += bio_asn1 |
4 | PROGS += bio_chain | 4 | PROGS += bio_chain |
@@ -9,7 +9,9 @@ LDADD = -lcrypto | |||
9 | DPADD = ${LIBCRYPTO} | 9 | DPADD = ${LIBCRYPTO} |
10 | WARNINGS = Yes | 10 | WARNINGS = Yes |
11 | CFLAGS += -DLIBRESSL_INTERNAL -Werror | 11 | CFLAGS += -DLIBRESSL_INTERNAL -Werror |
12 | CFLAGS += -I${.CURDIR}/../../../../lib/libcrypto/asn1/ | ||
12 | CFLAGS += -I${.CURDIR}/../../../../lib/libcrypto/bio/ | 13 | CFLAGS += -I${.CURDIR}/../../../../lib/libcrypto/bio/ |
14 | CFLAGS += -I${.CURDIR}/../../../../lib/libcrypto/bytestring/ | ||
13 | 15 | ||
14 | LDADD_bio_asn1 = ${CRYPTO_INT} | 16 | LDADD_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. |