head	1.30;
access;
symbols
	RELENG_8_4:1.30.0.2
	RELENG_9_1_0_RELEASE:1.27.2.1.4.2
	RELENG_9_1:1.27.2.1.0.4
	RELENG_9_1_BP:1.27.2.1
	RELENG_8_3_0_RELEASE:1.26.2.2.6.1
	RELENG_8_3:1.26.2.2.0.6
	RELENG_8_3_BP:1.26.2.2
	RELENG_9_0_0_RELEASE:1.27.2.1.2.1
	RELENG_9_0:1.27.2.1.0.2
	RELENG_9_0_BP:1.27.2.1
	RELENG_9:1.27.0.2
	RELENG_9_BP:1.27
	RELENG_7_4_0_RELEASE:1.25.2.1.2.2
	RELENG_8_2_0_RELEASE:1.26.2.2.4.1
	RELENG_7_4:1.25.2.1.0.2
	RELENG_7_4_BP:1.25.2.1
	RELENG_8_2:1.26.2.2.0.4
	RELENG_8_2_BP:1.26.2.2
	RELENG_8_1_0_RELEASE:1.26.2.2.2.1
	RELENG_8_1:1.26.2.2.0.2
	RELENG_8_1_BP:1.26.2.2
	RELENG_7_3_0_RELEASE:1.25.10.1
	RELENG_7_3:1.25.0.10
	RELENG_7_3_BP:1.25
	RELENG_8_0_0_RELEASE:1.26.2.1.2.1
	RELENG_8_0:1.26.2.1.0.2
	RELENG_8_0_BP:1.26.2.1
	RELENG_8:1.26.0.2
	RELENG_8_BP:1.26
	RELENG_7_2_0_RELEASE:1.25.8.1
	RELENG_7_2:1.25.0.8
	RELENG_7_2_BP:1.25
	RELENG_7_1_0_RELEASE:1.25.6.1
	RELENG_6_4_0_RELEASE:1.21.2.1.10.1
	RELENG_7_1:1.25.0.6
	RELENG_7_1_BP:1.25
	RELENG_6_4:1.21.2.1.0.10
	RELENG_6_4_BP:1.21.2.1
	RELENG_7_0_0_RELEASE:1.25
	RELENG_6_3_0_RELEASE:1.21.2.1
	RELENG_7_0:1.25.0.4
	RELENG_7_0_BP:1.25
	RELENG_6_3:1.21.2.1.0.8
	RELENG_6_3_BP:1.21.2.1
	RELENG_7:1.25.0.2
	RELENG_7_BP:1.25
	RELENG_6_2_0_RELEASE:1.21.2.1
	RELENG_6_2:1.21.2.1.0.6
	RELENG_6_2_BP:1.21.2.1
	RELENG_5_5_0_RELEASE:1.19.2.1
	RELENG_5_5:1.19.2.1.0.4
	RELENG_5_5_BP:1.19.2.1
	RELENG_6_1_0_RELEASE:1.21.2.1
	RELENG_6_1:1.21.2.1.0.4
	RELENG_6_1_BP:1.21.2.1
	RELENG_6_0_0_RELEASE:1.21.2.1
	RELENG_6_0:1.21.2.1.0.2
	RELENG_6_0_BP:1.21.2.1
	RELENG_6:1.21.0.2
	RELENG_6_BP:1.21
	RELENG_5_4_0_RELEASE:1.19.2.1
	RELENG_5_4:1.19.2.1.0.2
	RELENG_5_4_BP:1.19.2.1
	RELENG_4_11_0_RELEASE:1.4.2.8
	RELENG_4_11:1.4.2.8.0.8
	RELENG_4_11_BP:1.4.2.8
	RELENG_5_3_0_RELEASE:1.19
	RELENG_5_3:1.19.0.4
	RELENG_5_3_BP:1.19
	RELENG_5:1.19.0.2
	RELENG_5_BP:1.19
	RELENG_4_10_0_RELEASE:1.4.2.8
	RELENG_4_10:1.4.2.8.0.6
	RELENG_4_10_BP:1.4.2.8
	RELENG_5_2_1_RELEASE:1.18
	RELENG_5_2_0_RELEASE:1.18
	RELENG_5_2:1.18.0.4
	RELENG_5_2_BP:1.18
	RELENG_4_9_0_RELEASE:1.4.2.8
	RELENG_4_9:1.4.2.8.0.4
	RELENG_4_9_BP:1.4.2.8
	RELENG_5_1_0_RELEASE:1.18
	RELENG_5_1:1.18.0.2
	RELENG_5_1_BP:1.18
	RELENG_4_8_0_RELEASE:1.4.2.8
	RELENG_4_8:1.4.2.8.0.2
	RELENG_4_8_BP:1.4.2.8
	RELENG_5_0_0_RELEASE:1.15
	RELENG_5_0:1.15.0.2
	RELENG_5_0_BP:1.15
	RELENG_4_7_0_RELEASE:1.4.2.7
	RELENG_4_7:1.4.2.7.0.2
	RELENG_4_7_BP:1.4.2.7
	RELENG_4_6_2_RELEASE:1.4.2.6
	RELENG_4_6_1_RELEASE:1.4.2.6
	RELENG_4_6_0_RELEASE:1.4.2.6
	RELENG_4_6:1.4.2.6.0.6
	RELENG_4_6_BP:1.4.2.6
	RELENG_4_5_0_RELEASE:1.4.2.6
	RELENG_4_5:1.4.2.6.0.4
	RELENG_4_5_BP:1.4.2.6
	RELENG_4_4_0_RELEASE:1.4.2.6
	RELENG_4_4:1.4.2.6.0.2
	RELENG_4_4_BP:1.4.2.6
	RELENG_4_3_0_RELEASE:1.4.2.5
	RELENG_4_3:1.4.2.5.0.2
	RELENG_4_3_BP:1.4.2.5
	RELENG_4_2_0_RELEASE:1.4.2.3
	RELENG_4_1_1_RELEASE:1.4.2.3
	PRE_SMPNG:1.7
	RELENG_4_1_0_RELEASE:1.4.2.1
	RELENG_4_0_0_RELEASE:1.4
	RELENG_4:1.4.0.2
	RELENG_4_BP:1.4;
locks; strict;
comment	@# @;


1.30
date	2013.02.14.01.22.10;	author svnexp;	state Exp;
branches
	1.30.2.1;
next	1.29;

1.29
date	2012.11.17.01.50.27;	author svnexp;	state Exp;
branches;
next	1.28;

1.28
date	2012.07.12.19.30.53;	author jkim;	state Exp;
branches;
next	1.27;

1.27
date	2010.03.13.19.22.41;	author simon;	state Exp;
branches
	1.27.2.1;
next	1.26;

1.26
date	2009.07.19.17.25.24;	author kensmith;	state Exp;
branches
	1.26.2.1;
next	1.25;

1.25
date	2006.07.29.19.41.38;	author simon;	state Exp;
branches
	1.25.2.1
	1.25.6.1
	1.25.8.1
	1.25.10.1;
next	1.24;

1.24
date	2005.11.19.07.04.17;	author ru;	state Exp;
branches;
next	1.23;

1.23
date	2005.08.03.09.18.59;	author phk;	state Exp;
branches;
next	1.22;

1.22
date	2005.07.22.17.19.05;	author kensmith;	state Exp;
branches;
next	1.21;

1.21
date	2004.12.21.09.33.45;	author ru;	state Exp;
branches
	1.21.2.1;
