head	1.3;
access;
symbols
	RELENG_8_4:1.3.0.2
	RELENG_9_1_0_RELEASE:1.2.10.1
	RELENG_9_1:1.2.10.1.0.2
	RELENG_9_1_BP:1.2.10.1
	RELENG_8_3_0_RELEASE:1.2
	RELENG_8_3:1.2.0.14
	RELENG_8_3_BP:1.2
	RELENG_9_0_0_RELEASE:1.2
	RELENG_9_0:1.2.0.12
	RELENG_9_0_BP:1.2
	RELENG_9:1.2.0.10
	RELENG_9_BP:1.2
	RELENG_7_4_0_RELEASE:1.1.1.9.2.1
	RELENG_8_2_0_RELEASE:1.2
	RELENG_7_4:1.1.1.9.2.1.0.2
	RELENG_7_4_BP:1.1.1.9.2.1
	RELENG_8_2:1.2.0.8
	RELENG_8_2_BP:1.2
	RELENG_8_1_0_RELEASE:1.2
	RELENG_8_1:1.2.0.6
	RELENG_8_1_BP:1.2
	RELENG_7_3_0_RELEASE:1.1.1.9
	RELENG_7_3:1.1.1.9.0.10
	RELENG_7_3_BP:1.1.1.9
	RELENG_8_0_0_RELEASE:1.2
	RELENG_8_0:1.2.0.4
	RELENG_8_0_BP:1.2
	RELENG_8:1.2.0.2
	RELENG_8_BP:1.2
	RELENG_7_2_0_RELEASE:1.1.1.9
	RELENG_7_2:1.1.1.9.0.8
	RELENG_7_2_BP:1.1.1.9
	RELENG_7_1_0_RELEASE:1.1.1.9
	RELENG_6_4_0_RELEASE:1.1.1.6
	RELENG_7_1:1.1.1.9.0.6
	RELENG_7_1_BP:1.1.1.9
	RELENG_6_4:1.1.1.6.0.20
	RELENG_6_4_BP:1.1.1.6
	RELENG_7_0_0_RELEASE:1.1.1.9
	RELENG_6_3_0_RELEASE:1.1.1.6
	RELENG_7_0:1.1.1.9.0.4
	RELENG_7_0_BP:1.1.1.9
	RELENG_6_3:1.1.1.6.0.18
	RELENG_6_3_BP:1.1.1.6
	RELENG_7:1.1.1.9.0.2
	RELENG_7_BP:1.1.1.9
	v0_9_8e:1.1.1.9
	RELENG_6_2_0_RELEASE:1.1.1.6
	RELENG_6_2:1.1.1.6.0.16
	RELENG_6_2_BP:1.1.1.6
	v0_9_8d:1.1.1.8
	v0_9_8b:1.1.1.7
	RELENG_5_5_0_RELEASE:1.1.1.6
	RELENG_5_5:1.1.1.6.0.14
	RELENG_5_5_BP:1.1.1.6
	RELENG_6_1_0_RELEASE:1.1.1.6
	RELENG_6_1:1.1.1.6.0.12
	RELENG_6_1_BP:1.1.1.6
	RELENG_6_0_0_RELEASE:1.1.1.6
	RELENG_6_0:1.1.1.6.0.10
	RELENG_6_0_BP:1.1.1.6
	RELENG_6:1.1.1.6.0.8
	RELENG_6_BP:1.1.1.6
	RELENG_5_4_0_RELEASE:1.1.1.6
	RELENG_5_4:1.1.1.6.0.6
	RELENG_5_4_BP:1.1.1.6
	v0_9_7e:1.1.1.6
	RELENG_4_11_0_RELEASE:1.1.1.1.2.5
	RELENG_4_11:1.1.1.1.2.5.0.4
	RELENG_4_11_BP:1.1.1.1.2.5
	RELENG_5_3_0_RELEASE:1.1.1.6
	RELENG_5_3:1.1.1.6.0.4
	RELENG_5_3_BP:1.1.1.6
	RELENG_5:1.1.1.6.0.2
	RELENG_5_BP:1.1.1.6
	RELENG_4_10_0_RELEASE:1.1.1.1.2.5
	RELENG_4_10:1.1.1.1.2.5.0.2
	RELENG_4_10_BP:1.1.1.1.2.5
	v0_9_7d:1.1.1.6
	RELENG_5_2_1_RELEASE:1.1.1.5
	RELENG_5_2_0_RELEASE:1.1.1.5
	RELENG_5_2:1.1.1.5.0.2
	RELENG_5_2_BP:1.1.1.5
	RELENG_4_9_0_RELEASE:1.1.1.1.2.4
	RELENG_4_9:1.1.1.1.2.4.0.2
	RELENG_4_9_BP:1.1.1.1.2.4
	v0_9_7c:1.1.1.5
	RELENG_5_1_0_RELEASE:1.1.1.4
	RELENG_5_1:1.1.1.4.0.4
	RELENG_5_1_BP:1.1.1.4
	RELENG_4_8_0_RELEASE:1.1.1.1.2.3
	RELENG_4_8:1.1.1.1.2.3.0.4
	RELENG_4_8_BP:1.1.1.1.2.3
	v0_9_7a:1.1.1.4
	v0_9_7:1.1.1.4
	RELENG_5_0_0_RELEASE:1.1.1.4
	RELENG_5_0:1.1.1.4.0.2
	RELENG_5_0_BP:1.1.1.4
	RELENG_4_7_0_RELEASE:1.1.1.1.2.3
	RELENG_4_7:1.1.1.1.2.3.0.2
	RELENG_4_7_BP:1.1.1.1.2.3
	RELENG_4_6_2_RELEASE:1.1.1.1.2.2.6.1
	v0_9_6g:1.1.1.4
	v0_9_6f:1.1.1.4
	v0_9_6e:1.1.1.4
	v0_9_6d:1.1.1.4
	RELENG_4_6_1_RELEASE:1.1.1.1.2.2
	RELENG_4_6_0_RELEASE:1.1.1.1.2.2
	RELENG_4_6:1.1.1.1.2.2.0.6
	RELENG_4_6_BP:1.1.1.1.2.2
	RELENG_4_5_0_RELEASE:1.1.1.1.2.2
	v0_9_6c:1.1.1.3
	RELENG_4_5:1.1.1.1.2.2.0.4
	RELENG_4_5_BP:1.1.1.1.2.2
	RELENG_4_4_0_RELEASE:1.1.1.1.2.2
	RELENG_4_4:1.1.1.1.2.2.0.2
	RELENG_4_4_BP:1.1.1.1.2.2
	v0_9_6b:1.1.1.3
	v0_9_6a:1.1.1.3
	RELENG_4_3_0_RELEASE:1.1.1.1.2.1
	RELENG_4_3:1.1.1.1.2.1.0.2
	RELENG_4_3_BP:1.1.1.1.2.1
	v0_9_6_2001_02_10:1.1.1.3
	RELENG_4_2_0_RELEASE:1.1.1.1.2.1
	v0_9_6:1.1.1.2
	RELENG_4_1_1_RELEASE:1.1.1.1.2.1
	PRE_SMPNG:1.1.1.2
	RELENG_4_1_0_RELEASE:1.1.1.1
	v0_9_5a:1.1.1.2
	RELENG_4_0_0_RELEASE:1.1.1.1
	RELENG_4:1.1.1.1.0.2
	RELENG_4_BP:1.1.1.1
	v0_9_4:1.1.1.1
	OPENSSL:1.1.1;
