summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2013-07-29 14:55:21 +1000
committerDamien Miller <djm@mindrot.org>2013-07-29 14:55:21 +1000
commita2efc899ef3b3a761b331e3cf273d0b9d89d7047 (patch)
tree547b1a349ecae80243aab22618932bcb4fdb25c2
parent0da6e570ab13a527ca06f688c59737ed9eae1de2 (diff)
downloadpy-bcrypt-a2efc899ef3b3a761b331e3cf273d0b9d89d7047.tar.gz
update license for timingsafe_bcmp
-rw-r--r--LICENSE21
1 files changed, 20 insertions, 1 deletions
diff --git a/LICENSE b/LICENSE
index c31acb9..a71feed 100644
--- a/LICENSE
+++ b/LICENSE
@@ -103,7 +103,7 @@ The KDF code is from OpenBSD libutil and is subject to the following licence:
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-The SHA512 is from OpenBSD libc and is subject to the following license:
+The SHA512 code is from OpenBSD libc and is subject to the following license:
/*
* FILE: sha2.c
@@ -139,3 +139,22 @@ The SHA512 is from OpenBSD libc and is subject to the following license:
* $From: sha2.c,v 1.1 2001/11/08 00:01:51 adg Exp adg $
*/
+The timingsafe_bcmp is from OpenBSD libc and is subject to the following
+license:
+
+/*
+ * Copyright (c) 2010 Damien Miller. All rights reserved.
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+