head	1.28;
access;
symbols
	RELENG_8_4:1.28.0.2
	RELENG_9_1_0_RELEASE:1.26.4.1.4.2
	RELENG_9_1:1.26.4.1.0.4
	RELENG_9_1_BP:1.26.4.1
	RELENG_8_3_0_RELEASE:1.26.2.1.8.1
	RELENG_8_3:1.26.2.1.0.8
	RELENG_8_3_BP:1.26.2.1
	RELENG_9_0_0_RELEASE:1.26.4.1.2.1
	RELENG_9_0:1.26.4.1.0.2
	RELENG_9_0_BP:1.26.4.1
	RELENG_9:1.26.0.4
	RELENG_9_BP:1.26
	RELENG_7_4_0_RELEASE:1.25.2.1.2.1
	RELENG_8_2_0_RELEASE:1.26.2.1.6.1
	RELENG_7_4:1.25.2.1.0.2
	RELENG_7_4_BP:1.25.2.1
	RELENG_8_2:1.26.2.1.0.6
	RELENG_8_2_BP:1.26.2.1
	RELENG_8_1_0_RELEASE:1.26.2.1.4.1
	RELENG_8_1:1.26.2.1.0.4
	RELENG_8_1_BP:1.26.2.1
	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.24.12.1
	RELENG_7_1:1.25.0.6
	RELENG_7_1_BP:1.25
	RELENG_6_4:1.24.0.12
	RELENG_6_4_BP:1.24
	RELENG_7_0_0_RELEASE:1.25
	RELENG_6_3_0_RELEASE:1.24
	RELENG_7_0:1.25.0.4
	RELENG_7_0_BP:1.25
	RELENG_6_3:1.24.0.10
	RELENG_6_3_BP:1.24
	RELENG_7:1.25.0.2
	RELENG_7_BP:1.25
	RELENG_6_2_0_RELEASE:1.24
	RELENG_6_2:1.24.0.8
	RELENG_6_2_BP:1.24
	RELENG_5_5_0_RELEASE:1.23.6.1
	RELENG_5_5:1.23.6.1.0.4
	RELENG_5_5_BP:1.23.6.1
	RELENG_6_1_0_RELEASE:1.24
	RELENG_6_1:1.24.0.6
	RELENG_6_1_BP:1.24
	RELENG_6_0_0_RELEASE:1.24
	RELENG_6_0:1.24.0.4
	RELENG_6_0_BP:1.24
	RELENG_6:1.24.0.2
	RELENG_6_BP:1.24
	RELENG_5_4_0_RELEASE:1.23.6.1
	RELENG_5_4:1.23.6.1.0.2
	RELENG_5_4_BP:1.23.6.1
	RELENG_4_11_0_RELEASE:1.11.2.7
	RELENG_4_11:1.11.2.7.0.4
	RELENG_4_11_BP:1.11.2.7
	RELENG_5_3_0_RELEASE:1.23
	RELENG_5_3:1.23.0.8
	RELENG_5_3_BP:1.23
	RELENG_5:1.23.0.6
	RELENG_5_BP:1.23
	RELENG_4_10_0_RELEASE:1.11.2.7
	RELENG_4_10:1.11.2.7.0.2
	RELENG_4_10_BP:1.11.2.7
	RELENG_5_2_1_RELEASE:1.23
	RELENG_5_2_0_RELEASE:1.23
	RELENG_5_2:1.23.0.4
	RELENG_5_2_BP:1.23
	RELENG_4_9_0_RELEASE:1.11.2.6
	RELENG_4_9:1.11.2.6.0.4
	RELENG_4_9_BP:1.11.2.6
	RELENG_5_1_0_RELEASE:1.23
	RELENG_5_1:1.23.0.2
	RELENG_5_1_BP:1.23
	RELENG_4_8_0_RELEASE:1.11.2.6
	RELENG_4_8:1.11.2.6.0.2
	RELENG_4_8_BP:1.11.2.6
	RELENG_5_0_0_RELEASE:1.20
	RELENG_5_0:1.20.0.2
	RELENG_5_0_BP:1.20
	RELENG_4_7_0_RELEASE:1.11.2.5
	RELENG_4_7:1.11.2.5.0.2
	RELENG_4_7_BP:1.11.2.5
	RELENG_4_6_2_RELEASE:1.11.2.3
	RELENG_4_6_1_RELEASE:1.11.2.3
	RELENG_4_6_0_RELEASE:1.11.2.3
	RELENG_4_6:1.11.2.3.0.6
	RELENG_4_6_BP:1.11.2.3
	RELENG_4_5_0_RELEASE:1.11.2.3
	RELENG_4_5:1.11.2.3.0.4
	RELENG_4_5_BP:1.11.2.3
	RELENG_4_4_0_RELEASE:1.11.2.3
	RELENG_4_4:1.11.2.3.0.2
	RELENG_4_4_BP:1.11.2.3
	RELENG_4_3_0_RELEASE:1.11.2.2
	RELENG_4_3:1.11.2.2.0.2
	RELENG_4_3_BP:1.11.2.2
	RELENG_4_2_0_RELEASE:1.11.2.1
	RELENG_4_1_1_RELEASE:1.11.2.1
	PRE_SMPNG:1.15
	RELENG_4_1_0_RELEASE:1.11
	RELENG_4_0_0_RELEASE:1.11
	RELENG_4:1.11.0.2
	RELENG_4_BP:1.11;