locks; strict;
comment	@# @;


1.3
date	2012.06.27.18.44.36;	author jkim;	state Exp;
branches
	1.3.2.1;
next	1.2;

1.2
date	2009.06.14.19.45.16;	author simon;	state Exp;
branches
	1.2.2.1
	1.2.10.1
	1.2.12.1
	1.2.14.1;
next	1.1;

1.1
date	2000.01.10.06.21.17;	author kris;	state Exp;
branches
	1.1.1.1;
next	;

1.3.2.1
date	2012.06.27.18.44.36;	author svnexp;	state dead;
branches;
next	1.3.2.2;

1.3.2.2
date	2013.03.28.13.02.27;	author svnexp;	state Exp;
branches;
next	;

1.2.2.1
date	2012.07.02.16.14.35;	author jkim;	state Exp;
branches;
next	;

1.2.10.1
date	2012.07.02.16.00.38;	author jkim;	state Exp;
branches;
next	;

1.2.12.1
date	2013.04.02.18.17.57;	author svnexp;	state Exp;
branches;
next	;

1.2.14.1
date	2013.04.02.17.48.59;	author svnexp;	state Exp;
branches;
next	;

1.1.1.1
date	2000.01.10.06.21.17;	author kris;	state Exp;
branches
	1.1.1.1.2.1;
