From 3d053f9322fef13dc9dac15762085abae96ca891 Mon Sep 17 00:00:00 2001
From: jsing <>
Date: Sat, 20 Nov 2021 18:10:52 +0000
Subject: Provide the bytestring APIs for libcrypto internal use.

Bring a copy of the bytestring APIs (CBB/CBS) from libssl, for use in
libcrypto - these are not exposed publicly.

Discussed with beck@ and tb@
---
 src/lib/libcrypto/Makefile | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'src/lib/libcrypto/Makefile')

diff --git a/src/lib/libcrypto/Makefile b/src/lib/libcrypto/Makefile
index 3f4014409d..fba3871e73 100644
--- a/src/lib/libcrypto/Makefile
+++ b/src/lib/libcrypto/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.49 2021/11/01 20:53:08 tb Exp $
+# $OpenBSD: Makefile,v 1.50 2021/11/20 18:10:52 jsing Exp $
 
 LIB=	crypto
 LIBREBUILD=y
@@ -28,8 +28,8 @@ CFLAGS+= -DDSO_DLFCN -DHAVE_DLFCN_H -DHAVE_FUNOPEN
 CFLAGS+= -DOPENSSL_NO_HW_PADLOCK # XXX enable this?
 
 CFLAGS+= -I${LCRYPTO_SRC}
-CFLAGS+= -I${LCRYPTO_SRC}/asn1 -I${LCRYPTO_SRC}/bn -I${LCRYPTO_SRC}/evp
-CFLAGS+= -I${LCRYPTO_SRC}/modes -I${LCRYPTO_SRC}/x509
+CFLAGS+= -I${LCRYPTO_SRC}/asn1 -I${LCRYPTO_SRC}/bn -I${LCRYPTO_SRC}/bytestring
+CFLAGS+= -I${LCRYPTO_SRC}/evp -I${LCRYPTO_SRC}/modes -I${LCRYPTO_SRC}/x509
 
 # XXX FIXME ecdsa and ec should be merged
 CFLAGS+= -I${LCRYPTO_SRC}/ecdsa
@@ -85,6 +85,9 @@ SRCS+= bn_depr.c bn_const.c bn_x931p.c
 # buffer/
 SRCS+= buffer.c buf_err.c buf_str.c
 
+# bytestring/
+SRCS+= bs_ber.c bs_cbb.c bs_cbs.c
+
 # camellia/
 SRCS+= cmll_cfb.c cmll_ctr.c cmll_ecb.c cmll_ofb.c
 
@@ -290,6 +293,7 @@ SRCS+= pcy_cache.c pcy_node.c pcy_data.c pcy_map.c pcy_tree.c pcy_lib.c
 	${LCRYPTO_SRC}/bn \
 	${LCRYPTO_SRC}/bn/asm \
 	${LCRYPTO_SRC}/buffer \
+	${LCRYPTO_SRC}/bytestring \
 	${LCRYPTO_SRC}/camellia \
 	${LCRYPTO_SRC}/cast \
 	${LCRYPTO_SRC}/chacha \
-- 
cgit v1.2.3-55-g6feb