next	1.20;

1.20
date	2004.10.24.15.32.38;	author ru;	state Exp;
branches;
next	1.19;

1.19
date	2004.05.13.07.51.47;	author ru;	state Exp;
branches
	1.19.2.1;
next	1.18;

1.18
date	2003.02.10.19.57.53;	author nectar;	state Exp;
branches;
next	1.17;

1.17
date	2003.01.31.11.30.38;	author nectar;	state Exp;
branches;
next	1.16;

1.16
date	2003.01.28.22.58.11;	author markm;	state Exp;
branches;
next	1.15;

1.15
date	2002.11.21.08.48.08;	author kris;	state Exp;
branches;
next	1.14;

1.14
date	2002.09.25.09.58.00;	author markm;	state Exp;
branches;
next	1.13;

1.13
date	2002.09.20.12.33.19;	author ru;	state Exp;
branches;
next	1.12;

1.12
date	2002.05.12.16.00.56;	author ru;	state Exp;
branches;
next	1.11;

1.11
date	2002.03.23.18.01.01;	author des;	state Exp;
branches;
next	1.10;

1.10
date	2001.03.08.07.57.49;	author kris;	state Exp;
branches;
next	1.9;

1.9
date	2000.11.13.02.21.38;	author kris;	state Exp;
branches;
next	1.8;

1.8
date	2000.09.17.06.45.26;	author kris;	state Exp;
branches;
next	1.7;

1.7
date	2000.07.16.05.52.55;	author peter;	state Exp;
branches;
next	1.6;

1.6
date	2000.04.13.07.37.31;	author kris;	state Exp;
branches;
next	1.5;

1.5
date	2000.04.11.09.27.24;	author obrien;	state Exp;
branches;
next	1.4;

1.4
date	2000.03.05.14.20.57;	author peter;	state Exp;
branches
	1.4.2.1;
next	1.3;

1.3
date	2000.02.24.10.37.29;	author markm;	state Exp;
branches;
next	1.2;

1.2
date	2000.01.16.02.19.59;	author kris;	state Exp;
branches;
next	1.1;

1.1
date	2000.01.14.05.49.23;	author kris;	state Exp;
branches;
next	;

1.30.2.1
date	2013.02.14.01.22.10;	author svnexp;	state dead;
branches;
next	1.30.2.2;

1.30.2.2
date	2013.03.28.13.03.38;	author svnexp;	state Exp;
branches;
next	;

1.27.2.1
date	2011.09.23.00.51.37;	author kensmith;	state Exp;
branches
	1.27.2.1.2.1
	1.27.2.1.4.1;
next	1.27.2.2;

1.27.2.2
date	2012.11.17.11.36.33;	author svnexp;	state Exp;
branches;
next	1.27.2.3;

1.27.2.3
date	2013.03.14.19.04.08;	author svnexp;	state Exp;
branches;
next	;

1.27.2.1.2.1
date	2011.11.11.04.20.22;	author kensmith;	state Exp;
branches;
next	1.27.2.1.2.2;

1.27.2.1.2.2
date	2012.11.17.08.36.32;	author svnexp;	state Exp;
branches;
next	1.27.2.1.2.3;

1.27.2.1.2.3
date	2013.04.02.18.17.58;	author svnexp;	state Exp;
branches;
next	;

1.27.2.1.4.1
date	2012.08.05.23.54.33;	author kensmith;	state Exp;
branches;
next	1.27.2.1.4.2;

1.27.2.1.4.2
date	2012.11.17.08.47.23;	author svnexp;	state Exp;
branches;
next	1.27.2.1.4.3;

1.27.2.1.4.3
date	2013.04.02.18.10.51;	author svnexp;	state Exp;
branches;
next	;

1.26.2.1
date	2009.08.03.08.13.06;	author kensmith;	state Exp;
branches
	1.26.2.1.2.1;
next	1.26.2.2;

1.26.2.2
date	2010.05.22.18.40.54;	author simon;	state Exp;
branches
	1.26.2.2.2.1
	1.26.2.2.4.1
	1.26.2.2.6.1;
next	1.26.2.3;

1.26.2.3
date	2012.11.17.10.36.17;	author svnexp;	state Exp;
branches;
next	1.26.2.4;

1.26.2.4
date	2013.03.08.20.22.37;	author svnexp;	state Exp;
branches;
next	;

1.26.2.1.2.1
date	2009.10.25.01.10.29;	author kensmith;	state Exp;
branches;
next	;

1.26.2.2.2.1
date	2010.06.14.02.09.06;	author kensmith;	state Exp;
branches;
next	;

1.26.2.2.4.1
date	2010.12.21.17.09.25;	author kensmith;	state Exp;
branches;
next	;

1.26.2.2.6.1
date	2012.03.03.06.15.13;	author kensmith;	state Exp;
branches;
next	1.26.2.2.6.2;

1.26.2.2.6.2
date	2012.11.17.08.24.57;	author svnexp;	state Exp;
branches;
next	1.26.2.2.6.3;

1.26.2.2.6.3
date	2013.04.02.17.49.00;	author svnexp;	state Exp;
branches;
next	;

1.25.2.1
date	2010.11.28.13.45.51;	author simon;	state Exp;
branches
	1.25.2.1.2.1;
next	1.25.2.2;

1.25.2.2
date	2011.01.18.22.19.55;	author simon;	state Exp;
branches;
next	1.25.2.3;

1.25.2.3
date	2012.11.17.08.03.45;	author svnexp;	state Exp;
branches;
next	;

1.25.2.1.2.1
date	2010.12.21.17.10.29;	author kensmith;	state Exp;
branches;
next	1.25.2.1.2.2;

1.25.2.1.2.2
date	2011.01.19.07.44.47;	author simon;	state Exp;
branches;
next	1.25.2.1.2.3;

1.25.2.1.2.3
date	2012.11.17.08.16.55;	author svnexp;	state Exp;
branches;
next	;

1.25.6.1
date	2008.11.25.02.59.29;	author kensmith;	state Exp;
branches;
next	;

1.25.8.1
date	2009.04.15.03.14.26;	author kensmith;	state Exp;
branches;
next	;

1.25.10.1
date	2010.02.10.00.26.20;	author kensmith;	state Exp;
branches;
next	;

1.21.2.1
date	2005.07.22.17.29.10;	author kensmith;	state Exp;
branches
	1.21.2.1.10.1;
next	1.21.2.2;

1.21.2.2
date	2012.11.17.07.41.25;	author svnexp;	state Exp;
branches;
next	;

1.21.2.1.10.1
date	2008.10.02.02.57.24;	author kensmith;	state Exp;
branches;
next	;

1.19.2.1
date	2005.02.13.07.23.19;	author obrien;	state Exp;
branches;
next	;

1.4.2.1
date	2000.04.12.06.38.34;	author obrien;	state Exp;
branches;
next	1.4.2.2;

1.4.2.2
date	2000.08.20.09.09.47;	author kris;	state Exp;
branches;
next	1.4.2.3;

1.4.2.3
date	2000.09.22.09.43.38;	author kris;	state Exp;
branches;
next	1.4.2.4;

1.4.2.4
date	2000.11.26.11.34.22;	author kris;	state Exp;
branches;
next	1.4.2.5;

1.4.2.5
date	2001.03.08.07.56.37;	author kris;	state Exp;
branches;
next	1.4.2.6;

1.4.2.6
date	2001.07.04.23.24.42;	author kris;	state Exp;
branches;
next	1.4.2.7;