next	1.1.1.2;

1.1.1.2
date	2000.04.13.06.24.48;	author kris;	state Exp;
branches;
next	1.1.1.3;

1.1.1.3
date	2001.02.18.03.14.53;	author kris;	state Exp;
branches;
next	1.1.1.4;

1.1.1.4
date	2002.07.30.12.43.18;	author nectar;	state Exp;
branches;
next	1.1.1.5;

1.1.1.5
date	2003.10.01.12.32.37;	author nectar;	state Exp;
branches;
next	1.1.1.6;

1.1.1.6
date	2004.03.17.15.41.40;	author nectar;	state Exp;
branches;
next	1.1.1.7;

1.1.1.7
date	2006.07.29.19.10.15;	author simon;	state Exp;
branches;
next	1.1.1.8;

1.1.1.8
date	2006.10.01.07.33.36;	author simon;	state Exp;
branches;
next	1.1.1.9;

1.1.1.9
date	2007.03.15.20.02.18;	author simon;	state Exp;
branches
	1.1.1.9.2.1;
next	;

1.1.1.1.2.1
date	2000.08.20.08.45.57;	author kris;	state Exp;
branches;
next	1.1.1.1.2.2;

1.1.1.1.2.2
date	2001.07.04.23.19.08;	author kris;	state Exp;
branches
	1.1.1.1.2.2.2.1
	1.1.1.1.2.2.4.1
	1.1.1.1.2.2.6.1;
next	1.1.1.1.2.3;

1.1.1.1.2.3
date	2002.07.30.22.04.59;	author nectar;	state Exp;
branches;
next	1.1.1.1.2.4;

1.1.1.1.2.4
date	2003.10.03.01.32.04;	author nectar;	state Exp;
branches;
next	1.1.1.1.2.5;

1.1.1.1.2.5
date	2004.04.02.01.10.59;	author nectar;	state Exp;
branches;
next	;

1.1.1.1.2.2.2.1
date	2002.07.31.16.40.31;	author nectar;	state Exp;
branches;
next	;

1.1.1.1.2.2.4.1
date	2002.07.31.14.04.46;	author nectar;	state Exp;
branches;
next	;

1.1.1.1.2.2.6.1
date	2002.07.31.02.54.37;	author nectar;	state Exp;
branches;
next	;

1.1.1.9.2.1
date	2010.11.28.13.45.51;	author simon;	state Exp;
branches;
next	1.1.1.9.2.2;

1.1.1.9.2.2
date	2012.07.02.16.24.43;	author jkim;	state Exp;
branches;
next	;


desc
@@


1.3
log
@SVN rev 237657 on 2012-06-27 18:44:36Z by jkim

Merge OpenSSL 0.9.8x.

Reviewed by:	stas
Approved by:	benl (maintainer)
MFC after:	3 days
@
text
@
  LICENSE ISSUES
  ==============

  The OpenSSL toolkit stays under a dual license, i.e. both the conditions of
  the OpenSSL License and the original SSLeay license apply to the toolkit.
  See below for the actual license texts. Actually both licenses are BSD-style
  Open Source licenses. In case of any license issues related to OpenSSL
  please contact openssl-core@@openssl.org.

  OpenSSL License
  ---------------

