Changeset b8df02e for src/CRC64.c

Timestamp:

07/22/15 14:34:01 (9 years ago)

Author:

Hal Finkel <hfinkel@…>

Branches:

master

Children:

e1066fc

Parents:

ad7f485

git-author:

Hal Finkel <hfinkel@…> (07/22/15 14:34:01)

git-committer:

Hal Finkel <hfinkel@…> (07/22/15 14:34:01)

Message:

Update to new open-source license

File:

• src/CRC64.c (modified) (3 diffs)

src/CRC64.c

@@ -1 +1 @@
 // *****************************************************************************
-//                  Copyright (C) 2014, UChicago Argonne, LLC
-//                           All Rights Reserved
-//                      High-Performance CRC64 Library
-//                    Developer: Hal Finkel, LCF Division
+//                   Copyright (C) 2014, UChicago Argonne, LLC
+//                              All Rights Reserved
+//             High-Performance CRC64 Library (ANL-SF-14-095)
+//                    Hal Finkel, Argonne National Laboratory
 // 
-//                           OPEN SOURCE LICENSE
+//                              OPEN SOURCE LICENSE
+// 
+// Under the terms of Contract No. DE-AC02-06CH11357 with UChicago Argonne, LLC,
+// the U.S. Government retains certain rights in this software.
 // 
 // Redistribution and use in source and binary forms, with or without
@@ -11 +14 @@
 // 
 // 1. Redistributions of source code must retain the above copyright notice, this
-//    list of conditions and the following disclaimer.  Software changes,
-//    modifications, or derivative works, should be noted with comments and the
-//    author and organization's name.
+//    list of conditions and the following disclaimer.
 // 
 // 2. Redistributions in binary form must reproduce the above copyright notice,
@@ -21 +22 @@
 // 3. Neither the names of UChicago Argonne, LLC or the Department of Energy nor
 //    the names of its contributors may be used to endorse or promote products
-//    derived from this software without specific prior written permission.
-// 
-// 4. The software and the end-user documentation included with the
-//    redistribution, if any, must include the following acknowledgment:
-// 
-//    "This product includes software produced by UChicago Argonne, LLC under
-//     Contract No. DE-AC02-06CH11357 with the Department of Energy."
-// 
+//    derived from this software without specific prior written permission. 
+//  
 // *****************************************************************************
-//                                DISCLAIMER
+//                                  DISCLAIMER
 // 
 // THE SOFTWARE IS SUPPLIED "AS IS" WITHOUT WARRANTY OF ANY KIND.
 // 
-// NEITHER THE UNITED STATES GOVERNMENT, NOR THE UNITED STATES DEPARTMENT OF
+// NEITHER THE UNTED STATES GOVERNMENT, NOR THE UNITED STATES DEPARTMENT OF
 // ENERGY, NOR UCHICAGO ARGONNE, LLC, NOR ANY OF THEIR EMPLOYEES, MAKES ANY
 // WARRANTY, EXPRESS OR IMPLIED, OR ASSUMES ANY LEGAL LIABILITY OR RESPONSIBILITY