1.4.2.7
date	2002.07.22.14.21.51;	author ru;	state Exp;
branches;
next	1.4.2.8;

1.4.2.8
date	2003.02.14.22.38.20;	author nectar;	state Exp;
branches;
next	1.4.2.9;

1.4.2.9
date	2012.11.17.07.24.38;	author svnexp;	state Exp;
branches;
next	;


desc
@@


1.30
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/246772
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@# $FreeBSD: head/secure/lib/libssl/Makefile 246772 2013-02-13 23:07:20Z jkim $

LIB=		ssl
SHLIB_MAJOR=	7

NO_LINT=

.if exists(Makefile.man)
.include "Makefile.man"
.endif
.include "../libcrypto/Makefile.inc"

SRCS=	bio_ssl.c d1_both.c d1_clnt.c d1_enc.c d1_lib.c d1_meth.c d1_pkt.c \
	d1_srtp.c d1_srvr.c s23_clnt.c s23_lib.c s23_meth.c s23_pkt.c \
	s23_srvr.c s2_clnt.c s2_enc.c s2_lib.c s2_meth.c s2_pkt.c s2_srvr.c \
	s3_both.c s3_cbc.c s3_clnt.c s3_enc.c s3_lib.c s3_meth.c s3_pkt.c \
	s3_srvr.c ssl_algs.c ssl_asn1.c ssl_cert.c ssl_ciph.c ssl_err.c \
	ssl_err2.c ssl_lib.c ssl_rsa.c ssl_sess.c ssl_stat.c ssl_txt.c \
	t1_clnt.c t1_enc.c t1_lib.c t1_meth.c t1_reneg.c t1_srvr.c tls_srp.c

INCS=	dtls1.h kssl.h srtp.h ssl.h ssl2.h ssl23.h ssl3.h tls1.h
INCSDIR=${INCLUDEDIR}/openssl

DPADD=	${LIBCRYPTO}
LDADD=	-lcrypto

.include <bsd.lib.mk>

.PATH:	${LCRYPTO_SRC}/ssl \
	${.CURDIR}/man
@


1.30.2.1
log
@file Makefile was added on branch RELENG_8_4 on 2013-03-28 13:03:38 +0000
@
text
@d1 30
@


1.30.2.2
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/248810
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@a0 32
# $FreeBSD: releng/8.4/secure/lib/libssl/Makefile 248057 2013-03-08 17:28:40Z delphij $

LIB=		ssl
SHLIB_MAJOR=	6

NO_LINT=

.if exists(Makefile.man)
.include "Makefile.man"
.endif
.include "../libcrypto/Makefile.inc"

SRCS=	bio_ssl.c d1_meth.c d1_srvr.c d1_clnt.c d1_lib.c d1_pkt.c \
	d1_both.c d1_enc.c \
	s23_clnt.c s23_lib.c s23_meth.c s23_pkt.c s23_srvr.c \
	s2_clnt.c s2_enc.c s2_lib.c s2_meth.c s2_pkt.c s2_srvr.c \
	s3_both.c s3_cbc.c s3_clnt.c s3_enc.c s3_lib.c s3_meth.c \
	s3_pkt.c \
	s3_srvr.c ssl_algs.c ssl_asn1.c ssl_cert.c ssl_ciph.c \
	ssl_err.c ssl_err2.c ssl_lib.c ssl_rsa.c ssl_sess.c ssl_stat.c \
	ssl_txt.c t1_clnt.c t1_enc.c t1_lib.c t1_meth.c t1_reneg.c t1_srvr.c

INCS=	dtls1.h kssl.h ssl.h ssl2.h ssl23.h ssl3.h tls1.h
INCSDIR=${INCLUDEDIR}/openssl

DPADD=	${LIBCRYPTO}
LDADD=	-lcrypto

.include <bsd.lib.mk>

.PATH:	${LCRYPTO_SRC}/ssl \
	${.CURDIR}/man
@


1.29
log
@Switching exporter and resync
@
text
@d1 1
a1 1
# $FreeBSD: head/secure/lib/libssl/Makefile 238405 2012-07-12 19:30:53Z jkim $
d16 4
a19 4
	s3_both.c s3_clnt.c s3_enc.c s3_lib.c s3_meth.c s3_pkt.c s3_srvr.c \
	ssl_algs.c ssl_asn1.c ssl_cert.c ssl_ciph.c ssl_err.c ssl_err2.c \
	ssl_lib.c ssl_rsa.c ssl_sess.c ssl_stat.c ssl_txt.c t1_clnt.c \
	t1_enc.c t1_lib.c t1_meth.c t1_reneg.c t1_srvr.c tls_srp.c
@


1.28
log
@SVN rev 238405 on 2012-07-12 19:30:53Z by jkim

Merge OpenSSL 1.0.1c.

Approved by:	benl (maintainer)
@
text
@d1 1
a1 1
# $FreeBSD$
@


1.27
log
@SVN rev 205128 on 2010-03-13 19:22:41Z by simon

Merge OpenSSL 0.9.8m into head.

This also "reverts" some FreeBSD local changes so we should now
be back to using entirely stock OpenSSL.  The local changes were
simple $FreeBSD$ lines additions, which were required in the CVS
days, and the patch for FreeBSD-SA-09:15.ssl which has been
superseded with OpenSSL 0.9.8m's RFC5746 'TLS renegotiation
extension' support.

MFC after:	3 weeks
@
text
@d4 1
a4 1
SHLIB_MAJOR=	6
d13 7
a19 8
SRCS=	bio_ssl.c d1_meth.c d1_srvr.c d1_clnt.c d1_lib.c d1_pkt.c \
	d1_both.c d1_enc.c \
	s23_clnt.c s23_lib.c s23_meth.c s23_pkt.c s23_srvr.c \
	s2_clnt.c s2_enc.c s2_lib.c s2_meth.c s2_pkt.c s2_srvr.c \
	s3_both.c s3_clnt.c s3_enc.c s3_lib.c s3_meth.c s3_pkt.c \
	s3_srvr.c ssl_algs.c ssl_asn1.c ssl_cert.c ssl_ciph.c \
	ssl_err.c ssl_err2.c ssl_lib.c ssl_rsa.c ssl_sess.c ssl_stat.c \
	ssl_txt.c t1_clnt.c t1_enc.c t1_lib.c t1_meth.c t1_reneg.c t1_srvr.c
d21 1
a21 1
INCS=	dtls1.h kssl.h ssl.h ssl2.h ssl23.h ssl3.h tls1.h
@


1.27.2.1
log
@SVN rev 225736 on 2011-09-23 00:51:37Z by kensmith

Copy head to stable/9 as part of 9.0-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.27.2.2
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242902
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242902 | dteske | 2012-11-11 23:29:45 +0000 (Sun, 11 Nov 2012) | 10 lines
## SVN ##
## SVN ## Fix a regression introduced by SVN r211417 that saw the breakage of a feature
## SVN ## documented in usr.sbin/sysinstall/help/shortcuts.hlp (reproduced below):
## SVN ##
## SVN ## If /usr/sbin/sysinstall is linked to another filename, say
## SVN ## `/usr/local/bin/configPackages', then the basename will be used
## SVN ## as an implicit command name.
## SVN ##
## SVN ## Reviewed by:	adrian (co-mentor)
## SVN ## Approved by:	adrian (co-mentor)
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d1 1
a1 1
# $FreeBSD: stable/9/secure/lib/libssl/Makefile 205128 2010-03-13 19:22:41Z simon $
@


