Skip to content
Browse files

Add pbkdf2

  • Loading branch information...
1 parent ef07340 commit 4fd08c248aae2a9c1c6b154f10c374cd5d039f5f @SixArm committed Mar 19, 2012
Showing with 31 additions and 27 deletions.
  1. +1 −0 Gemfile
  2. +0 −27 LICENSE.txt
  3. +30 −0 README.md
View
1 Gemfile
@@ -136,6 +136,7 @@ gem 'rghost' # Ruby Ghostscript Engine is a document creation and conversion AP
# Encryption
gem 'bcrypt-ruby' # Secure algorithm for hashing passwords.
gem 'encryptor' # Wrapper for the standard ruby OpenSSL library.
+gem 'pbkdf2' # Password Based Key Derivation Function 2 (PBKDF2)
# Extensions
#gem 'facets' # Premier collection of extension methods for Ruby. [problem with overriding]
View
27 LICENSE.txt
@@ -1,27 +0,0 @@
-LICENSE
-
-You may choose any of these open source licenses:
-
- - Apache License
- - BSD License
- - CreativeCommons License, Non-commercial Share Alike
- - GNU General Public License Version 2 (GPL 2)
- - GNU Lesser General Public License (LGPL)
- - MIT License
- - Perl Artistic License
- - Ruby License
-
-The software is provided "as is", without warranty of any kind,
-express or implied, including but not limited to the warranties of
-merchantability, fitness for a particular purpose and noninfringement.
-
-In no event shall the 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.
-
-This license is for the included software that is created by SixArm;
-some of the included software may have its own licenses, copyrights,
-authors, etc. and these do take precedence over the SixArm license.
-
-Copyright (c) 2005-2013 Joel Parker Henderson
View
30 README.md
@@ -16,3 +16,33 @@ For docs go to <http://sixarm.com/sixarm_ruby_/doc>
Want to help? We're happy to get pull requests.
+## Changes
+
+* 2012-03-14 1.1.4 Update docs
+## License
+
+You may choose any of these open source licenses:
+
+ * Apache License
+ * BSD License
+ * CreativeCommons License, Non-commercial Share Alike
+ * GNU General Public License Version 2 (GPL 2)
+ * GNU Lesser General Public License (LGPL)
+ * MIT License
+ * Perl Artistic License
+ * Ruby License
+
+The software is provided "as is", without warranty of any kind,
+express or implied, including but not limited to the warranties of
+merchantability, fitness for a particular purpose and noninfringement.
+
+In no event shall the 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.
+
+This license is for the included software that is created by SixArm;
+some of the included software may have its own licenses, copyrights,
+authors, etc. and these do take precedence over the SixArm license.
+
+Copyright (c) 2005-2013 Joel Parker Henderson

0 comments on commit 4fd08c2

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