[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  28e90f69fbcdcd3c06359a53adceb2dbdfaba614 (commit)
       via  42306f9a93489e1f789468c1220b68903424556d (commit)
      from  8918a954bf7225ad2bc70d39f3a9fbd8fec8e233 (commit)


- Log -----------------------------------------------------------------
commit 28e90f69fbcdcd3c06359a53adceb2dbdfaba614
Author: Richard Levitte <levitte at openssl.org>
Date:   Fri Jul 15 18:41:37 2016 +0200

    Remove the silly CVS markers from LPdir_*.c
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit 42306f9a93489e1f789468c1220b68903424556d
Author: Richard Levitte <levitte at openssl.org>
Date:   Fri Jul 15 18:40:53 2016 +0200

    Add back lost copyright and license text in LPdir_win.c
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

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

Summary of changes:
 crypto/LPdir_nyi.c   |  3 ---
 crypto/LPdir_unix.c  |  4 ----
 crypto/LPdir_win.c   | 26 ++++++++++++++++++++++++++
 crypto/LPdir_win32.c |  4 ----
 crypto/LPdir_wince.c |  4 ----
 5 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/crypto/LPdir_nyi.c b/crypto/LPdir_nyi.c
index 18566fd..049044c 100644
--- a/crypto/LPdir_nyi.c
+++ b/crypto/LPdir_nyi.c
@@ -8,9 +8,6 @@
  */
 
 /*
- * $LP: LPlib/source/LPdir_win.c,v 1.1 2004/06/14 10:07:56 _cvs_levitte Exp $
- */
-/*
  * 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 8f27f70..1bb2940 100644
--- a/crypto/LPdir_unix.c
+++ b/crypto/LPdir_unix.c
@@ -8,10 +8,6 @@
  */
 
 /*
- * $LP: LPlib/source/LPdir_unix.c,v 1.11 2004/09/23 22:07:22 _cvs_levitte Exp
- * $
- */
-/*
  * 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 71103da..37cca97 100644
--- a/crypto/LPdir_win.c
+++ b/crypto/LPdir_win.c
@@ -7,6 +7,32 @@
  * https://www.openssl.org/source/license.html
  */
 
+/*
+ * Copyright (c) 2004, Richard Levitte <richard at levitte.org>
+ * All rights reserved.
+ *
+ * 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS 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 COPYRIGHT
+ * OWNER OR 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.
+ */
+
 #include <windows.h>
 #include <tchar.h>
 #ifndef LPDIR_H
diff --git a/crypto/LPdir_win32.c b/crypto/LPdir_win32.c
index 8f6d6ad..59ed485 100644
--- a/crypto/LPdir_win32.c
+++ b/crypto/LPdir_win32.c
@@ -8,10 +8,6 @@
  */
 
 /*
- * $LP: LPlib/source/LPdir_win32.c,v 1.3 2004/08/26 13:36:05 _cvs_levitte Exp
- * $
- */
-/*
  * 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 163479e..dbc1052 100644
--- a/crypto/LPdir_wince.c
+++ b/crypto/LPdir_wince.c
@@ -8,10 +8,6 @@
  */
 
 /*
- * $LP: LPlib/source/LPdir_wince.c,v 1.3 2004/08/26 13:36:05 _cvs_levitte Exp
- * $
- */
-/*
  * Copyright (c) 2004, Richard Levitte <richard at levitte.org>
  * All rights reserved.
  *