1.27.2.3
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/248272
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@d1 1
a1 1
# $FreeBSD: stable/9/secure/lib/libssl/Makefile 248272 2013-03-14 17:48:07Z delphij $
d17 1
a17 2
	s3_both.c s3_cbc.c s3_clnt.c s3_enc.c s3_lib.c s3_meth.c \
	s3_pkt.c \
@


1.27.2.1.4.1
log
@SVN rev 239080 on 2012-08-05 23:54:33Z by kensmith

Copy stable/9 to releng/9.1 as part of the 9.1-RELEASE release process.

Approved by:	re (implicit)
@
text
@@


1.27.2.1.4.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.1/secure/lib/libssl/Makefile 205128 2010-03-13 19:22:41Z simon $
@


1.27.2.1.4.3
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/249029
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.1/secure/lib/libssl/Makefile 249029 2013-04-02 17:34:42Z delphij $
d17 1
a17 2
	s3_both.c s3_cbc.c s3_clnt.c s3_enc.c s3_lib.c s3_meth.c \
	s3_pkt.c \
@


1.27.2.1.2.1
log
@SVN rev 227445 on 2011-11-11 04:20:22Z by kensmith

Copy stable/9 to releng/9.0 as part of the FreeBSD 9.0-RELEASE release
cycle.

Approved by:	re (implicit)
@
text
@@


1.27.2.1.2.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.0/secure/lib/libssl/Makefile 205128 2010-03-13 19:22:41Z simon $
@


1.27.2.1.2.3
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/249029
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.0/secure/lib/libssl/Makefile 249029 2013-04-02 17:34:42Z delphij $
d17 1
a17 2
	s3_both.c s3_cbc.c s3_clnt.c s3_enc.c s3_lib.c s3_meth.c \
	s3_pkt.c \
@


1.26
log
@SVN rev 195767 on 2009-07-19 17:25:24Z by kensmith

Bump the version of all non-symbol-versioned shared libraries in
preparation for 8.0-RELEASE.  Add the previous version of those
libraries to ObsoleteFiles.inc and bump __FreeBSD_Version.

Reviewed by:    kib
Approved by:    re (rwatson)
@
text
@d20 1
a20 1
	ssl_txt.c t1_clnt.c t1_enc.c t1_lib.c t1_meth.c t1_srvr.c \
@


1.26.2.1
log
@SVN rev 196045 on 2009-08-03 08:13:06Z by kensmith

Copy head to stable/8 as part of 8.0 Release cycle.

Approved by:	re (Implicit)
@
text
@@


1.26.2.2
log
@SVN rev 208419 on 2010-05-22 18:40:54Z by simon

Merge OpenSSL 0.9.8n from head into stable/8.

Approved by:	re (kib)
@
text
@d20 1
a20 1
	ssl_txt.c t1_clnt.c t1_enc.c t1_lib.c t1_meth.c t1_reneg.c t1_srvr.c
@


1.26.2.3
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242909
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242909 | dim | 2012-11-12 07:47:19 +0000 (Mon, 12 Nov 2012) | 20 lines
## SVN ##
## SVN ## MFC r242625:
## SVN ##
## SVN ## Remove duplicate const specifiers in many drivers (I hope I got all of
## SVN ## them, please let me know if not).  Most of these are of the form:
## SVN ##
## SVN ## static const struct bzzt_type {
## SVN ##       [...list of members...]
## SVN ## } const bzzt_devs[] = {
## SVN ##       [...list of initializers...]
## SVN ## };
## SVN ##
## SVN ## The second const is unnecessary, as arrays cannot be modified anyway,
## SVN ## and if the elements are const, the whole thing is const automatically
## SVN ## (e.g. it is placed in .rodata).
## SVN ##
## SVN ## I have verified this does not change the binary output of a full kernel
## SVN ## build (except for build timestamps embedded in the object files).
## SVN ##
## SVN ## Reviewed by:	yongari, marius
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d1 1
a1 1
# $FreeBSD: stable/8/secure/lib/libssl/Makefile 208419 2010-05-22 18:40:54Z simon $
@


1.26.2.4
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/248057
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@d1 1
a1 1
# $FreeBSD: stable/8/secure/lib/libssl/Makefile 248057 2013-03-08 17:28:40Z delphij $
d17 1
a17 2
	s3_both.c s3_cbc.c s3_clnt.c s3_enc.c s3_lib.c s3_meth.c \
	s3_pkt.c \
@


1.26.2.2.6.1
log
@SVN rev 232438 on 2012-03-03 06:15:13Z by kensmith

Copy stable/8 to releng/8.3 as part of 8.3-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.26.2.2.6.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/8.3/secure/lib/libssl/Makefile 208419 2010-05-22 18:40:54Z simon $
@


1.26.2.2.6.3
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/249029
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@d1 1
a1 1
# $FreeBSD: releng/8.3/secure/lib/libssl/Makefile 249029 2013-04-02 17:34:42Z delphij $
d17 1
a17 2
	s3_both.c s3_cbc.c s3_clnt.c s3_enc.c s3_lib.c s3_meth.c \
	s3_pkt.c \
@


1.26.2.2.4.1
log
@SVN rev 216617 on 2010-12-21 17:09:25Z by kensmith

Copy stable/8 to releng/8.2 in preparation for FreeBSD-8.2 release.

Approved by:	re (implicit)
@
text
@@


1.26.2.2.2.1
log
@SVN rev 209145 on 2010-06-14 02:09:06Z by kensmith

Copy stable/8 to releng/8.1 in preparation for 8.1-RC1.

Approved by:	re (implicit)
@
text
@@


1.26.2.1.2.1
log
@SVN rev 198460 on 2009-10-25 01:10:29Z by kensmith

Copy stable/8 to releng/8.0 as part of 8.0-RELEASE release procedure.

Approved by:	re (implicit)
@
text
@@


1.25
log
@Upgrade to OpenSSL 0.9.8b.
@
text
@d4 1
a4 1
SHLIB_MAJOR=	5
@


1.25.2.1
log
@SVN rev 215997 on 2010-11-28 13:45:51Z by simon

Merge OpenSSL 0.9.8p into stable/7.

This merges up to and including head/crypto/openssl/ r215697; and
head/secure/lib/libcrypto/, head/secure/lib/libssl/,
head/secure/usr.bin/openssl/ r215698.

To make the merge simpler, a hack was added to set MACHINE_CPUARCH.

A few old OpenSSL security fixes are still the stable/7 tree - these
will be backed out to the vendor version shortly.

Security:	CVE-2010-2939, CVE-2010-3864
Security:	http://www.openssl.org/news/secadv_20101116.txt
Security:	FreeBSD-SA-10:10.openssl
Approved by:	re (implicitly - they did not object of the general idea
		of OpenSSL update)
@
text
@d4 1
a4 1
SHLIB_MAJOR=	6
d20 1
a20 1
	ssl_txt.c t1_clnt.c t1_enc.c t1_lib.c t1_meth.c t1_reneg.c t1_srvr.c
@


1.25.2.2
log
@SVN rev 217562 on 2011-01-18 22:19:55Z by simon

Decrease the libcrypto and libssl shared object version numbers from 6
to 5. They were accidentally bumped in r215997 (on 2010-11-28) with the
merge of OpenSSL 0.9.8p, but unfortunately this was not caught until
now.

Also add compat links for libcrypto.so.6 / libssl.so.6 (pointing to
their .5 counterparts) in case any users have compiled any third party
during the time stable/7 (and releng/7.4) were broken.

