summaryrefslogtreecommitdiff
path: root/lib/libssl/ssl
diff options
context:
space:
mode:
authorDoug Hogan <doug@cvs.openbsd.org>2015-02-06 09:36:17 +0000
committerDoug Hogan <doug@cvs.openbsd.org>2015-02-06 09:36:17 +0000
commitf21819e8cde3e96e30bd3d33f7a39427a83440d1 (patch)
tree1b78fa5c4aecc53eabc9799a24b90bad778abbde /lib/libssl/ssl
parentef9142d6c15b7299e01ec1fdc7dc23f45305ad15 (diff)
Import BoringSSL's crypto bytestring and crypto bytebuilder APIs.
This is imported with as few changes as possible for the initial commit. I removed OPENSSL_EXPORT, replaced OPENSSL_malloc() etc with malloc() and changed a few header includes. BoringSSL has this as part of their public API. We're leaving it internal to libssl for now. Based on BoringSSL's CBB/CBS API as of commit c5cc15b4f5b1d6e9b9112cb8d30205a638aa2c54. input + ok jsing@, miod@
Diffstat (limited to 'lib/libssl/ssl')
-rw-r--r--lib/libssl/ssl/Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/libssl/ssl/Makefile b/lib/libssl/ssl/Makefile
index 226ba681b66..c8f954d43ef 100644
--- a/lib/libssl/ssl/Makefile
+++ b/lib/libssl/ssl/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.47 2014/07/12 03:27:23 deraadt Exp $
+# $OpenBSD: Makefile,v 1.48 2015/02/06 09:36:16 doug Exp $
LIB= ssl
@@ -27,6 +27,7 @@ SRCS=\
bio_ssl.c ssl_err.c t1_reneg.c \
pqueue.c
SRCS+= s3_cbc.c
+SRCS+= bs_ber.c bs_cbb.c bs_cbs.c
HDRS= srtp.h ssl.h ssl2.h ssl3.h ssl23.h tls1.h dtls1.h