summaryrefslogtreecommitdiff
path: root/src/lib/libssl/ssl
diff options
context:
space:
mode:
authordoug <>2015-02-06 09:36:16 +0000
committerdoug <>2015-02-06 09:36:16 +0000
commitc1f6acb1132a3014b5f1be04adc57d03d6851dbb (patch)
treed2391ff33b7389336736b59927e6d1763030ef0f /src/lib/libssl/ssl
parent60231b0f71e653d6ca298780f9270b9eb1be6a30 (diff)
downloadopenbsd-c1f6acb1132a3014b5f1be04adc57d03d6851dbb.tar.gz
openbsd-c1f6acb1132a3014b5f1be04adc57d03d6851dbb.tar.bz2
openbsd-c1f6acb1132a3014b5f1be04adc57d03d6851dbb.zip
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 'src/lib/libssl/ssl')
-rw-r--r--src/lib/libssl/ssl/Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/libssl/ssl/Makefile b/src/lib/libssl/ssl/Makefile
index 226ba681b6..c8f954d43e 100644
--- a/src/lib/libssl/ssl/Makefile
+++ b/src/lib/libssl/ssl/Makefile
@@ -1,4 +1,4 @@
1# $OpenBSD: Makefile,v 1.47 2014/07/12 03:27:23 deraadt Exp $ 1# $OpenBSD: Makefile,v 1.48 2015/02/06 09:36:16 doug Exp $
2 2
3LIB= ssl 3LIB= ssl
4 4
@@ -27,6 +27,7 @@ SRCS=\
27 bio_ssl.c ssl_err.c t1_reneg.c \ 27 bio_ssl.c ssl_err.c t1_reneg.c \
28 pqueue.c 28 pqueue.c
29SRCS+= s3_cbc.c 29SRCS+= s3_cbc.c
30SRCS+= bs_ber.c bs_cbb.c bs_cbs.c
30 31
31HDRS= srtp.h ssl.h ssl2.h ssl3.h ssl23.h tls1.h dtls1.h 32HDRS= srtp.h ssl.h ssl2.h ssl3.h ssl23.h tls1.h dtls1.h
32 33