/* ====================================================================
 * Copyright (c) 1998-2011 The OpenSSL Project.  All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 *
 * 1. Redistributions of source code must retain the above copyright
 *    notice, this list of conditions and the following disclaimer. 
 *
 * 2. Redistributions in binary form must reproduce the above copyright
 *    notice, this list of conditions and the following disclaimer in
 *    the documentation and/or other materials provided with the
 *    distribution.
 *
 * 3. All advertising materials mentioning features or use of this
 *    software must display the following acknowledgment:
 *    "This product includes software developed by the OpenSSL Project
 *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
 *
 * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
 *    endorse or promote products derived from this software without
 *    prior written permission. For written permission, please contact
 *    openssl-core@@openssl.org.
 *
 * 5. Products derived from this software may not be called "OpenSSL"
 *    nor may "OpenSSL" appear in their names without prior written
 *    permission of the OpenSSL Project.
 *
 * 6. Redistributions of any form whatsoever must retain the following
 *    acknowledgment:
 *    "This product includes software developed by the OpenSSL Project
 *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
 *
 * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
 * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
 * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
 * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 * OF THE POSSIBILITY OF SUCH DAMAGE.
 * ====================================================================
 *
 * This product includes cryptographic software written by Eric Young
 * (eay@@cryptsoft.com).  This product includes software written by Tim
 * Hudson (tjh@@cryptsoft.com).
 *
 */

 Original SSLeay License
 -----------------------

/* Copyright (C) 1995-1998 Eric Young (eay@@cryptsoft.com)
 * All rights reserved.
 *
 * This package is an SSL implementation written
 * by Eric Young (eay@@cryptsoft.com).
 * The implementation was written so as to conform with Netscapes SSL.
 * 
 * This library is free for commercial and non-commercial use as long as
 * the following conditions are aheared to.  The following conditions
 * apply to all code found in this distribution, be it the RC4, RSA,
 * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
 * included with this distribution is covered by the same copyright terms
 * except that the holder is Tim Hudson (tjh@@cryptsoft.com).
 * 
 * Copyright remains Eric Young's, and as such any Copyright notices in
 * the code are not to be removed.
 * If this package is used in a product, Eric Young should be given attribution
 * as the author of the parts of the library used.
 * This can be in the form of a textual message at program startup or
 * in documentation (online or textual) provided with the package.
 * 
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 * 1. Redistributions of source code must retain the copyright
 *    notice, this list of conditions and the following disclaimer.
 * 2. Redistributions in binary form must reproduce the above copyright
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 * 3. All advertising materials mentioning features or use of this software
 *    must display the following acknowledgement:
 *    "This product includes cryptographic software written by
 *     Eric Young (eay@@cryptsoft.com)"
 *    The word 'cryptographic' can be left out if the rouines from the library
 *    being used are not cryptographic related :-).
 * 4. If you include any Windows specific code (or a derivative thereof) from 
 *    the apps directory (application code) you must include an acknowledgement:
 *    "This product includes software written by Tim Hudson (tjh@@cryptsoft.com)"
 * 
 * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 * 
 * The licence and distribution terms for any publically available version or
 * derivative of this code cannot be changed.  i.e. this code cannot simply be
 * copied and put under another distribution licence
 * [including the GNU Public Licence.]
 */

@


1.3.2.1
log
@file LICENSE was added on branch RELENG_8_4 on 2013-03-28 13:02:27 +0000
@
text
@d1 127
@


1.3.2.2
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/248810
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@a0 127

  LICENSE ISSUES
  ==============

  The OpenSSL toolkit stays under a dual license, i.e. both the conditions of
  the OpenSSL License and the original SSLeay license apply to the toolkit.
  See below for the actual license texts. Actually both licenses are BSD-style
  Open Source licenses. In case of any license issues related to OpenSSL
  please contact openssl-core@@openssl.org.

  OpenSSL License
  ---------------