locks; strict;
comment	@# @;


1.28
date	2012.11.17.01.50.27;	author svnexp;	state Exp;
branches
	1.28.2.1;
next	1.27;

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

1.26
date	2009.06.14.19.46.18;	author simon;	state Exp;
branches
	1.26.2.1
	1.26.4.1;
next	1.25;

1.25
date	2006.07.29.19.41.40;	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.02.25.06.04.12;	author nectar;	state Exp;
branches
	1.24.2.1
	1.24.12.1;
next	1.23;

1.23
date	2003.02.27.23.07.26;	author ru;	state Exp;
branches
	1.23.6.1;
next	1.22;

1.22
date	2003.02.10.19.57.55;	author nectar;	state Exp;
branches;
next	1.21;

1.21
date	2003.01.28.22.58.14;	author markm;	state Exp;
branches;
next	1.20;

1.20
date	2002.11.21.08.48.08;	author kris;	state Exp;
branches;
next	1.19;

1.19
date	2002.05.14.19.39.00;	author markm;	state Exp;
branches;
next	1.18;

1.18
date	2001.07.12.09.17.51;	author ru;	state Exp;
branches;
next	1.17;

1.17
date	2001.03.26.14.53.28;	author ru;	state Exp;
branches;
next	1.16;

1.16
date	2000.11.13.02.21.38;	author kris;	state Exp;
branches;
next	1.15;

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

1.14
date	2000.07.16.05.53.01;	author peter;	state Exp;
branches;
next	1.13;

1.13
date	2000.06.24.06.50.58;	author markm;	state Exp;
branches;
next	1.12;

1.12
date	2000.04.13.07.37.35;	author kris;	state Exp;
branches;
next	1.11;

1.11
date	2000.02.26.13.12.59;	author peter;	state Exp;
branches
	1.11.2.1;
next	1.10;

1.10
date	2000.02.25.14.15.31;	author peter;	state Exp;
branches;
next	1.9;

1.9
date	2000.02.25.08.21.01;	author peter;	state Exp;
branches;
next	1.8;

1.8
date	2000.02.24.09.52.37;	author markm;	state Exp;
branches;
next	1.7;

1.7
date	2000.02.24.09.48.58;	author markm;	state Exp;
branches;
next	1.6;

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

1.5
date	2000.02.13.00.53.12;	author kris;	state Exp;
branches;
next	1.4;

1.4
date	2000.01.20.07.29.01;	author kris;	state Exp;
branches;
next	1.3;

1.3
date	2000.01.16.21.00.06;	author kris;	state Exp;
branches;
next	1.2;

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

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

