summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorjsing <>2021-06-30 18:09:46 +0000
committerjsing <>2021-06-30 18:09:46 +0000
commitd0f43669a52c03e742d057eb68e647758c94799f (patch)
treeb8681eee4950832b5bd131a35e7c615703932d8e /src
parent4d5427125387cb1cb51a22fc68ee6aaf9f6dcd65 (diff)
downloadopenbsd-d0f43669a52c03e742d057eb68e647758c94799f.tar.gz
openbsd-d0f43669a52c03e742d057eb68e647758c94799f.tar.bz2
openbsd-d0f43669a52c03e742d057eb68e647758c94799f.zip
Pull in ssl_locl.h to allow for move of struct ssl_session_st.
Diffstat (limited to 'src')
-rw-r--r--src/regress/lib/libssl/asn1/Makefile3
-rw-r--r--src/regress/lib/libssl/asn1/asn1test.c4
2 files changed, 5 insertions, 2 deletions
diff --git a/src/regress/lib/libssl/asn1/Makefile b/src/regress/lib/libssl/asn1/Makefile
index f4a57933e2..16fca9f6ca 100644
--- a/src/regress/lib/libssl/asn1/Makefile
+++ b/src/regress/lib/libssl/asn1/Makefile
@@ -1,4 +1,4 @@
1# $OpenBSD: Makefile,v 1.1 2014/07/13 16:03:54 jsing Exp $ 1# $OpenBSD: Makefile,v 1.2 2021/06/30 18:09:46 jsing Exp $
2 2
3PROG= asn1test 3PROG= asn1test
4LDADD= -lcrypto -lssl 4LDADD= -lcrypto -lssl
@@ -6,5 +6,6 @@ DPADD= ${LIBCRYPTO} ${LIBSSL}
6 6
7WARNINGS= Yes 7WARNINGS= Yes
8CFLAGS+= -DLIBRESSL_INTERNAL -Werror 8CFLAGS+= -DLIBRESSL_INTERNAL -Werror
9CFLAGS+= -I${.CURDIR}/../../../../lib/libssl
9 10
10.include <bsd.regress.mk> 11.include <bsd.regress.mk>
diff --git a/src/regress/lib/libssl/asn1/asn1test.c b/src/regress/lib/libssl/asn1/asn1test.c
index 13f3d10673..18a9713878 100644
--- a/src/regress/lib/libssl/asn1/asn1test.c
+++ b/src/regress/lib/libssl/asn1/asn1test.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: asn1test.c,v 1.7 2021/03/22 20:05:21 tb Exp $ */ 1/* $OpenBSD: asn1test.c,v 1.8 2021/06/30 18:09:46 jsing Exp $ */
2/* 2/*
3 * Copyright (c) 2014, 2016 Joel Sing <jsing@openbsd.org> 3 * Copyright (c) 2014, 2016 Joel Sing <jsing@openbsd.org>
4 * 4 *
@@ -23,6 +23,8 @@
23#include <openssl/ssl.h> 23#include <openssl/ssl.h>
24#include <openssl/tls1.h> 24#include <openssl/tls1.h>
25 25
26#include "ssl_locl.h"
27
26int i2d_SSL_SESSION(SSL_SESSION *in, unsigned char **pp); 28int i2d_SSL_SESSION(SSL_SESSION *in, unsigned char **pp);
27SSL_SESSION *d2i_SSL_SESSION(SSL_SESSION **a, const unsigned char **pp, 29SSL_SESSION *d2i_SSL_SESSION(SSL_SESSION **a, const unsigned char **pp,
28 long length); 30 long length);