This is deemed the last poor of bad options.  Had the number bump not
been reverted binary packages for stable/7 would not have worked on the
still supported 7.3 and 7.1 releases.

Discussed with:	re, portmgr
Approved by:	re (kensmith - in principle)
Pointyhat to:	simon
@
text
@d4 1
a4 3
SHLIB_MAJOR=	5

SYMLINKS=	lib${LIB}.so.5 ${SHLIBDIR}/lib${LIB}.so.6
@


1.25.2.3
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/7/secure/lib/libssl/Makefile 217562 2011-01-18 22:19:55Z simon $
@


1.25.2.1.2.1
log
@SVN rev 216618 on 2010-12-21 17:10:29Z by kensmith

Copy stable/7 to releng/7.4 in preparation for FreeBSD-7.4 release.

Approved by:	re (implicit)
@
text
@@


1.25.2.1.2.2
log
@SVN rev 217574 on 2011-01-19 07:44:47Z by simon

MFS7 r217562:

 Decrease the libcrypto and libssl shared object version numbers from 6
 to 5. They were accidentally bumped in r215997 (on 2010-11-28) with the
 merge of OpenSSL 0.9.8p, but unfortunately this was not caught until
 now.

 Also add compat links for libcrypto.so.6 / libssl.so.6 (pointing to
 their .5 counterparts) in case any users have compiled any third party
 during the time stable/7 (and releng/7.4) were broken.

 This is deemed the last poor of bad options.  Had the number bump not
 been reverted binary packages for stable/7 would not have worked on the
 still supported 7.3 and 7.1 releases.

Approved by:	re (kensmith)
@
text
@d4 1
a4 3
SHLIB_MAJOR=	5

SYMLINKS=	lib${LIB}.so.5 ${SHLIBDIR}/lib${LIB}.so.6
@


1.25.2.1.2.3
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/7.4/secure/lib/libssl/Makefile 217574 2011-01-19 07:44:47Z simon $
@


1.25.10.1
log
@SVN rev 203736 on 2010-02-10 00:26:20Z by kensmith

Copy stable/7 to releng/7.3 as part of the 7.3-RELEASE process.

Approved by:	re (implicit)
@
text
@@


1.25.8.1
log
@SVN rev 191087 on 2009-04-15 03:14:26Z by kensmith

Create releng/7.2 from stable/7 in preparation for 7.2-RELEASE.

Approved by:	re (implicit)
@
text
@@


1.25.6.1
log
@SVN rev 185281 on 2008-11-25 02:59:29Z by kensmith

Create releng/7.1 in preparation for moving into RC phase of 7.1 release
cycle.

Approved by:	re (implicit)
@
text
@@


1.24
log
@Revert last revision by phk@@, it's redundant since bsd.incs.mk
already handles this, FWIW.
@
text
@d4 1
a4 1
SHLIB_MAJOR=	4
d13 3
a15 1
SRCS=	bio_ssl.c s23_clnt.c s23_lib.c s23_meth.c s23_pkt.c s23_srvr.c \
d20 1
a20 1
	ssl_txt.c t1_clnt.c t1_enc.c t1_lib.c t1_meth.c t1_srvr.c
d22 1
a22 1
INCS=	kssl.h ssl.h ssl2.h ssl23.h ssl3.h tls1.h
@


1.23
log
@Don't install includes if NO_TOOLCHAIN
@
text
@a19 1
.if !defined(NO_TOOLCHAIN)
a21 1
.endif
@


1.22
log
@Bump the shared library version number of all libraries that have not
been bumped since RELENG_5.

Reviewed by:	ru
Approved by:	re (not needed for commit check but in principle...)
@
text
@d20 1
d23 1
@


1.21
log
@NODOCCOMPRESS -> NO_DOCCOMPRESS
NOINFO -> NO_INFO
NOINFOCOMPRESS -> NO_INFOCOMPRESS
NOLINT -> NO_LINT
NOPIC -> NO_PIC
NOPROFILE -> NO_PROFILE
@
text
@d4 1
a4 1
SHLIB_MAJOR=	3
@


1.21.2.1
log
@Insta-MFC of the shared library version bump.  All shared libraries
whose version has not already been bumped since RELENG_5 are being
bumped.

Revisions of files being MFC-ed:

> Path						Revision
> src/gnu/lib/libdialog/Makefile		1.43
> src/gnu/lib/libg2c/Makefile			1.16
> src/gnu/lib/libobjc/Makefile			1.27
> src/gnu/lib/libreadline/Makefile.inc		1.12
> src/gnu/lib/libregex/Makefile			1.32
> src/gnu/lib/libstdc++/Makefile		1.56
> src/kerberos5/lib/Makefile.inc		1.7
> src/lib/Makefile.inc				1.3
> src/lib/libalias/Makefile			1.31
> src/lib/libarchive/Makefile			1.37
> src/lib/libbegemot/Makefile			1.3
> src/lib/libbluetooth/Makefile			1.2
> src/lib/libbsnmp/Makefile.inc			1.6
> src/lib/libbz2/Makefile			1.6
> src/lib/libc_r/Makefile			1.42
> src/lib/libcrypt/Makefile			1.36
> src/lib/libdevstat/Makefile			1.15
> src/lib/libdevstat/devstat.h			1.11
> src/lib/libedit/Makefile			1.29
> src/lib/libexpat/Makefile			1.5
> src/lib/libfetch/Makefile			1.45
> src/lib/libftpio/Makefile			1.14
> src/lib/libgpib/Makefile			1.2
> src/lib/libipsec/Makefile			1.17
> src/lib/libkiconv/Makefile			1.3
> src/lib/libmagic/Makefile			1.7
> src/lib/libmp/Makefile			1.10
> src/lib/libncp/Makefile			1.6
> src/lib/libncurses/Makefile			1.79
> src/lib/libnetgraph/Makefile			1.11
> src/lib/libngatm/Makefile			1.6
> src/lib/libopie/Makefile			1.21
> src/lib/libpam/Makefile.inc			1.17
> src/lib/libpthread/Makefile			1.54
> src/lib/libradius/Makefile			1.12
> src/lib/libsdp/Makefile			1.4
> src/lib/libsmb/Makefile			1.8
> src/lib/libtacplus/Makefile			1.7
> src/lib/libthr/Makefile			1.14
> src/lib/libthread_db/Makefile			1.6
> src/lib/libugidfw/Makefile			1.7
> src/lib/libusbhid/Makefile			1.10
> src/lib/libutil/Makefile			1.57
> src/lib/libvgl/Makefile			1.11
> src/lib/libwrap/Makefile			1.17
> src/lib/libypclnt/Makefile			1.13
> src/lib/msun/Makefile				1.72
> src/secure/lib/libcrypto/Makefile		1.74
> src/secure/lib/libssh/Makefile		1.35
> src/secure/lib/libssl/Makefile		1.22
> src/usr.sbin/bsnmpd/modules/Makefile.inc	1.10

Reviewed by:	ru
Approved by:	re (scottl)
@
text
@d4 1
a4 1
SHLIB_MAJOR=	4
@


1.21.2.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/6/secure/lib/libssl/Makefile 148300 2005-07-22 17:29:10Z kensmith $
@


1.21.2.1.10.1
log
@SVN rev 183531 on 2008-10-02 02:57:24Z by kensmith

Create releng/6.4 from stable/6 in preparation for 6.4-RC1.