1.28.2.1
date	2012.11.17.01.50.27;	author svnexp;	state dead;
branches;
next	1.28.2.2;

1.28.2.2
date	2013.03.28.13.03.38;	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
	1.26.2.1.4.1
	1.26.2.1.6.1
	1.26.2.1.8.1;
next	1.26.2.2;

1.26.2.2
date	2012.11.17.10.36.17;	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.1.4.1
date	2010.06.14.02.09.06;	author kensmith;	state Exp;
branches;
next	;

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

1.26.2.1.8.1
date	2012.03.03.06.15.13;	author kensmith;	state Exp;
branches;
next	1.26.2.1.8.2;

1.26.2.1.8.2
date	2012.11.17.08.24.57;	author svnexp;	state Exp;
branches;
next	;

1.26.4.1
date	2011.09.23.00.51.37;	author kensmith;	state Exp;
branches
	1.26.4.1.2.1
	1.26.4.1.4.1;
next	1.26.4.2;

1.26.4.2
date	2012.11.17.11.36.33;	author svnexp;	state Exp;
branches;
next	;

1.26.4.1.2.1
date	2011.11.11.04.20.22;	author kensmith;	state Exp;
branches;
next	1.26.4.1.2.2;

1.26.4.1.2.2
date	2012.11.17.08.36.32;	author svnexp;	state Exp;
branches;
next	;

1.26.4.1.4.1
date	2012.08.05.23.54.33;	author kensmith;	state Exp;
branches;
next	1.26.4.1.4.2;

1.26.4.1.4.2
date	2012.11.17.08.47.23;	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	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	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.24.2.1
date	2012.11.17.07.41.25;	author svnexp;	state Exp;
branches;
next	;

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

1.23.6.1
date	2005.03.01.16.47.41;	author nectar;	state Exp;
branches;
next	;

1.11.2.1
date	2000.08.20.08.56.56;	author kris;	state Exp;
branches;
next	1.11.2.2;

1.11.2.2
date	2000.11.26.11.34.23;	author kris;	state Exp;
branches;
next	1.11.2.3;

1.11.2.3
date	2001.07.04.23.24.42;	author kris;	state Exp;
branches;
next	1.11.2.4;

1.11.2.4
date	2002.07.03.22.13.23;	author des;	state Exp;
branches;
next	1.11.2.5;

1.11.2.5
date	2002.07.21.21.12.38;	author ru;	state Exp;
branches;
next	1.11.2.6;

1.11.2.6
date	2003.02.14.22.38.22;	author nectar;	state Exp;
branches;
next	1.11.2.7;

1.11.2.7
date	2003.11.27.15.05.37;	author ru;	state Exp;
branches;
next	1.11.2.8;

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


desc
@@


1.28
log
@Switching exporter and resync
@
text
@# $FreeBSD: head/secure/usr.bin/openssl/Makefile 238405 2012-07-12 19:30:53Z jkim $

PROG=	openssl

DPADD=	${LIBSSL} ${LIBCRYPTO}
LDADD=	-lssl -lcrypto

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

CFLAGS+=-DMONOLITH -I${.CURDIR}

SRCS+=	app_rand.c apps.c asn1pars.c ca.c ciphers.c cms.c crl.c crl2p7.c \
	dgst.c dh.c dhparam.c dsa.c dsaparam.c ec.c ecparam.c enc.c engine.c \
	errstr.c gendh.c gendsa.c genpkey.c genrsa.c nseq.c ocsp.c openssl.c \
	passwd.c pkcs12.c pkcs7.c pkcs8.c pkey.c pkeyparam.c pkeyutl.c \
	prime.c rand.c req.c rsa.c rsautl.c s_cb.c s_client.c s_server.c \
	s_socket.c s_time.c sess_id.c smime.c speed.c spkac.c srp.c ts.c \
	verify.c version.c x509.c

.include <bsd.prog.mk>

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


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


1.28.2.2
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/248810
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@a0 26
# $FreeBSD: releng/8.4/secure/usr.bin/openssl/Makefile 194207 2009-06-14 19:46:18Z simon $

PROG=	openssl

