aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Hamburg <mike@shiftleft.org>2017-06-01 15:40:32 -0700
committerMichael Hamburg <mike@shiftleft.org>2017-06-01 15:40:32 -0700
commit0a6e96827595fa1a5a62d12ac83c3cc5dda6dd67 (patch)
tree0260a0dbab5580512557abe8457e733286aef2e3
parentfix two warnings pointed out by Sofia Celi (diff)
downloadgoldilocks-0a6e96827595fa1a5a62d12ac83c3cc5dda6dd67.tar.xz
goldilocks-0a6e96827595fa1a5a62d12ac83c3cc5dda6dd67.zip
Revise LICENSE.txt to reflect current state of source. Still MIT licensed, but I think there is no longer any Stanford code.v0.9.2
-rw-r--r--LICENSE.txt19
1 files changed, 17 insertions, 2 deletions
diff --git a/LICENSE.txt b/LICENSE.txt
index 9c8013b..7da9007 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,7 +1,22 @@
+The Python bindings are Copyright 2017 John-Mark Gurney, and are provided
+under a BSD license as described in python/edgold/ed448.py
+
+Certain sections of code are public domain or CC0, as marked.
+
+Earlier versions of this project used small amounts of code which were
+ Copyright (c) 2011 Stanford University
+ Copyright (c) 2011 Mike Hamburg
+but I believe that all of this code has now been replaced.
+
+The bulk of this library is
+ Copyright (c) 2014-2017 Cryptography Research, Inc.
+and licensed under the following MIT license.
+
+
+
The MIT License (MIT)
-Copyright (c) 2011 Stanford University.
-Copyright (c) 2014 Cryptography Research, Inc.
+Copyright (c) 2014-2017 Cryptography Research, Inc.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal