From df800baba09f897116045b0a2994e4e22b5370c1 Mon Sep 17 00:00:00 2001 From: thorpej Date: Fri, 16 Jun 2000 04:54:48 +0000 Subject: [PATCH] Import libssl build glue from cryptosrc-intl. --- lib/libssl/Makefile | 50 ++++++++++++++++++++++++++++++++++++++++ lib/libssl/shlib_version | 2 ++ lib/libssl/srcs.inc | 1 + lib/libssl/ssl.diff | 19 +++++++++++++++ lib/libssl/ssl.inc | 27 ++++++++++++++++++++++ 5 files changed, 99 insertions(+) create mode 100644 lib/libssl/Makefile create mode 100644 lib/libssl/shlib_version create mode 100644 lib/libssl/srcs.inc create mode 100644 lib/libssl/ssl.diff create mode 100644 lib/libssl/ssl.inc diff --git a/lib/libssl/Makefile b/lib/libssl/Makefile new file mode 100644 index 000000000000..759d5baa6cf0 --- /dev/null +++ b/lib/libssl/Makefile @@ -0,0 +1,50 @@ +# $NetBSD: Makefile,v 1.1.1.1 2000/06/16 04:54:48 thorpej Exp $ + +# RCSid: +# Id: Makefile,v 1.33 1998/11/11 11:53:53 sjg Exp +# +# @(#) Copyright (c) 1994 Simon J. Gerraty +# +# This file is provided in the hope that it will +# be of use. There is absolutely NO WARRANTY. +# Permission to copy, redistribute or otherwise +# use this file is hereby granted provided that +# the above copyright notice and this notice are +# left intact. +# +# Please send copies of changes and bug-fixes to: +# sjg@quick.com.au +# + +LIB= ssl +CFLAGS+= -Dlib${LIB} + +CRYPTODIST= ${.CURDIR}/../../dist +.include "../../Makefile.openssl" +.PATH: ${OPENSSLSRC} + +.include "srcs.inc" + +# XXX +.if ${OBJECT_FMT} == "ELF" +AFLAGS+=-DELF +.else +AFLAGS+=-DOUT +.endif + +# This is from the include/openssl directory; see ../libcrypto/Makefile +INCS= ssl.h ssl2.h ssl3.h tls1.h ssl23.h +INCSDIR=/usr/include/openssl + +# this rebuilds the `srcs.inc' and the .inc files it reads. +# note that we have no idea, rc5 or rsa here so we include +# them explicitely above if we are using these ciphers. +# XXX +# we patch `ssl.inc' as we need to be able to turn off SSLv2. +update_inc: + (cd ${.CURDIR}; \ + find ../../dist/openssl/ssl -name Makefile.ssl | \ + perl ../../dist/openssl/extsrcs.pl 2> srcs.inc; \ + patch -s ssl.inc < ssl.diff ) + +.include diff --git a/lib/libssl/shlib_version b/lib/libssl/shlib_version new file mode 100644 index 000000000000..97c9f92d6b8f --- /dev/null +++ b/lib/libssl/shlib_version @@ -0,0 +1,2 @@ +major=0 +minor=0 diff --git a/lib/libssl/srcs.inc b/lib/libssl/srcs.inc new file mode 100644 index 000000000000..2c4ae0a6dff8 --- /dev/null +++ b/lib/libssl/srcs.inc @@ -0,0 +1 @@ +.include "ssl.inc" diff --git a/lib/libssl/ssl.diff b/lib/libssl/ssl.diff new file mode 100644 index 000000000000..8c736e89c983 --- /dev/null +++ b/lib/libssl/ssl.diff @@ -0,0 +1,19 @@ +$NetBSD: ssl.diff,v 1.1.1.1 2000/06/16 04:54:48 thorpej Exp $ + +--- ssl.inc.orig Tue Jul 20 19:09:24 1999 ++++ ssl.inc Tue Jul 20 19:09:41 1999 +@@ -9,8 +9,13 @@ + + CPPFLAGS+= -I${OPENSSLSRC}/ssl + ++.if exists(${PATENTEDOPENSSLSRC}/crypto) ++SRCS+= s2_meth.c s2_srvr.c s2_clnt.c s2_lib.c s2_enc.c s2_pkt.c ++.else ++CPPFLAGS+= -DNO_SSL2 ++.endif ++ + SRCS+= \ +- s2_meth.c s2_srvr.c s2_clnt.c s2_lib.c s2_enc.c s2_pkt.c \ + s3_meth.c s3_srvr.c s3_clnt.c s3_lib.c s3_enc.c s3_pkt.c s3_both.c \ + s23_meth.c s23_srvr.c s23_clnt.c s23_lib.c s23_pkt.c \ + t1_meth.c t1_srvr.c t1_clnt.c t1_lib.c t1_enc.c \ diff --git a/lib/libssl/ssl.inc b/lib/libssl/ssl.inc new file mode 100644 index 000000000000..56d7f2d449f1 --- /dev/null +++ b/lib/libssl/ssl.inc @@ -0,0 +1,27 @@ +# $NetBSD: ssl.inc,v 1.1.1.1 2000/06/16 04:54:48 thorpej Exp $ +# +# @(#) Copyright (c) 1995 Simon J. Gerraty +# +# SRCS extracted from ../../dist/openssl/ssl/Makefile.ssl +# + +.PATH: ${OPENSSLSRC}/ssl + +CPPFLAGS+= -I${OPENSSLSRC}/ssl + +.if exists(${PATENTEDOPENSSLSRC}/crypto) +SRCS+= s2_meth.c s2_srvr.c s2_clnt.c s2_lib.c s2_enc.c s2_pkt.c +.else +CPPFLAGS+= -DNO_SSL2 +.endif + +SRCS+= \ + s3_meth.c s3_srvr.c s3_clnt.c s3_lib.c s3_enc.c s3_pkt.c s3_both.c \ + s23_meth.c s23_srvr.c s23_clnt.c s23_lib.c s23_pkt.c \ + t1_meth.c t1_srvr.c t1_clnt.c t1_lib.c t1_enc.c \ + ssl_lib.c ssl_err2.c ssl_cert.c ssl_sess.c \ + ssl_ciph.c ssl_stat.c ssl_rsa.c \ + ssl_asn1.c ssl_txt.c ssl_algs.c \ + bio_ssl.c ssl_err.c + +