DPADD=	${LIBSSL} ${LIBCRYPTO}
LDADD=	-lssl -lcrypto

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

CFLAGS+= -DMONOLITH -I${.CURDIR}

SRCS+=	app_rand.c apps.c asn1pars.c ca.c ciphers.c cms.c crl.c crl2p7.c \
	dgst.c dh.c dhparam.c dsa.c dsaparam.c ec.c ecparam.c enc.c \
	engine.c errstr.c \
	gendh.c gendsa.c genrsa.c nseq.c ocsp.c openssl.c passwd.c \
	pkcs12.c pkcs7.c pkcs8.c prime.c rand.c req.c rsa.c rsautl.c s_cb.c \
	s_client.c s_server.c s_socket.c s_time.c sess_id.c smime.c \
	speed.c spkac.c verify.c version.c x509.c

.include <bsd.prog.mk>

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


1.27
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.26
log
@SVN rev 194207 on 2009-06-14 19:46:18Z by simon

Update build infrastructure for OpenSSL 0.9.8k.
@
text
@d13 1
a13 1
CFLAGS+= -DMONOLITH -I${.CURDIR}
d16 6
a21 6
	dgst.c dh.c dhparam.c dsa.c dsaparam.c ec.c ecparam.c enc.c \
	engine.c errstr.c \
	gendh.c gendsa.c genrsa.c nseq.c ocsp.c openssl.c passwd.c \
	pkcs12.c pkcs7.c pkcs8.c prime.c rand.c req.c rsa.c rsautl.c s_cb.c \
	s_client.c s_server.c s_socket.c s_time.c sess_id.c smime.c \
	speed.c spkac.c verify.c version.c x509.c
@


1.26.4.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.26.4.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/usr.bin/openssl/Makefile 194207 2009-06-14 19:46:18Z simon $
@


1.26.4.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.26.4.1.4.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.1/secure/usr.bin/openssl/Makefile 194207 2009-06-14 19:46:18Z simon $
@


1.26.4.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.26.4.1.2.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.0/secure/usr.bin/openssl/Makefile 194207 2009-06-14 19:46:18Z simon $
@


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 ##
## 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/usr.bin/openssl/Makefile 194207 2009-06-14 19:46:18Z simon $
@


1.26.2.1.8.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.1.8.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/8.3/secure/usr.bin/openssl/Makefile 194207 2009-06-14 19:46:18Z simon $
@


1.26.2.1.6.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.1.4.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
@d15 1
a15 1
SRCS+=	app_rand.c apps.c asn1pars.c ca.c ciphers.c crl.c crl2p7.c \
@


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
@d15 1
a15 1
SRCS+=	app_rand.c apps.c asn1pars.c ca.c ciphers.c cms.c crl.c crl2p7.c \
@


1.25.2.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/7/secure/usr.bin/openssl/Makefile 215997 2010-11-28 13:45:51Z 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
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/7.4/secure/usr.bin/openssl/Makefile 215997 2010-11-28 13:45:51Z 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
@Update OpenSSL 0.9.7d -> 0.9.7e.
@
text
@d16 2
a17 1
	dgst.c dh.c dhparam.c dsa.c dsaparam.c enc.c engine.c errstr.c \
@


1.24.2.1
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/6/secure/usr.bin/openssl/Makefile 142429 2005-02-25 06:04:12Z nectar $
@


1.24.12.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.23
log
@Handle includes the normal way.

Reviewed by:	markm
Approved by:	nectar
@
text
@d18 1
a18 1
	pkcs12.c pkcs7.c pkcs8.c rand.c req.c rsa.c rsautl.c s_cb.c \
@


1.23.6.1
log
@MFC update OpenSSL 0.9.7d -> 0.9.7e.
@
text
@d18 1
a18 1
	pkcs12.c pkcs7.c pkcs8.c prime.c rand.c req.c rsa.c rsautl.c s_cb.c \
@


1.22
log
@Install the OpenSSL man pages in /usr/share/openssl/man
and remove the WANT_OPENSSL_MANPAGES knob.
@
text
@d3 1
a3 2
PROG=	xopenssl
PROGNAME=	openssl
a6 2

