Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/cr-marcstevens/sha1collisiondetection.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Stevens <marc@marc-stevens.nl>2017-02-21 17:37:31 +0300
committerMarc Stevens <marc@marc-stevens.nl>2017-02-21 17:37:31 +0300
commit7f8db79a8785790af00d33794ba20db237929b68 (patch)
tree26e82e392048c488f9fdb942b1f71b88a68c91ea
parent6b5baad192ae2fcea3d080e3fdc20c898c5785db (diff)
CR fix
-rw-r--r--LICENSE.txt4
-rw-r--r--Makefile2
-rw-r--r--lib/sha1.c2
-rw-r--r--lib/sha1.h2
-rw-r--r--lib/sha1_simd.cinc2
-rw-r--r--lib/sha1_simd_avx256.c2
-rw-r--r--lib/sha1_simd_mmx64.c2
-rw-r--r--lib/sha1_simd_neon128.c2
-rw-r--r--lib/sha1_simd_sse128.c2
-rw-r--r--lib/simd_avx256.h2
-rw-r--r--lib/simd_mmx64.h2
-rw-r--r--lib/simd_neon128.h2
-rw-r--r--lib/simd_sse128.h2
-rw-r--r--lib/ubc_check.c2
-rw-r--r--lib/ubc_check.h2
-rw-r--r--lib/ubc_check_simd.cinc2
-rw-r--r--lib/ubc_check_simd_avx256.c2
-rw-r--r--lib/ubc_check_simd_mmx64.c2
-rw-r--r--lib/ubc_check_simd_neon128.c2
-rw-r--r--lib/ubc_check_simd_sse128.c2
-rw-r--r--lib/ubc_check_verify.c2
-rw-r--r--src/main.c2
22 files changed, 25 insertions, 21 deletions
diff --git a/LICENSE.txt b/LICENSE.txt
index c741292..4a3e6a1 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -7,6 +7,10 @@ Copyright (c) 2017:
P.O. Box 94079, 1090 GB Amsterdam, Netherlands
marc@marc-stevens.nl
+ Dan Shumow
+ Microsoft Research
+ danshu@microsoft.com
+
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
diff --git a/Makefile b/Makefile
index 6403100..ce9cd6a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
##
-## Copyright 2017 Marc Stevens <marc@marc-stevens.nl>
+## Copyright 2017 Marc Stevens <marc@marc-stevens.nl>, Dan Shumow (danshu@microsoft.com)
## Distributed under the MIT Software License.
## See accompanying file LICENSE.txt or copy at
## https://opensource.org/licenses/MIT
diff --git a/lib/sha1.c b/lib/sha1.c
index 0b99730..ed20109 100644
--- a/lib/sha1.c
+++ b/lib/sha1.c
@@ -1,5 +1,5 @@
/***
-* Copyright 2017 Marc Stevens <marc@marc-stevens.nl>
+* Copyright 2017 Marc Stevens <marc@marc-stevens.nl>, Dan Shumow (danshu@microsoft.com)
* Distributed under the MIT Software License.
* See accompanying file LICENSE.txt or copy at
* https://opensource.org/licenses/MIT
diff --git a/lib/sha1.h b/lib/sha1.h
index 859b0ad..8b522f9 100644
--- a/lib/sha1.h
+++ b/lib/sha1.h
@@ -1,5 +1,5 @@
/***
-* Copyright 2017 Marc Stevens <marc@marc-stevens.nl>
+* Copyright 2017 Marc Stevens <marc@marc-stevens.nl>, Dan Shumow <danshu@microsoft.com>
* Distributed under the MIT Software License.
* See accompanying file LICENSE.txt or copy at
* https://opensource.org/licenses/MIT
diff --git a/lib/sha1_simd.cinc b/lib/sha1_simd.cinc
index 7850902..b0f84ad 100644
--- a/lib/sha1_simd.cinc
+++ b/lib/sha1_simd.cinc
@@ -1,5 +1,5 @@
/***
-* Copyright 2017 Marc Stevens <marc@marc-stevens.nl>
+* Copyright 2017 Marc Stevens <marc@marc-stevens.nl>, Dan Shumow <danshu@microsoft.com>
* Distributed under the MIT Software License.
* See accompanying file LICENSE.txt or copy at
* https://opensource.org/licenses/MIT
diff --git a/lib/sha1_simd_avx256.c b/lib/sha1_simd_avx256.c
index 491a518..2c11c76 100644
--- a/lib/sha1_simd_avx256.c
+++ b/lib/sha1_simd_avx256.c
@@ -1,5 +1,5 @@
/***
-* Copyright 2017 Marc Stevens <marc@marc-stevens.nl>
+* Copyright 2017 Marc Stevens <marc@marc-stevens.nl>, Dan Shumow (danshu@microsoft.com)
* Distributed under the MIT Software License.
* See accompanying file LICENSE.txt or copy at
* https://opensource.org/licenses/MIT
diff --git a/lib/sha1_simd_mmx64.c b/lib/sha1_simd_mmx64.c
index ea35a68..fac144d 100644
--- a/lib/sha1_simd_mmx64.c
+++ b/lib/sha1_simd_mmx64.c
@@ -1,5 +1,5 @@
/***
-* Copyright 2017 Marc Stevens <marc@marc-stevens.nl>
+* Copyright 2017 Marc Stevens <marc@marc-stevens.nl>, Dan Shumow <danshu@microsoft.com>
* Distributed under the MIT Software License.
* See accompanying file LICENSE.txt or copy at
* https://opensource.org/licenses/MIT
diff --git a/lib/sha1_simd_neon128.c b/lib/sha1_simd_neon128.c
index f175c0c..0641f02 100644
--- a/lib/sha1_simd_neon128.c
+++ b/lib/sha1_simd_neon128.c
@@ -1,5 +1,5 @@
/***
-* Copyright 2017 Marc Stevens <marc@marc-stevens.nl>
+* Copyright 2017 Marc Stevens <marc@marc-stevens.nl>, Dan Shumow (danshu@microsoft.com)
* Distributed under the MIT Software License.
* See accompanying file LICENSE.txt or copy at
* https://opensource.org/licenses/MIT
diff --git a/lib/sha1_simd_sse128.c b/lib/sha1_simd_sse128.c
index c4b89bd..180035f 100644
--- a/lib/sha1_simd_sse128.c
+++ b/lib/sha1_simd_sse128.c
@@ -1,5 +1,5 @@
/***
-* Copyright 2017 Marc Stevens <marc@marc-stevens.nl>
+* Copyright 2017 Marc Stevens <marc@marc-stevens.nl>, Dan Shumow (danshu@microsoft.com)
* Distributed under the MIT Software License.
* See accompanying file LICENSE.txt or copy at
* https://opensource.org/licenses/MIT
diff --git a/lib/simd_avx256.h b/lib/simd_avx256.h
index bffb167..5643c93 100644
--- a/lib/simd_avx256.h
+++ b/lib/simd_avx256.h
@@ -1,5 +1,5 @@
/***
-* Copyright 2017 Marc Stevens <marc@marc-stevens.nl>
+* Copyright 2017 Marc Stevens <marc@marc-stevens.nl>, Dan Shumow (danshu@microsoft.com)
* Distributed under the MIT Software License.
* See accompanying file LICENSE.txt or copy at
* https://opensource.org/licenses/MIT
diff --git a/lib/simd_mmx64.h b/lib/simd_mmx64.h
index babd348..2859e4e 100644
--- a/lib/simd_mmx64.h
+++ b/lib/simd_mmx64.h
@@ -1,5 +1,5 @@
/***
-* Copyright 2017 Marc Stevens <marc@marc-stevens.nl>
+* Copyright 2017 Marc Stevens <marc@marc-stevens.nl>, Dan Shumow <danshu@microsoft.com>
* Distributed under the MIT Software License.
* See accompanying file LICENSE.txt or copy at
* https://opensource.org/licenses/MIT
diff --git a/lib/simd_neon128.h b/lib/simd_neon128.h
index 3c39ec6..2781e40 100644
--- a/lib/simd_neon128.h
+++ b/lib/simd_neon128.h
@@ -1,5 +1,5 @@
/***
-* Copyright 2017 Marc Stevens <marc@marc-stevens.nl>
+* Copyright 2017 Marc Stevens <marc@marc-stevens.nl>, Dan Shumow <danshu@microsoft.com>
* Distributed under the MIT Software License.
* See accompanying file LICENSE.txt or copy at
* https://opensource.org/licenses/MIT
diff --git a/lib/simd_sse128.h b/lib/simd_sse128.h
index 58b48c8..cfbb9d0 100644
--- a/lib/simd_sse128.h
+++ b/lib/simd_sse128.h
@@ -1,5 +1,5 @@
/***
-* Copyright 2017 Marc Stevens <marc@marc-stevens.nl>
+* Copyright 2017 Marc Stevens <marc@marc-stevens.nl>, Dan Shumow <danshu@microsoft.com>
* Distributed under the MIT Software License.
* See accompanying file LICENSE.txt or copy at
* https://opensource.org/licenses/MIT
diff --git a/lib/ubc_check.c b/lib/ubc_check.c
index 2513d68..556aaf3 100644
--- a/lib/ubc_check.c
+++ b/lib/ubc_check.c
@@ -1,5 +1,5 @@
/***
-* Copyright 2017 Marc Stevens <marc@marc-stevens.nl>
+* Copyright 2017 Marc Stevens <marc@marc-stevens.nl>, Dan Shumow <danshu@microsoft.com>
* Distributed under the MIT Software License.
* See accompanying file LICENSE.txt or copy at
* https://opensource.org/licenses/MIT
diff --git a/lib/ubc_check.h b/lib/ubc_check.h
index deeb915..27285bd 100644
--- a/lib/ubc_check.h
+++ b/lib/ubc_check.h
@@ -1,5 +1,5 @@
/***
-* Copyright 2017 Marc Stevens <marc@marc-stevens.nl>
+* Copyright 2017 Marc Stevens <marc@marc-stevens.nl>, Dan Shumow <danshu@microsoft.com>
* Distributed under the MIT Software License.
* See accompanying file LICENSE.txt or copy at
* https://opensource.org/licenses/MIT
diff --git a/lib/ubc_check_simd.cinc b/lib/ubc_check_simd.cinc
index 88739cd..27d751b 100644
--- a/lib/ubc_check_simd.cinc
+++ b/lib/ubc_check_simd.cinc
@@ -1,5 +1,5 @@
/***
-* Copyright 2017 Marc Stevens <marc@marc-stevens.nl>
+* Copyright 2017 Marc Stevens <marc@marc-stevens.nl>, Dan Shumow <danshu@microsoft.com>
* Distributed under the MIT Software License.
* See accompanying file LICENSE.txt or copy at
* https://opensource.org/licenses/MIT
diff --git a/lib/ubc_check_simd_avx256.c b/lib/ubc_check_simd_avx256.c
index 861cc02..e77c45b 100644
--- a/lib/ubc_check_simd_avx256.c
+++ b/lib/ubc_check_simd_avx256.c
@@ -1,5 +1,5 @@
/***
-* Copyright 2017 Marc Stevens <marc@marc-stevens.nl>
+* Copyright 2017 Marc Stevens <marc@marc-stevens.nl>, Dan Shumow (danshu@microsoft.com)
* Distributed under the MIT Software License.
* See accompanying file LICENSE.txt or copy at
* https://opensource.org/licenses/MIT
diff --git a/lib/ubc_check_simd_mmx64.c b/lib/ubc_check_simd_mmx64.c
index 1681117..12b2323 100644
--- a/lib/ubc_check_simd_mmx64.c
+++ b/lib/ubc_check_simd_mmx64.c
@@ -1,5 +1,5 @@
/***
-* Copyright 2017 Marc Stevens <marc@marc-stevens.nl>
+* Copyright 2017 Marc Stevens <marc@marc-stevens.nl>, Dan Shumow <danshu@microsoft.com>
* Distributed under the MIT Software License.
* See accompanying file LICENSE.txt or copy at
* https://opensource.org/licenses/MIT
diff --git a/lib/ubc_check_simd_neon128.c b/lib/ubc_check_simd_neon128.c
index 60779af..1af96c0 100644
--- a/lib/ubc_check_simd_neon128.c
+++ b/lib/ubc_check_simd_neon128.c
@@ -1,5 +1,5 @@
/***
-* Copyright 2017 Marc Stevens <marc@marc-stevens.nl>
+* Copyright 2017 Marc Stevens <marc@marc-stevens.nl>, Dan Shumow (danshu@microsoft.com)
* Distributed under the MIT Software License.
* See accompanying file LICENSE.txt or copy at
* https://opensource.org/licenses/MIT
diff --git a/lib/ubc_check_simd_sse128.c b/lib/ubc_check_simd_sse128.c
index affce6b..63147c6 100644
--- a/lib/ubc_check_simd_sse128.c
+++ b/lib/ubc_check_simd_sse128.c
@@ -1,5 +1,5 @@
/***
-* Copyright 2017 Marc Stevens <marc@marc-stevens.nl>
+* Copyright 2017 Marc Stevens <marc@marc-stevens.nl>, Dan Shumow (danshu@microsoft.com)
* Distributed under the MIT Software License.
* See accompanying file LICENSE.txt or copy at
* https://opensource.org/licenses/MIT
diff --git a/lib/ubc_check_verify.c b/lib/ubc_check_verify.c
index 9e0e32e..d9233a8 100644
--- a/lib/ubc_check_verify.c
+++ b/lib/ubc_check_verify.c
@@ -1,5 +1,5 @@
/***
-* Copyright 2017 Marc Stevens <marc@marc-stevens.nl>
+* Copyright 2017 Marc Stevens <marc@marc-stevens.nl>, Dan Shumow <danshu@microsoft.com>
* Distributed under the MIT Software License.
* See accompanying file LICENSE.txt or copy at
* https://opensource.org/licenses/MIT
diff --git a/src/main.c b/src/main.c
index 9edbed5..92de0d9 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,5 +1,5 @@
/***
-* Copyright 2017 Marc Stevens <marc@marc-stevens.nl>
+* Copyright 2017 Marc Stevens <marc@marc-stevens.nl>, Dan Shumow <danshu@microsoft.com>
* Distributed under the MIT Software License.
* See accompanying file LICENSE.txt or copy at
* https://opensource.org/licenses/MIT