head	1.2;
access;
symbols
	RELENG_8_4:1.2.0.2
	RELENG_9_1_0_RELEASE:1.1
	RELENG_9_1:1.1.0.18
	RELENG_9_1_BP:1.1
	RELENG_8_3_0_RELEASE:1.1
	RELENG_8_3:1.1.0.16
	RELENG_8_3_BP:1.1
	RELENG_9_0_0_RELEASE:1.1
	RELENG_9_0:1.1.0.14
	RELENG_9_0_BP:1.1
	RELENG_9:1.1.0.12
	RELENG_9_BP:1.1
	RELENG_7_4_0_RELEASE:1.1.8.2
	RELENG_8_2_0_RELEASE:1.1
	RELENG_7_4:1.1.8.2.0.2
	RELENG_7_4_BP:1.1.8.2
	RELENG_8_2:1.1.0.10
	RELENG_8_2_BP:1.1
	RELENG_7:1.1.0.8
	RELENG_8_1_0_RELEASE:1.1
	RELENG_8_1:1.1.0.6
	RELENG_8_1_BP:1.1
	RELENG_8_0_0_RELEASE:1.1
	RELENG_8_0:1.1.0.4
	RELENG_8_0_BP:1.1
	RELENG_8:1.1.0.2
	RELENG_8_BP:1.1;
locks; strict;
comment	@# @;


1.2
date	2012.07.12.19.30.53;	author jkim;	state dead;
branches
	1.2.2.1;
next	1.1;

1.1
date	2009.06.14.19.45.16;	author simon;	state Exp;
branches
	1.1.8.1;
next	;

1.2.2.1
date	2012.07.12.19.30.53;	author svnexp;	state dead;
branches;
next	1.2.2.2;

1.2.2.2
date	2013.03.28.13.02.36;	author svnexp;	state Exp;
branches;
next	;

1.1.8.1
date	2010.11.28.13.45.51;	author simon;	state dead;
branches;
next	1.1.8.2;

1.1.8.2
date	2010.11.28.13.45.51;	author simon;	state Exp;
branches;
next	;


desc
@@


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

Merge OpenSSL 1.0.1c.

Approved by:	benl (maintainer)
@
text
@LDFLAGS=-L../.. -lcrypto
CFLAGS=-I../../include -Wall -Werror -g

all: jpakedemo

jpakedemo: jpakedemo.o
	$(CC) -g -o jpakedemo jpakedemo.o $(LDFLAGS)
@


1.2.2.1
log
@file Makefile was added on branch RELENG_8_4 on 2013-03-28 13:02:36 +0000
@
text
@d1 7
@


1.2.2.2
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/248810
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@a0 7
LDFLAGS=-L../.. -lcrypto
CFLAGS=-I../../include -Wall -Werror -g

all: jpakedemo

jpakedemo: jpakedemo.o
	$(CC) -g -o jpakedemo jpakedemo.o $(LDFLAGS)
@


1.1
log
@SVN rev 194206 on 2009-06-14 19:45:16Z by simon

Merge OpenSSL 0.9.8k into head.

Approved by:	re
@
text
@@


1.1.8.1
log
@file Makefile was added on branch RELENG_7 on 2010-11-28 20:05:30 +0000
@
text
@d1 7
@


1.1.8.2
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
@a0 7
LDFLAGS=-L../.. -lcrypto
CFLAGS=-I../../include -Wall -Werror -g

all: jpakedemo

jpakedemo: jpakedemo.o
	$(CC) -g -o jpakedemo jpakedemo.o $(LDFLAGS)
@


