summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortb <>2022-01-14 09:09:30 +0000
committertb <>2022-01-14 09:09:30 +0000
commit569ac6ae47542ab678a23a440d659ae25196fdc7 (patch)
tree003b4c4dc1f9c357b0f5306ebefc3fd50bbbc1f1
parent9d5098600afa65a94c9b2597b3be68dbb6d6a134 (diff)
downloadopenbsd-569ac6ae47542ab678a23a440d659ae25196fdc7.tar.gz
openbsd-569ac6ae47542ab678a23a440d659ae25196fdc7.tar.bz2
openbsd-569ac6ae47542ab678a23a440d659ae25196fdc7.zip
bio_ssl.c needs to peek into bio_local.h
-rw-r--r--src/lib/libssl/Makefile3
-rw-r--r--src/lib/libssl/bio_ssl.c3
2 files changed, 4 insertions, 2 deletions
diff --git a/src/lib/libssl/Makefile b/src/lib/libssl/Makefile
index 565a3f1543..5a0a7bbc02 100644
--- a/src/lib/libssl/Makefile
+++ b/src/lib/libssl/Makefile
@@ -1,4 +1,4 @@
1# $OpenBSD: Makefile,v 1.73 2022/01/05 17:10:02 jsing Exp $ 1# $OpenBSD: Makefile,v 1.74 2022/01/14 09:09:30 tb Exp $
2 2
3.include <bsd.own.mk> 3.include <bsd.own.mk>
4.ifndef NOMAN 4.ifndef NOMAN
@@ -24,6 +24,7 @@ CFLAGS+= -DLIBRESSL_HAS_TLS1_3_SERVER
24CFLAGS+= -DTLS13_DEBUG 24CFLAGS+= -DTLS13_DEBUG
25.endif 25.endif
26CFLAGS+= -I${.CURDIR} 26CFLAGS+= -I${.CURDIR}
27CFLAGS+= -I${.CURDIR}/../libcrypto/bio
27 28
28LDADD+= -L${BSDOBJDIR}/lib/libcrypto -lcrypto 29LDADD+= -L${BSDOBJDIR}/lib/libcrypto -lcrypto
29 30
diff --git a/src/lib/libssl/bio_ssl.c b/src/lib/libssl/bio_ssl.c
index bb40b2a6f7..f2bf376fc2 100644
--- a/src/lib/libssl/bio_ssl.c
+++ b/src/lib/libssl/bio_ssl.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: bio_ssl.c,v 1.31 2021/07/01 17:53:39 jsing Exp $ */ 1/* $OpenBSD: bio_ssl.c,v 1.32 2022/01/14 09:09:30 tb Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -66,6 +66,7 @@
66#include <openssl/err.h> 66#include <openssl/err.h>
67#include <openssl/ssl.h> 67#include <openssl/ssl.h>
68 68
69#include "bio_local.h"
69#include "ssl_locl.h" 70#include "ssl_locl.h"
70 71
71static int ssl_write(BIO *h, const char *buf, int num); 72static int ssl_write(BIO *h, const char *buf, int num);