Standardize Levitte's dual-license

Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3689)

diff --git a/crypto/LPdir_nyi.c b/crypto/LPdir_nyi.c
index 049044c4cae8480a5c05ebbd16031eeba8e89b40..502f909f8fec63fb7ccd3635ac653a6471c14745 100644 (file)
--- 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.
  *

diff --git a/crypto/LPdir_unix.c b/crypto/LPdir_unix.c
index 1bb2940b95ce0b784b872179d28135c23c37d10e..1599a6f1a20287a5df148f5b2d0c66572cc92ffd 100644 (file)
--- 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.
  *

diff --git a/crypto/LPdir_vms.c b/crypto/LPdir_vms.c
index 1a5b60febfbc81ca4388f15b59369fdee64ffc83..1f85ac74e5340661292ef62106ad98cb8c0b9170 100644 (file)
--- 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.
  *

diff --git a/crypto/LPdir_win.c b/crypto/LPdir_win.c
index 8f674d305b74b75adfdfc81f287a6760a435f051..f40a91e4ea8977b929ab51ecd362d4a1e0c23d81 100644 (file)
--- 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.
  *

diff --git a/crypto/LPdir_win32.c b/crypto/LPdir_win32.c
index 59ed485791facac6eb3c2478b02813e4c15077e2..9e6ca6d09aa64b01fd0d277b77131a5a179de0dc 100644 (file)
--- 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.
  *

diff --git a/crypto/LPdir_wince.c b/crypto/LPdir_wince.c
index dbc10529dc211208a7c80d32872d6285a10a8195..5a5c0f293e23eca4f4c7818abd744778d1c9989c 100644 (file)
--- 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.
  *

diff --git a/crypto/x509v3/v3_pci.c b/crypto/x509v3/v3_pci.c
index 2c05edb828fc9033d15878cb3842768e353e3970..3d124fa6d95d617eeebabcc7c395fd09ab0f86bc 100644 (file)
--- 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.
  *

diff --git a/crypto/x509v3/v3_pcia.c b/crypto/x509v3/v3_pcia.c
index e6f7a91794a5e3b5dd43d76d0da51a82b7e4fbd3..8d6af60e5da6a6ae2a79c9d381554248d4ae199a 100644 (file)
--- 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.
  *

diff --git a/include/internal/o_dir.h b/include/internal/o_dir.h
index 178c2ed229296392f7e55711f4c0f867e6d9eb34..0ab4b1c690b336c0144c8b4fa129903644965dad 100644 (file)
--- 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.
  *