/* ====================================================================
 * Copyright (c) 1998-2011 The OpenSSL Project.  All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 *
 * 1. Redistributions of source code must retain the above copyright
 *    notice, this list of conditions and the following disclaimer. 
 *
 * 2. Redistributions in binary form must reproduce the above copyright
 *    notice, this list of conditions and the following disclaimer in
 *    the documentation and/or other materials provided with the
 *    distribution.
 *
 * 3. All advertising materials mentioning features or use of this
 *    software must display the following acknowledgment:
 *    "This product includes software developed by the OpenSSL Project
 *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
 *
 * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
 *    endorse or promote products derived from this software without
 *    prior written permission. For written permission, please contact
 *    openssl-core@@openssl.org.
 *
 * 5. Products derived from this software may not be called "OpenSSL"
 *    nor may "OpenSSL" appear in their names without prior written
 *    permission of the OpenSSL Project.
 *
 * 6. Redistributions of any form whatsoever must retain the following
 *    acknowledgment:
 *    "This product includes software developed by the OpenSSL Project
 *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
 *
 * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
 * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
 * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
 * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 * OF THE POSSIBILITY OF SUCH DAMAGE.
 * ====================================================================
 *
 * This product includes cryptographic software written by Eric Young
 * (eay@@cryptsoft.com).  This product includes software written by Tim
 * Hudson (tjh@@cryptsoft.com).
 *
 */

 Original SSLeay License
 -----------------------

/* Copyright (C) 1995-1998 Eric Young (eay@@cryptsoft.com)
 * All rights reserved.
 *
 * This package is an SSL implementation written
 * by Eric Young (eay@@cryptsoft.com).
 * The implementation was written so as to conform with Netscapes SSL.
 * 
 * This library is free for commercial and non-commercial use as long as
 * the following conditions are aheared to.  The following conditions
 * apply to all code found in this distribution, be it the RC4, RSA,
 * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
 * included with this distribution is covered by the same copyright terms
 * except that the holder is Tim Hudson (tjh@@cryptsoft.com).
 * 
 * Copyright remains Eric Young's, and as such any Copyright notices in
 * the code are not to be removed.
 * If this package is used in a product, Eric Young should be given attribution
 * as the author of the parts of the library used.
 * This can be in the form of a textual message at program startup or
 * in documentation (online or textual) provided with the package.
 * 
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 * 1. Redistributions of source code must retain the copyright
 *    notice, this list of conditions and the following disclaimer.
 * 2. Redistributions in binary form must reproduce the above copyright
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 * 3. All advertising materials mentioning features or use of this software
 *    must display the following acknowledgement:
 *    "This product includes cryptographic software written by
 *     Eric Young (eay@@cryptsoft.com)"
 *    The word 'cryptographic' can be left out if the rouines from the library
 *    being used are not cryptographic related :-).
 * 4. If you include any Windows specific code (or a derivative thereof) from 
 *    the apps directory (application code) you must include an acknowledgement:
 *    "This product includes software written by Tim Hudson (tjh@@cryptsoft.com)"
 * 
 * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 * 
 * The licence and distribution terms for any publically available version or
 * derivative of this code cannot be changed.  i.e. this code cannot simply be
 * copied and put under another distribution licence
 * [including the GNU Public Licence.]
 */

@


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

Merge OpenSSL 0.9.8k into head.

Approved by:	re
@
text
@d15 1
a15 1
 * Copyright (c) 1998-2008 The OpenSSL Project.  All rights reserved.
@


1.2.12.1
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/249029
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@d15 1
a15 1
 * Copyright (c) 1998-2011 The OpenSSL Project.  All rights reserved.
@


1.2.14.1
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/249029
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@d15 1
a15 1
 * Copyright (c) 1998-2011 The OpenSSL Project.  All rights reserved.
@


1.2.2.1
log
@SVN rev 237999 on 2012-07-02 16:14:35Z by jkim

MFC:	r237657, r237658, r237666

Merge OpenSSL 0.9.8x and regen manual pages.
@
text
@d15 1
a15 1
 * Copyright (c) 1998-2011 The OpenSSL Project.  All rights reserved.
@


1.2.10.1
log
@SVN rev 237998 on 2012-07-02 16:00:38Z by jkim

MFC:	r237657, r237658, r237666

Merge OpenSSL 0.9.8x and regen manual pages.
@
text
@d15 1
a15 1
 * Copyright (c) 1998-2011 The OpenSSL Project.  All rights reserved.
@


1.1
log
@Initial revision
@
text
@d15 1
a15 1
 * Copyright (c) 1998-1999 The OpenSSL Project.  All rights reserved.
