Standardize Levitte's dual-license

Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/3689)
2017-06-15 13:15:26 -04:00 · 2017-06-15 13:15:26 -04:00 · 0c3d0d4a01
commit 0c3d0d4a01
parent 6a74806ed7
9 changed files with 31 additions and 8 deletions
--- a/crypto/LPdir_nyi.c
+++ b/crypto/LPdir_nyi.c
@ -8,6 +8,9 @@
 */

 /*
+ * This file is dual-licensed and is also avialable under the following
+ * terms:
+ *
 * Copyright (c) 2004, Richard Levitte <richard@levitte.org>
 * All rights reserved.
 *
--- a/crypto/LPdir_unix.c
+++ b/crypto/LPdir_unix.c
@ -8,6 +8,9 @@
 */

 /*
+ * This file is dual-licensed and is also avialable under the following
+ * terms:
+ *
 * Copyright (c) 2004, Richard Levitte <richard@levitte.org>
 * All rights reserved.
 *
--- a/crypto/LPdir_vms.c
+++ b/crypto/LPdir_vms.c
@ -8,6 +8,9 @@
 */

 /*
+ * This file is dual-licensed and is also avialable under the following
+ * terms:
+ *
 * Copyright (c) 2004, Richard Levitte <richard@levitte.org>
 * All rights reserved.
 *
--- a/crypto/LPdir_win.c
+++ b/crypto/LPdir_win.c
@ -8,6 +8,9 @@
 */

 /*
+ * This file is dual-licensed and is also avialable under the following
+ * terms:
+ *
 * Copyright (c) 2004, Richard Levitte <richard@levitte.org>
 * All rights reserved.
 *
--- a/crypto/LPdir_win32.c
+++ b/crypto/LPdir_win32.c
@ -8,6 +8,9 @@
 */

 /*
+ * This file is dual-licensed and is also avialable under the following
+ * terms:
+ *
 * Copyright (c) 2004, Richard Levitte <richard@levitte.org>
 * All rights reserved.
 *
--- a/crypto/LPdir_wince.c
+++ b/crypto/LPdir_wince.c
@ -8,6 +8,9 @@
 */

 /*
+ * This file is dual-licensed and is also avialable under the following
+ * terms:
+ *
 * Copyright (c) 2004, Richard Levitte <richard@levitte.org>
 * All rights reserved.
 *
--- a/crypto/x509v3/v3_pci.c
+++ b/crypto/x509v3/v3_pci.c
@ -7,7 +7,11 @@
 * https://www.openssl.org/source/license.html
 */

-/* Copyright (c) 2004 Kungliga Tekniska Högskolan
+/*
+ * This file is dual-licensed and is also available under the following
+ * terms:
+ *
+ * Copyright (c) 2004 Kungliga Tekniska Högskolan
 * (Royal Institute of Technology, Stockholm, Sweden).
 * All rights reserved.
 *
--- a/crypto/x509v3/v3_pcia.c
+++ b/crypto/x509v3/v3_pcia.c
@ -7,7 +7,11 @@
 * https://www.openssl.org/source/license.html
 */

-/* Copyright (c) 2004 Kungliga Tekniska Högskolan
+/*
+ * This file is dual-licensed and is also available under the following
+ * terms:
+ *
+ * Copyright (c) 2004 Kungliga Tekniska Högskolan
 * (Royal Institute of Technology, Stockholm, Sweden).
 * All rights reserved.
 *
--- a/include/internal/o_dir.h
+++ b/include/internal/o_dir.h
@ -8,12 +8,9 @@
 */

 /*
- * Copied from Richard Levitte's (richard@levitte.org) LP library.  All
- * symbol names have been changed, with permission from the author.
- */
-
-/* $LP: LPlib/source/LPdir.h,v 1.1 2004/06/14 08:56:04 _cvs_levitte Exp $ */
-/*
+ * This file is dual-licensed and is also avialable under the following
+ * terms:
+ *
 * Copyright (c) 2004, Richard Levitte <richard@levitte.org>
 * All rights reserved.
 *