NOLINT=		true
@


1.21
log
@Update for OpenSSL 0.9.7. No assembler code at the moment. This
will follow.
@
text
@d11 3
a24 6
MAN1=	CA.pl.1 asn1parse.1 ca.1 ciphers.1 config.1 crl.1 crl2pkcs7.1 \
	dgst.1 dhparam.1 dsa.1 dsaparam.1 enc.1 gendsa.1 genrsa.1 \
	nseq.1 ocsp.1 openssl.1 passwd.1 pkcs12.1 pkcs7.1 pkcs8.1 \
	rand.1 req.1 rsa.1 rsautl.1 s_client.1 s_server.1 sess_id.1 \
	smime.1 speed.1 spkac.1 verify.1 version.1 x509.1

a28 9

mann-update:
	for i in `( cd ${LCRYPTO_DOC}/apps ; ls *.pod )` ; do \
		cp ${LCRYPTO_DOC}/apps/$$i . ;\
		pod2man --section=3 --release="0.9.7" --center="OpenSSL" \
			$$i > ${.CURDIR}/man/$${i%%.pod}.1 ;\
		rm $$i ;\
		echo $${i%%.pod} ;\
	done
@


1.20
log
@Remove myself as maintainer of openssl; I no longer have enough time to
devote to it.
@
text
@d3 2
a4 2
OPENSSL_SRC= ${.CURDIR}/../../../crypto/openssl/apps
LCRYPTO_SRC= ${.CURDIR}/../../../crypto/openssl/crypto
d6 2
a7 1
.PATH:	${OPENSSL_SRC} ${.CURDIR}/../../lib/libcrypto/man
d9 1
a9 1
PROG=	openssl
d11 1
a11 3
DPADD=	${LIBSSL} ${LIBCRYPTO}
LDADD=	-lssl -lcrypto
MLINKS=	openssl.1 ssl.8
d15 12
a26 11
WITH_RSA?=	YES
.if ${WITH_RSA} == NO
CFLAGS+=	-DNO_RSA -DNO_SSL2
.endif

SRCS=	app_rand.c apps.c asn1pars.c ca.c ciphers.c crl.c crl2p7.c \
	dgst.c dh.c dhparam.c dsa.c dsaparam.c enc.c errstr.c gendh.c \
	gendsa.c genrsa.c nseq.c openssl.c passwd.c pkcs12.c pkcs7.c \
	pkcs8.c rand.c req.c rsa.c rsautl.c s_cb.c s_client.c \
	s_server.c s_socket.c s_time.c sess_id.c smime.c speed.c \
	spkac.c verify.c version.c x509.o
d29 12
@


1.19
log
@Build using pregenerated manpages; don't use perl to translate .pod's.
The translated .pod's have already been committed.
@
text
@a9 2
MAINTAINER=	kris

@


1.18
log
@Added missing DPADD and CLEANFILES.
@
text
@d1 1
a1 1
# $FreeBSD: src/secure/usr.bin/openssl/Makefile,v 1.17 2001/03/26 14:53:28 ru Exp $
d6 1
a6 1
.PATH:	${OPENSSL_SRC} ${OPENSSL_SRC}/../doc/apps/
a29 2
CLEANFILES=	openssl.1

a30 5

.SUFFIXES: .out .o .c .cc .cpp .cxx .C .m .y .l .s .S .pod

.pod.1:
	pod2man ${.IMPSRC} > ${.TARGET}
@


1.17
log
@secure/ build fixes:

- TELNETOBJDIR is gone.  `buildworld' already installs libtelnet.a
  in ${WORLDTMP}/usr/lib, and we have LIBRARY_PATH pointing there.

- SSHDIR (formerly SSHSRC) is now shared between all SSH modules.
  New LIBSSH is introduced for libssh.a (an internal static lib).
  Previously, build without prior `obj' was broken; SSH modules
  always looked for libssh.a in ${.OBJDIR}.  Also, the dependancies
  on the libssh.a were missing.