Approved by:	re (implicit)
@
text
@@


1.20
log
@For variables that are only checked with defined(), don't provide
any fake value.
@
text
@d6 1
a6 1
NOLINT=
@


1.19
log
@Record the libssl.so dependency on libcrypto.so.  This should
help some ports that depend on libradius that recently gained
the dependency on libssl.  This is also how the stock OpenSSL
build would link libssl.so on FreeBSD.

Prompted by:	kris
OK'ed by:	markm, nectar
@
text
@d6 1
a6 1
NOLINT=		true
@


1.19.2.1
log
@MFC: For variables that are only checked with defined(), don't provide
     any fake value.
@
text
@d6 1
a6 1
NOLINT=
@


1.18
log
@Install the OpenSSL man pages in /usr/share/openssl/man
and remove the WANT_OPENSSL_MANPAGES knob.
@
text
@d23 3
@


1.17
log
@Re-add WANT_OPENSSL_MANPAGES knob.

Noticed by:	ru
@
text
@d8 3
a18 33

.if defined(WANT_OPENSSL_MANPAGES)
MAN3=	SSL_CIPHER_get_name.3 SSL_COMP_add_compression_method.3 \
	SSL_CTX_add_extra_chain_cert.3 SSL_CTX_add_session.3 SSL_CTX_ctrl.3 \
	SSL_CTX_flush_sessions.3 SSL_CTX_free.3 SSL_CTX_get_ex_new_index.3 \
	SSL_CTX_get_verify_mode.3 SSL_CTX_load_verify_locations.3 \
	SSL_CTX_new.3 SSL_CTX_sess_number.3 SSL_CTX_sess_set_cache_size.3 \
	SSL_CTX_sess_set_get_cb.3 SSL_CTX_sessions.3 SSL_CTX_set_cert_store.3 \
	SSL_CTX_set_cert_verify_callback.3 SSL_CTX_set_cipher_list.3 \
	SSL_CTX_set_client_CA_list.3 SSL_CTX_set_client_cert_cb.3 \
	SSL_CTX_set_default_passwd_cb.3 SSL_CTX_set_generate_session_id.3 \
	SSL_CTX_set_info_callback.3 SSL_CTX_set_max_cert_list.3 \
	SSL_CTX_set_mode.3 SSL_CTX_set_msg_callback.3 SSL_CTX_set_options.3 \
	SSL_CTX_set_quiet_shutdown.3 SSL_CTX_set_session_cache_mode.3 \
	SSL_CTX_set_session_id_context.3 SSL_CTX_set_ssl_version.3 \
	SSL_CTX_set_timeout.3 SSL_CTX_set_tmp_dh_callback.3 \
	SSL_CTX_set_tmp_rsa_callback.3 SSL_CTX_set_verify.3 \
	SSL_CTX_use_certificate.3 SSL_SESSION_free.3 \
	SSL_SESSION_get_ex_new_index.3 SSL_SESSION_get_time.3 SSL_accept.3 \
	SSL_alert_type_string.3 SSL_clear.3 SSL_connect.3 SSL_do_handshake.3 \
	SSL_free.3 SSL_get_SSL_CTX.3 SSL_get_ciphers.3 \
	SSL_get_client_CA_list.3 SSL_get_current_cipher.3 \
	SSL_get_default_timeout.3 SSL_get_error.3 \
	SSL_get_ex_data_X509_STORE_CTX_idx.3 SSL_get_ex_new_index.3 \
	SSL_get_fd.3 SSL_get_peer_cert_chain.3 SSL_get_peer_certificate.3 \
	SSL_get_rbio.3 SSL_get_session.3 SSL_get_verify_result.3 \
	SSL_get_version.3 SSL_library_init.3 SSL_load_client_CA_file.3 \
	SSL_new.3 SSL_pending.3 SSL_read.3 SSL_rstate_string.3 \
	SSL_session_reused.3 SSL_set_bio.3 SSL_set_connect_state.3 \
	SSL_set_fd.3 SSL_set_session.3 SSL_set_shutdown.3 \
	SSL_set_verify_result.3 SSL_shutdown.3 SSL_state_string.3 \
	SSL_want.3 SSL_write.3 d2i_SSL_SESSION.3 ssl.3
.endif
@


1.16
log
@Update for OpenSSL 0.9.7. No assembler code at the moment. This
will follow.
@
text
@d17 1
d48 1
@


1.15
log
@Remove myself as maintainer of openssl; I no longer have enough time to
devote to it.
@
text
@d4 1
a4 1
SHLIB_MAJOR=	2
d8 2
d15 1
a15 1
	ssl_txt.c t1_clnt.c t1_enc.c t1_lib.c t1_meth.c t1_srvr.o \
d17 32
a48 1
INCS=	ssl.h ssl2.h ssl23.h ssl3.h tls1.h
a49 1
HDRS=	${INCS:S;^;../ssl/;}
d51 1
a51 3
.include "../libcrypto/Makefile.inc"

.PATH: ${LCRYPTO_SRC}/../ssl
d53 2
a54 1
.include <bsd.lib.mk>
@


1.14
log
@Don't lint contrib'ed sources, even if the builder has asked for linting.
Its Just Too Noisy.
@
text
@a7 2
MAINTAINER=	kris

@


1.13
log
@Bandaid for a broken world.  The real fix is somewhat more
complicated and will be sent for a review.
@
text
@d6 2
@


1.12
log
@Added new bsd.incs.mk which handles installing of header files
via INCS.  Implemented INCSLINKS (equivalent to SYMLINKS) to
handle symlinking include files.  Allow for multiple groups of
include files to be installed, with the powerful INCSGROUPS knob.
Documentation to follow.

