[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  0c3d0d4a01d71f7de4e340f045cb9fd16b3bf4d2 (commit)
      from  6a74806ed741db24df3a7155e4bc11fb4ba9bc2a (commit)


- Log -----------------------------------------------------------------
commit 0c3d0d4a01d71f7de4e340f045cb9fd16b3bf4d2
Author: Rich Salz <rsalz at openssl.org>
Date:   Thu Jun 15 13:15:26 2017 -0400

    Standardize Levitte's dual-license
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/3689)

-----------------------------------------------------------------------

Summary of changes:
 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 049044c..502f909 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 <richard at levitte.org>
  * All rights reserved.
  *
diff --git a/crypto/LPdir_unix.c b/crypto/LPdir_unix.c
index 1bb2940..1599a6f 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 <richard at levitte.org>
  * All rights reserved.
  *
diff --git a/crypto/LPdir_vms.c b/crypto/LPdir_vms.c
index 1a5b60f..1f85ac7 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 <richard at levitte.org>
  * All rights reserved.
  *
diff --git a/crypto/LPdir_win.c b/crypto/LPdir_win.c
index 8f674d3..f40a91e 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 <richard at levitte.org>
  * All rights reserved.
  *
diff --git a/crypto/LPdir_win32.c b/crypto/LPdir_win32.c
index 59ed485..9e6ca6d 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 <richard at levitte.org>
  * All rights reserved.
  *
diff --git a/crypto/LPdir_wince.c b/crypto/LPdir_wince.c
index dbc1052..5a5c0f2 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 <richard at levitte.org>
  * All rights reserved.
  *
diff --git a/crypto/x509v3/v3_pci.c b/crypto/x509v3/v3_pci.c
index 2c05edb..3d124fa 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 e6f7a91..8d6af60 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 178c2ed..0ab4b1c 100644
--- a/include/internal/o_dir.h
+++ b/include/internal/o_dir.h
@@ -8,12 +8,9 @@
  */
 
 /*
- * Copied from Richard Levitte's (richard at 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 at levitte.org>
  * All rights reserved.
  *