- libtelnet/ did not install the crypto version of telnet.h into
  /usr/include/arpa.

- Removed BINOWN, BINMODE, BINDIR and SRCS with default values.

Reviewed by:	markm

- MAN[1-9] -> MAN.
@
text
@d1 1
a1 1
# $FreeBSD: src/secure/usr.bin/openssl/Makefile,v 1.16 2000/11/13 02:21:38 kris Exp $
d12 1
d29 2
@


1.16
log
@Update for OpenSSL 0.9.6
@
text
@d1 1
a1 1
# $FreeBSD: src/secure/usr.bin/openssl/Makefile,v 1.15 2000/08/03 05:29:04 kris Exp $
a12 1
MAN1=	openssl.1
@


1.15
log
@Install the openssl(1) manpage with an MLINK from ssl(8) to at least put
something in the location where OpenSSH likes to point.
@
text
@d1 1
a1 1
# $FreeBSD: src/secure/usr.bin/openssl/Makefile,v 1.14 2000/07/16 05:53:01 peter Exp $
d23 6
a28 5
SRCS=	app_rand.c apps.c asn1pars.c ca.c ciphers.c crl.c crl2p7.c dgst.c \
	dh.c dhparam.c dsa.c dsaparam.c enc.c errstr.c gendh.c gendsa.c \
	genrsa.c nseq.c openssl.c passwd.c pkcs12.c pkcs7.c pkcs8.c rand.c \
	req.c rsa.c s_cb.c s_client.c s_server.c s_socket.c s_time.c \
	sess_id.c smime.c speed.c spkac.c verify.c version.c x509.c
@


1.14
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 6
a6 1
# $FreeBSD: src/secure/usr.bin/openssl/Makefile,v 1.13 2000/06/24 06:50:58 markm Exp $
d13 2
a14 4
NOMAN=	noman 

OPENSSL_SRC= ${.CURDIR}/../../../crypto/openssl/apps
LCRYPTO_SRC= ${.CURDIR}/../../../crypto/openssl/crypto
d29 1
a29 1
.PATH:	${OPENSSL_SRC}
d31 4
a34 1
.include <bsd.prog.mk>
@


1.13
log
@MFI. This is a documentation-only, diffreducing patch, that if
invoked will cause breakage. US Users - DO NOT try to turn on
IDEA - the sources are not included.
@
text
@d1 1
a1 1
# $FreeBSD$
@


1.12
log
@Update for OpenSSL 0.9.5a and clean up a bit.
@
text
@d1 1
a1 1
# $FreeBSD: src/secure/usr.bin/openssl/Makefile,v 1.11 2000/02/26 13:12:59 peter Exp $
d13 1
a13 1
CFLAGS+= -DMONOLITH -DNO_IDEA -I${.CURDIR}
@


1.11
log
@Merge from internat.freebsd.org repo, minus change to rsa_eay.c (missing)

Reorganize and unify libcrypto's interface so that the RSA implementation
is chosen at runtime via dlopen().

This is a checkpoint and may require more tweaks still.
@
text
@d1 1
a1 1
# $FreeBSD: src/secure/usr.bin/openssl/Makefile,v 1.10 2000/02/25 14:15:31 peter Exp $
d20 5
a24 5
SRCS=	apps.c asn1pars.c ca.c ciphers.c crl.c crl2p7.c dgst.c dh.c \
	dsa.c dsaparam.c enc.c errstr.c gendh.c gendsa.c genrsa.c \
	nseq.c openssl.c pkcs12.c pkcs7.c pkcs8.c req.c rsa.c s_cb.c \
	s_client.c s_server.c s_socket.c s_time.c sess_id.c speed.c \
	verify.c version.c x509.c
@


1.11.2.1
log
@MFC: OpenSSL 0.9.5a
@
text
@d1 1
a1 6
# $FreeBSD$

OPENSSL_SRC= ${.CURDIR}/../../../crypto/openssl/apps
LCRYPTO_SRC= ${.CURDIR}/../../../crypto/openssl/crypto