Added standard `includes' and `incsinstall' targets, use them
in Makefile.inc1.  Headers from the following makefiles were
not installed before (during `includes' in Makefile.inc1):

	kerberos5/lib/libtelnet/Makefile
	lib/libbz2/Makefile
	lib/libdevinfo/Makefile
	lib/libform/Makefile
	lib/libisc/Makefile
	lib/libmenu/Makefile
	lib/libmilter/Makefile
	lib/libpanel/Makefile

Replaced all `beforeinstall' targets for installing includes
with the INCS stuff.

Renamed INCDIR to INCSDIR, for consistency with FILES and SCRIPTS,
and for compatibility with NetBSD.  Similarly for INCOWN, INCGRP,
and INCMODE.

Consistently use INCLUDEDIR instead of /usr/include.

gnu/lib/libstdc++/Makefile and gnu/lib/libsupc++/Makefile changes
were only lightly tested due to the missing contrib/libstdc++-v3.
I fully tested the pre-WIP_GCC31 version of this patch with the
contrib/libstdc++.295 stuff.

These changes have been tested on i386 with the -DNO_WERROR "make
world" and "make release".
@
text
@a2 6
.include "../libcrypto/Makefile.inc"

LCRYPTOSSL_SRC=${LCRYPTO_SRC}/../ssl

.PATH:	${LCRYPTOSSL_SRC}

d8 1
a8 1
SRCS+=	bio_ssl.c s23_clnt.c s23_lib.c s23_meth.c s23_pkt.c s23_srvr.c \
d15 1
a15 1
INCS=	ssl.h ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h
d17 5
a21 1
HDRS+=	${INCS:S;^;../ssl/;}
@


1.11
log
@Install headers with -C.  Ideally, these Makefiles should not need to
override the beforeinstall target at all, but this has proven difficult
to achieve.
@
text
@d21 3
a23 13
HDRS=	ssl.h ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h

.for h in ${HDRS}
CRYPTO_HDRS+= ${LCRYPTOSSL_SRC}/${h}
.endfor

.for h in ${HDRS}
SSL_HDRS+= ${LCRYPTOSSL_SRC}/${h}
.endfor

beforeinstall:  openssl/opensslconf.h openssl/evp.h
	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \
	    ${SSL_HDRS} ${DESTDIR}/usr/include/openssl
@


1.10
log
@MFS: Belatedly bump SHLIB_MAJOR corresponding to OpenSSL 0.9.6
@
text
@d1 1
a1 1
# $FreeBSD: src/secure/lib/libssl/Makefile,v 1.9 2000/11/13 02:21:38 kris Exp $
d32 1
a32 1
	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \
@


1.9
log
@Update for OpenSSL 0.9.6
@
text
@d1 1
a1 1
# $FreeBSD: src/secure/lib/libssl/Makefile,v 1.8 2000/09/17 06:45:26 kris Exp $
d10 1
a10 1
SHLIB_MAJOR=	1
@


1.8
log
@Overhaul of the build-time include file generation. Don't break in evp.h
if bootstrapping from a system on which the openssl headers are not
already present.
@
text
@d1 1
a1 1
# $FreeBSD: src/secure/lib/libssl/Makefile,v 1.7 2000/07/16 05:52:55 peter Exp $
d15 5
a19 5
	s2_clnt.c s2_enc.c s2_lib.c s2_meth.c s2_pkt.c s2_srvr.c s3_both.c \
	s3_clnt.c s3_enc.c s3_lib.c s3_meth.c s3_pkt.c s3_srvr.c ssl_algs.c \
	ssl_asn1.c ssl_cert.c ssl_ciph.c ssl_err.c ssl_err2.c ssl_lib.c \
	ssl_rsa.c ssl_sess.c ssl_stat.c ssl_txt.c t1_clnt.c t1_enc.c \
	t1_lib.c t1_meth.c t1_srvr.c
@


1.7
log
@Forced commit.  This is to try and help folks that used the international
crypto repo and have slightly different files but with the same version.
cvsup in 'checkout mode' has no trouble with this, but cvs can get really
silly about it.
@
text
@d1 1
a1 1
# $FreeBSD: src/secure/lib/libssl/Makefile,v 1.6 2000/04/13 07:37:31 kris Exp $
a22 10
CRYPTOHDRS= asn1/asn1.h asn1/asn1_mac.h bio/bio.h bf/blowfish.h bn/bn.h \
	buffer/buffer.h cast/cast.h comp/comp.h conf/conf.h crypto.h \
	des/des.h dh/dh.h dsa/dsa.h ../e_os.h ../e_os2.h ebcdic.h \
	err/err.h evp/evp.h hmac/hmac.h lhash/lhash.h md2/md2.h \
	md5/md5.h mdc2/mdc2.h objects/objects.h opensslv.h pem/pem.h \
	pem/pem2.h pkcs12/pkcs12.h pkcs7/pkcs7.h rand/rand.h rc2/rc2.h \
	rc4/rc4.h rc5/rc5.h ripemd/ripemd.h rsa/rsa.h stack/safestack.h \
	sha/sha.h stack/stack.h tmdiff.h txt_db/txt_db.h x509/x509.h \
	x509/x509_vfy.h x509v3/x509v3.h

d27 2
a28 2
.for h in ${CRYPTOHDRS}
EXTRA_HDRS+= ${LCRYPTO_SRC}/${h}
d31 1
a31 1
beforeinstall:  openssl/opensslconf.h
d33 1
a33 2
	    ${CRYPTO_HDRS} openssl/opensslconf.h \
	    ${DESTDIR}/usr/include/openssl
@


1.6
log
@Update for OpenSSL 0.9.5a and clean up a bit.
@
text
@d1 1
a1 1
# $FreeBSD: src/secure/lib/libssl/Makefile,v 1.5 2000/04/11 09:27:24 obrien Exp $
@


1.5
log
@* Fix dependancies so that ``make depend'' is not required.
* Some style fixes

Approved by:	kris
@
text
@d1 1
a1 1
# $FreeBSD: src/secure/lib/libssl/Makefile,v 1.4 2000/03/05 14:20:57 peter Exp $
d5 1
a5 1
LOPENSSL_SRC= ${.CURDIR}/../../../crypto/openssl/ssl
d7 1
a7 1
.PATH:	${LOPENSSL_SRC}
d14 1
a14 1
SRCS=	bio_ssl.c s23_clnt.c s23_lib.c s23_meth.c s23_pkt.c s23_srvr.c \
d19 1
a19 1
	t1_lib.c t1_meth.c t1_srvr.c 
a22 4
.for h in ${HDRS}
BUILD_HDRS_OPENSSL+= ${LOPENSSL_SRC}/${h}
.endfor

d33 4
d38 1
a38 1
BUILD_HDRS_CRYPTO+= ${LCRYPTO_SRC}/${h}
d41 1
a41 17
#	this bogus header was the easiest way to get the openssl/
#	directory populated
SRCS+=		openssl/headers-copied.h
CLEANDIRS+=	openssl

openssl/opensslconf.h: ${.CURDIR}/../libcrypto/opensslconf-${MACHINE_ARCH}.h
	@@test -d openssl || mkdir -p openssl
	cp ${.OODATE} ${.TARGET}

openssl/headers-copied.h:  openssl/opensslconf.h
	@@test -d openssl || mkdir -p openssl
	${INSTALL} ${COPY} -m 444 \
	    ${BUILD_HDRS_OPENSSL} ${BUILD_HDRS_CRYPTO} \
	    openssl
	@@touch ${.TARGET}

beforeinstall:
d43 1
a43 1
	    ${BUILD_HDRS_OPENSSL} \
@


1.4
log
@Merge from internat.freebsd.org; cleanup stray rsaref glue code reference
@
text
@d1 1
a1 1
# $FreeBSD: src/secure/lib/libssl/Makefile,v 1.3 2000/02/24 10:37:29 markm Exp $
d5 4
a13 2
LOPENSSL_SRC= ${.CURDIR}/../../../crypto/openssl/ssl

d23 4
d37 8
a44 5
beforedepend:	headers ${.OBJDIR}/openssl/opensslconf.h

DPADD+=	${.OBJDIR}/openssl/opensslconf.h

CLEANDIRS+=	${.OBJDIR}/openssl
d46 2
a47 2
${.OBJDIR}/openssl/opensslconf.h: ../libcrypto/opensslconf-${MACHINE_ARCH}.h
	@@test -d ${.OBJDIR}/openssl || mkdir -p ${.OBJDIR}/openssl; \
d50 6
a55 10
headers:
	@@test -d ${.OBJDIR}/openssl || mkdir -p ${.OBJDIR}/openssl; \
	for i in ${HDRS}; do \
		${INSTALL} ${COPY} -m 444 ${LOPENSSL_SRC}/$$i \
			${.OBJDIR}/openssl; \
	done; \
	for i in ${CRYPTOHDRS}; do \
		${INSTALL} ${COPY} -m 444 ${LCRYPTO_SRC}/$$i \
			${.OBJDIR}/openssl; \
	done
d58 3
a60 6
	for i in ${HDRS}; do \
		${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \
			${LOPENSSL_SRC}/$$i ${DESTDIR}/usr/include/openssl; \
	done

.PATH:	${LOPENSSL_SRC}
@


1.4.2.1
log
@MFC: rev 1.5 (dependancy fixups)
@
text
@d1 1
a1 1
# $FreeBSD$
a4 4
LOPENSSL_SRC= ${.CURDIR}/../../../crypto/openssl/ssl

.PATH:	${LOPENSSL_SRC}

d10 2
a20 4
.for h in ${HDRS}
BUILD_HDRS_OPENSSL+= ${LOPENSSL_SRC}/${h}
.endfor

d31 5
a35 8
.for h in ${CRYPTOHDRS}
BUILD_HDRS_CRYPTO+= ${LCRYPTO_SRC}/${h}
.endfor

#	this bogus header was the easiest way to get the openssl/
#	directory populated
SRCS+=		openssl/headers-copied.h
CLEANDIRS+=	openssl
d37 2
a38 2
openssl/opensslconf.h: ${.CURDIR}/../libcrypto/opensslconf-${MACHINE_ARCH}.h
	@@test -d openssl || mkdir -p openssl
d41 10
a50 6
openssl/headers-copied.h:  openssl/opensslconf.h
	@@test -d openssl || mkdir -p openssl
	${INSTALL} ${COPY} -m 444 \
	    ${BUILD_HDRS_OPENSSL} ${BUILD_HDRS_CRYPTO} \
	    openssl
	@@touch ${.TARGET}
d53 6
a58 3
	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \
	    ${BUILD_HDRS_OPENSSL} \
	    ${DESTDIR}/usr/include/openssl
@


1.4.2.2
log
@MFC: OpenSSL 0.9.5a
@
text
@d5 1
a5 1
LCRYPTOSSL_SRC=${LCRYPTO_SRC}/../ssl
d7 1
a7 1
.PATH:	${LCRYPTOSSL_SRC}
d14 1
a14 1
SRCS+=	bio_ssl.c s23_clnt.c s23_lib.c s23_meth.c s23_pkt.c s23_srvr.c \
d19 1
a19 1
	t1_lib.c t1_meth.c t1_srvr.c
d23 4
d37 2
a38 2
.for h in ${HDRS}
CRYPTO_HDRS+= ${LCRYPTOSSL_SRC}/${h}
d41 15
a55 3
.for h in ${CRYPTOHDRS}
EXTRA_HDRS+= ${LCRYPTO_SRC}/${h}
.endfor
d57 1
a57 1
beforeinstall:  openssl/opensslconf.h
d59 1
a59 1
	    ${CRYPTO_HDRS} openssl/opensslconf.h \
@


1.4.2.3
log
@MFC: Clean up include file generation
@
text
@d1 1
a1 1
# $FreeBSD: src/secure/lib/libssl/Makefile,v 1.4.2.2 2000/08/20 09:09:47 kris Exp $
d23 10
d37 2
a38 2
.for h in ${HDRS}
SSL_HDRS+= ${LCRYPTOSSL_SRC}/${h}
d41 1
a41 1
beforeinstall:  openssl/opensslconf.h openssl/evp.h
d43 2
a44 1
	    ${SSL_HDRS} ${DESTDIR}/usr/include/openssl
@


1.4.2.4
log
@MFC: OpenSSL 0.9.6
@
text
@d1 1
a1 1
# $FreeBSD: src/secure/lib/libssl/Makefile,v 1.9 2000/11/13 02:21:38 kris Exp $
d15 5
a19 5
	s2_clnt.c s2_enc.c s2_lib.c s2_meth.c s2_pkt.c s2_srvr.c \
	s3_both.c s3_clnt.c s3_enc.c s3_lib.c s3_meth.c s3_pkt.c \
	s3_srvr.c ssl_algs.c ssl_asn1.c ssl_cert.c ssl_ciph.c \
	ssl_err.c ssl_err2.c ssl_lib.c ssl_rsa.c ssl_sess.c ssl_stat.c \
	ssl_txt.c t1_clnt.c t1_enc.c t1_lib.c t1_meth.c t1_srvr.o \
@


1.4.2.5
log
@Belatedly bump the SHLIB_MAJOR of libcrypto and libssl.  This should have
been done soon after the OpenSSL 0.9.6 import when I first found out it
broke backwards compatibility, but better late than never -- at least it
won't trip up people who upgrade from 4.2-RELEASE to 4.3-RELEASE.

Approved by:	jkh
@
text
@d1 1
a1 1
# $FreeBSD: src/secure/lib/libssl/Makefile,v 1.4.2.4 2000/11/26 11:34:22 kris Exp $
d10 1
a10 1
SHLIB_MAJOR=	2
@


1.4.2.6
log
@MFC: Update to OpenSSL 0.9.6a
@
text
@d1 1
a1 1
# $FreeBSD: src/secure/lib/libssl/Makefile,v 1.10 2001/03/08 07:57:49 kris Exp $
@


1.4.2.7
log
@MFC: bsd.incs.mk support and assorted header fixes:

Install sys/<arch>/include/pc/*.h to /usr/include/machine/pc/.

Install sys/netatm/*/*.h to /usr/include/netatm/*/.

Don't install compatibility symlinks for <machine/soundcard.h>
and <machine/joystick.h>.

Don't install IPFILTER headers.  Userland utilities fetch them
directly, and they were not visible in the SHARED=symlinks case.

Resurrect SHARED=symlinks in Makefile.inc1.

PR:		docs/29534, bin/28002
@
text
@d1 1
a1 1
# $FreeBSD$
d21 13
a33 3
INCS=	ssl.h ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h
INCSDIR=${INCLUDEDIR}/openssl
HDRS+=	${INCS:S;^;../ssl/;}
@


1.4.2.8
log
@MFC OpenSSL 0.9.7
@
text
@d3 6
d10 1
a10 1
SHLIB_MAJOR=	3
d12 1
a12 1
NOLINT=		true
d14 1
a14 6
.if exists(Makefile.man)
.include "Makefile.man"
.endif
.include "../libcrypto/Makefile.inc"

SRCS=	bio_ssl.c s23_clnt.c s23_lib.c s23_meth.c s23_pkt.c s23_srvr.c \
d19 1
a19 1
	ssl_txt.c t1_clnt.c t1_enc.c t1_lib.c t1_meth.c t1_srvr.c
d21 1
a21 1
INCS=	kssl.h ssl.h ssl2.h ssl23.h ssl3.h tls1.h
d23 1
a25 3

.PATH:	${LCRYPTO_SRC}/ssl \
	${.CURDIR}/man
@


1.4.2.9
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/4/secure/lib/libssl/Makefile 110887 2003-02-14 22:38:23Z nectar $
@


1.3
log
@Freefall/Internat diff reducer.
@
text
@d1 1
a1 1
# $FreeBSD$
a29 4

.if defined(RSAREF) && ${RSAREF} == YES
CRYPTOHDRS+=	../rsaref/rsaref.h
.endif
@


1.2
log
@Add MAINTAINER tag so people don't feel the need to randomly frob with this.
@
text
@d1 1
a1 1
# $FreeBSD: src/secure/lib/libssl/Makefile,v 1.1 2000/01/14 05:49:23 kris Exp $
d27 1
a27 1
	rc4/rc4.h rc5/rc5.h ripemd/ripemd.h stack/safestack.h \
d32 1
a32 1
CRYPTOHDRS+=	rsa/rsa.h ../rsaref/rsaref.h
@


1.1
log
@Build infrastructure for OpenSSL
@
text
@d1 1
a1 1
# $FreeBSD$
d7 2
@