@


1.1.1.1
log
@Initial import of OpenSSL 0.9.4, sans IDEA and RSA code for patent
infringement reasons.
@
text
@@


1.1.1.1.2.1
log
@MFC: OpenSSL 0.9.5a
@
text
@d15 1
a15 1
 * Copyright (c) 1998-2000 The OpenSSL Project.  All rights reserved.
@


1.1.1.1.2.2
log
@MFC: Update to OpenSSL 0.9.6a
@
text
@d15 1
a15 1
 * Copyright (c) 1998-2001 The OpenSSL Project.  All rights reserved.
@


1.1.1.1.2.2.2.1
log
@MFC: OpenSSL 0.9.6e
@
text
@d15 1
a15 1
 * Copyright (c) 1998-2002 The OpenSSL Project.  All rights reserved.
@


1.1.1.1.2.2.4.1
log
@MFC: OpenSSL 0.9.6e
@
text
@d15 1
a15 1
 * Copyright (c) 1998-2002 The OpenSSL Project.  All rights reserved.
@


1.1.1.1.2.2.6.1
log
@MFC: OpenSSL 0.9.6e
@
text
@d15 1
a15 1
 * Copyright (c) 1998-2002 The OpenSSL Project.  All rights reserved.
@


1.1.1.1.2.3
log
@MFC: OpenSSL 0.9.6e
@
text
@d15 1
a15 1
 * Copyright (c) 1998-2002 The OpenSSL Project.  All rights reserved.
@


1.1.1.1.2.4
log
@MFC OpenSSL 0.9.7c.

Approved by:	re
@
text
@d15 1
a15 1
 * Copyright (c) 1998-2003 The OpenSSL Project.  All rights reserved.
@


1.1.1.1.2.5
log
@MFC OpenSSL 0.9.7d.
@
text
@d15 1
a15 1
 * Copyright (c) 1998-2004 The OpenSSL Project.  All rights reserved.
@


1.1.1.2
log
@Initial import of OpenSSL 0.9.5a
@
text
@d15 1
a15 1
 * Copyright (c) 1998-2000 The OpenSSL Project.  All rights reserved.
@


1.1.1.3
log
@Import of OpenSSL 0.9.6-STABLE snapshot dated 2001-02-10
@
text
@d15 1
a15 1
 * Copyright (c) 1998-2001 The OpenSSL Project.  All rights reserved.
@


1.1.1.4
log
@Import of OpenSSL 0.9.6d.
@
text
@d15 1
a15 1
 * Copyright (c) 1998-2002 The OpenSSL Project.  All rights reserved.
@


1.1.1.5
log
@Vendor import of OpenSSL 0.9.7c
@
text
@d15 1
a15 1
 * Copyright (c) 1998-2003 The OpenSSL Project.  All rights reserved.
@


1.1.1.6
log
@Vendor import of OpenSSL 0.9.7d.
@
text
@d15 1
a15 1
 * Copyright (c) 1998-2004 The OpenSSL Project.  All rights reserved.
@


1.1.1.7
log
@Vendor import of OpenSSL 0.9.8b
@
text
@d15 1
a15 1
 * Copyright (c) 1998-2005 The OpenSSL Project.  All rights reserved.
@


1.1.1.8
log
@Vendor import of OpenSSL 0.9.8d.
@
text
@d15 1
a15 1
 * Copyright (c) 1998-2006 The OpenSSL Project.  All rights reserved.
@


1.1.1.9
log
@Vendor import of OpenSSL 0.9.8e.
@
text
@d15 1
a15 1
 * Copyright (c) 1998-2007 The OpenSSL Project.  All rights reserved.
@


1.1.1.9.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
 * Copyright (c) 1998-2008 The OpenSSL Project.  All rights reserved.
@


1.1.1.9.2.2
log
@SVN rev 238001 on 2012-07-02 16:24:43Z by jkim

MFC:	r237657, r237658, r237666

Merge OpenSSL 0.9.8x and regen manual pages.
@
text
@d15 1
a15 1
 * Copyright (c) 1998-2011 The OpenSSL Project.  All rights reserved.
@