.PATH:	${OPENSSL_SRC} ${OPENSSL_SRC}/../doc/apps/
d8 4
a11 2
MAN1=	openssl.1
MLINKS=	openssl.1 ssl.8
d13 1
a13 1
CFLAGS+= -DMONOLITH -I${.CURDIR}
d20 7
a26 5
SRCS=	app_rand.c apps.c asn1pars.c ca.c ciphers.c crl.c crl2p7.c dgst.c \
	dh.c dhparam.c dsa.c dsaparam.c enc.c errstr.c gendh.c gendsa.c \
	genrsa.c nseq.c openssl.c passwd.c pkcs12.c pkcs7.c pkcs8.c rand.c \
	req.c rsa.c s_cb.c s_client.c s_server.c s_socket.c s_time.c \
	sess_id.c smime.c speed.c spkac.c verify.c version.c x509.c
a28 5

.SUFFIXES: .out .o .c .cc .cpp .cxx .C .m .y .l .s .S .pod

.pod.1:
	pod2man ${.IMPSRC} > ${.TARGET}
@


1.11.2.2
log
@MFC: OpenSSL 0.9.6
@
text
@d1 1
a1 1
# $FreeBSD: src/secure/usr.bin/openssl/Makefile,v 1.16 2000/11/13 02:21:38 kris Exp $
d23 5
a27 6
SRCS=	app_rand.c apps.c asn1pars.c ca.c ciphers.c crl.c crl2p7.c \
	dgst.c dh.c dhparam.c dsa.c dsaparam.c enc.c errstr.c gendh.c \
	gendsa.c genrsa.c nseq.c openssl.c passwd.c pkcs12.c pkcs7.c \
	pkcs8.c rand.c req.c rsa.c rsautl.c s_cb.c s_client.c \
	s_server.c s_socket.c s_time.c sess_id.c smime.c speed.c \
	spkac.c verify.c version.c x509.o
@


1.11.2.3
log
@MFC: Update to OpenSSL 0.9.6a
@
text
@d1 1
a1 1
# $FreeBSD: src/secure/usr.bin/openssl/Makefile,v 1.17 2001/03/26 14:53:28 ru Exp $
d13 1
@


1.11.2.4
log
@Update Makefiles for OpenSSH 3.4p1.  Remove some hacks made superfluous
by an earlier commit to src/Makefile.inc1.  Reduce diffs against -CURRENT.

Sponsored by:	DARPA, NAI Labs
@
text
@d1 1
a1 1
# $FreeBSD$
d12 1
a12 1
LDADD+=	-lssl -lcrypto
@


1.11.2.5
log
@MFC: 1.18 (added missing DPADD and CLEANFILES).
@
text
@d12 1
a12 2
DPADD=	${LIBSSL} ${LIBCRYPTO}
LDADD=	-lssl -lcrypto
a27 2

CLEANFILES=	openssl.1
@


1.11.2.6
log
@MFC OpenSSL 0.9.7
@
text
@d3 8
a10 2
PROG=	xopenssl
PROGNAME=	openssl
d14 1
d16 1
a16 1
NOLINT=		true
d18 3
a20 2
.if exists(Makefile.man)
.include "Makefile.man"
a21 1
.include "../../lib/libcrypto/Makefile.inc"
d23 6
a28 1
CFLAGS+= -DMONOLITH -I${.CURDIR}
d30 1
a30 6
SRCS+=	app_rand.c apps.c asn1pars.c ca.c ciphers.c crl.c crl2p7.c \
	dgst.c dh.c dhparam.c dsa.c dsaparam.c enc.c engine.c errstr.c \
	gendh.c gendsa.c genrsa.c nseq.c ocsp.c openssl.c passwd.c \
	pkcs12.c pkcs7.c pkcs8.c rand.c req.c rsa.c rsautl.c s_cb.c \
	s_client.c s_server.c s_socket.c s_time.c sess_id.c smime.c \
	speed.c spkac.c verify.c version.c x509.c
d34 4
a37 2
.PATH:	${LCRYPTO_SRC}/apps \
	${.CURDIR}/man
