From 218edd6df9f9546eb0b6f55fbcff07a1aa4763c6 Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Micha=C5=82=20Trojnara?= <Michal.Trojnara@stunnel.org>

Date: Sat, 1 Sep 2018 06:26:43 +0200

Subject: [PATCH 15/23] Updated OpenSSL license in the engine front-end

The OpenSSL team has decided to re-license their library.

This commit propagates the license change to our derived code.

---

 src/eng_front.c | 65 +++++++------------------------------------------

 1 file changed, 9 insertions(+), 56 deletions(-)

diff --git a/src/eng_front.c b/src/eng_front.c

index 286aaa9..95c2b03 100644

--- a/src/eng_front.c

+++ b/src/eng_front.c

@@ -1,63 +1,16 @@

-/* crypto/engine/hw_pkcs11.c */

-/* Written by Geoff Thorpe (geoff@geoffthorpe.net) for the OpenSSL

+/*

+ * Copyright 1999-2001 The OpenSSL Project Authors. All Rights Reserved.

+ * Written by Geoff Thorpe (geoff@geoffthorpe.net) for the OpenSSL

  * project 2000.

+ * Portions Copyright (c) 2003 Kevin Stefanik (kstef@mtppi.org)

  * Copied/modified by Kevin Stefanik (kstef@mtppi.org) for the OpenSC

  * project 2003.

- * Copyright (c) 2017 Michał Trojnara

- */

-/* ====================================================================

- * Copyright (c) 1999-2001 The OpenSSL Project.  All rights reserved.

- * Portions Copyright (c) 2003 Kevin Stefanik (kstef@mtppi.org)

- *

- * 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

- *    licensing@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).

+ * Copyright (c) 2016-2018 Michał Trojnara

  *

+ * Licensed under the OpenSSL license (the "License").  You may not use

+ * this file except in compliance with the License.  You can obtain a copy

+ * in the file LICENSE in the source distribution or at

+ * https://www.openssl.org/source/license.html

  */

 #include "engine.h"

-- 

2.17.1