Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Updated licensing information

  • Loading branch information...
commit 7e60ae7c84d1185e20ca16db58be3da57b99b653 1 parent 37b6a3d
Mark Simpson mark-up authored
Showing with 66 additions and 3 deletions.
  1. +13 −0 LICENSE.md
  2. +17 −3 README.md
  3. +36 −0 udacious/lib/bcrypt/LICENSE.md
13 LICENSE.md
View
@@ -0,0 +1,13 @@
+Copyright 2012 <contributors>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
20 README.md
View
@@ -4,14 +4,28 @@
*Note: This is a student-led, rather than an official Udacity project.*
-
+---
###About
A project by students of cs253, Udacious (interim title) is a social-network by and for students of Udacity. The website will include a magazine section with student-submitted articles centered around Udacity classes.
Read the wiki [here](http://www.udacity.com/wiki/magazine).
-
+---
###License
-To be decided
+All contributed code is covered by the (Apache 2.0 License)[http://www.apache.org/licenses/LICENSE-2.0]
+
+Included libraries retain their original licenses.
+
+
+---
+###Dependencies
+
+We're standing [on the shoulders of giants](http://en.wikipedia.org/wiki/Standing_on_the_shoulders_of_giants)
+
+ - [webapp2](http://webapp-improved.appspot.com/)
+ - [ndb](http://developers.google.com/appengine/docs/python/ndb/)
+ - [jinja2](http://jinja.pocoo.org/docs/)
+ - [bcrypt](https://github.com/erlichmen/py-bcrypt)
+ - [jQuery](http://jquery.com/)
36 udacious/lib/bcrypt/LICENSE.md
View
@@ -0,0 +1,36 @@
+Blowfish block cipher for OpenBSD
+Copyright 1997 Niels Provos <provos@physnet.uni-hamburg.de>
+All rights reserved.
+
+Implementation advice by David Mazieres <dm@lcs.mit.edu>.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+ noticeL, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+ noticeL, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+3. All advertising materials mentioning features or use of this software
+ must display the following acknowledgement:
+ This product includes software developed by Niels Provos.
+4. The name of the author may not be used to endorse or promote products
+ derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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 USeL,
+DATaL, 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 SOFTWAReL, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+This code is derived from section 14.3 and the given source
+in section V of Applied Cryptography, second edition.
+Blowfish is an unpatented fast block cipher designed by
+Bruce Schneier.
Please sign in to comment.
Something went wrong with that request. Please try again.