Skip to content
Browse files

add license

  • Loading branch information...
1 parent 59fa193 commit 340d101ffdc42675457aa638da68309c67b78003 @benoitc committed
Showing with 46 additions and 15 deletions.
  1. +46 −11 NOTICE
  2. +0 −4 gaffer/gafferd/pbkdf2.py
View
57 NOTICE
@@ -1,13 +1,16 @@
gaffer
-------
+======
-2012 (c) Benoît Chesneau <benoitc@e-engura.org>
+2012-2013 (c) Benoît Chesneau <benoitc@e-engura.org>
gaffer is available in the public domain (see UNLICENSE). gaffer
is also optionally available under the MIT License (see LICENSE), meant
especially for jurisdictions that do not recognize public domain works.
+Third party libs
+================
+
tornado_pyuv
------------
@@ -34,8 +37,8 @@ THE SOFTWARE.
pidfile.py
----------
-2009,2012 (c) Benoît Chesneau <benoitc@e-engura.org>
-2009,2012 (c) Paul J. Davis <paul.joseph.davis@gmail.com>
+2009,2013 (c) Benoît Chesneau <benoitc@e-engura.org>
+2009,2013 (c) Paul J. Davis <paul.joseph.davis@gmail.com>
Permission is hereby granted, free of charge, to any person
obtaining a copy of this software and associated documentation
@@ -59,13 +62,7 @@ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
OTHER DEALINGS IN THE SOFTWARE.
-gafferctl.py
-------------
-
-Based and couchapp and placed in the domain public by Benoît Chesneau.
-
-
-gaffer.http.sockjs
+gaffer.sockjs
------------------
Based on tornado_sockjs
@@ -112,3 +109,41 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
+
+
+gaffer.pkbdf2
+-------------
+
+Based on pkbdf2 from Armin Ronacher, adapted for python 3
+
+Copyright (c) 2011 by Armin Ronacher.
+
+Some rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+ * 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.
+
+ * The names of the contributors may not be used to endorse or
+ promote products derived from this software without specific
+ prior written permission.
+
+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.
View
4 gaffer/gafferd/pbkdf2.py
@@ -52,7 +52,6 @@ def safe_str_cmp(a, b):
import six
from six.moves import zip
-
_pack_int = Struct('>I').pack
if six.PY3:
@@ -96,6 +95,3 @@ def _pseudorandom(x, mac=mac):
return bytes(buf)[:keylen]
return ''.join(map(chr, buf))[:keylen]
-
-if __name__ == '__main__':
- test()

0 comments on commit 340d101

Please sign in to comment.
Something went wrong with that request. Please try again.