From 0c3d0d4a01d71f7de4e340f045cb9fd16b3bf4d2 Mon Sep 17 00:00:00 2001 From: Rich Salz Date: Thu, 15 Jun 2017 13:15:26 -0400 Subject: [PATCH] Standardize Levitte's dual-license Reviewed-by: Richard Levitte (Merged from https://github.com/openssl/openssl/pull/3689) --- crypto/LPdir_nyi.c | 3 +++ crypto/LPdir_unix.c | 3 +++ crypto/LPdir_vms.c | 3 +++ crypto/LPdir_win.c | 3 +++ crypto/LPdir_win32.c | 3 +++ crypto/LPdir_wince.c | 3 +++ crypto/x509v3/v3_pci.c | 6 +++++- crypto/x509v3/v3_pcia.c | 6 +++++- include/internal/o_dir.h | 9 +++------ 9 files changed, 31 insertions(+), 8 deletions(-) diff --git a/crypto/LPdir_nyi.c b/crypto/LPdir_nyi.c index 049044c4ca..502f909f8f 100644 --- 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 * All rights reserved. * diff --git a/crypto/LPdir_unix.c b/crypto/LPdir_unix.c index 1bb2940b95..1599a6f1a2 100644 --- 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 * All rights reserved. * diff --git a/crypto/LPdir_vms.c b/crypto/LPdir_vms.c index 1a5b60febf..1f85ac74e5 100644 --- 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 * All rights reserved. * diff --git a/crypto/LPdir_win.c b/crypto/LPdir_win.c index 8f674d305b..f40a91e4ea 100644 --- 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 * All rights reserved. * diff --git a/crypto/LPdir_win32.c b/crypto/LPdir_win32.c index 59ed485791..9e6ca6d09a 100644 --- 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 * All rights reserved. * diff --git a/crypto/LPdir_wince.c b/crypto/LPdir_wince.c index dbc10529dc..5a5c0f293e 100644 --- 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 * All rights reserved. * diff --git a/crypto/x509v3/v3_pci.c b/crypto/x509v3/v3_pci.c index 2c05edb828..3d124fa6d9 100644 --- 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 e6f7a91794..8d6af60e5d 100644 --- 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 178c2ed229..0ab4b1c690 100644 --- 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 * All rights reserved. * -- 2.25.1