@


1.11.2.7
log
@MFC: Handle includes the normal way.
@
text
@d3 2
a4 1
PROG=	openssl
d8 2
@


1.11.2.8
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/4/secure/usr.bin/openssl/Makefile 123006 2003-11-27 15:05:37Z ru $
@


1.10
log
@Merge from internat.freebsd.org; deal with -DRSAref the same way as
libcrypto - not that it means much on the US code tree.
@
text
@d1 1
a1 1
# $FreeBSD: src/secure/usr.bin/openssl/Makefile,v 1.9 2000/02/25 08:21:01 peter Exp $
a17 7
.else
.if !defined(USA_RESIDENT) || ${USA_RESIDENT} != NO
RSAREF=		YES
.endif
.endif
.if (defined(RSAREF) && ${RSAREF} == YES) || !exists(${LCRYPTO_SRC}/rsa/rsa_eay.c)
CFLAGS+=	-DRSAref
@


1.9
log
@Don't pull in libRSAglue for the rsaref case.  Since this is linked
dynamically by default, we use the dlopen() calls to load librsaref.so
on US code trees.
@
text
@d1 1
a1 1
# $FreeBSD: src/secure/usr.bin/openssl/Makefile,v 1.8 2000/02/24 09:52:37 markm Exp $
d11 1
d15 4
a18 2
LOCALBASE?=	/usr/local

d20 2
a21 5
.if !exists(${LOCALBASE}/lib/librsaref.a)
CFLAGS+= -DNO_RSA -DNO_SSL2
.else
CFLAGS+= -DRSAref
LDADD+=	${LOCALBASE}/lib/librsaref.a
d23 2
@


1.8
log
@Diff reducer. Comes from Internat.
@
text
@d1 1
a1 1
# $FreeBSD$
d21 1
a21 1
LDADD+=	-lRSAglue ${LOCALBASE}/lib/librsaref.a
@


1.7
log
@Remove useless whitespace.

Part of big commit OK'ed by: JKH
@
text
@d16 1
d22 1
@


1.6
log
@Back out the previous commit - it broke world and was not approved.
I don't know what I was thinking committing without approval - sorry.
@
text
@d1 1
a1 1
# $FreeBSD: src/secure/usr.bin/openssl/Makefile,v 1.5 2000/02/13 00:53:12 kris Exp $
a31 13













@


1.5
log
@Link dynamically, not statically.
@
text
@d1 1
a1 1
# $FreeBSD: src/secure/usr.bin/openssl/Makefile,v 1.4 2000/01/20 07:29:01 kris Exp $
d7 1
a7 1
LDADD=	-L/usr/lib -lssl -lcrypto
d20 1
a20 1
LDADD+=	-L${LOCALBASE}/lib -lRSAglue -lrsaref
@


1.4
log
@Don't search for libraries in ${LOCALBASE}. This should fix the problems
people were seeing with conflicts with the openssl port.
@
text
@d1 1
a1 1
# $FreeBSD: src/secure/usr.bin/openssl/Makefile,v 1.3 2000/01/16 21:00:06 kris Exp $
d7 1
a7 1
LDADD=	-lssl -lcrypto
d20 1
a20 1
LDADD+=	-lRSAglue ${LOCALBASE}/lib/librsaref.a
@


1.3
log
@The wrong version of the file was committed previously which explains the
problems seen here.
@
text
@d1 1
a1 1
# $FreeBSD: src/secure/usr.bin/openssl/Makefile,v 1.2 2000/01/16 02:20:03 kris Exp $
d20 1
a20 1
LDADD+=	-L${LOCALBASE}/lib -lrsaref
@


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/usr.bin/openssl/Makefile,v 1.1 2000/01/14 05:49:29 kris Exp $
d14 3
a16 1
.if !defined(RSA_NONCOMMERCIAL) || ${RSA_NONCOMMERCIAL} != YES
a17 1
WITH_RSA= NO
d20 1
a20 2
LDADD+=	-L/usr/local/lib -lrsaref
RSAREF= YES
d32 13
@


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

