argon2 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a60b9c207b41c9617c2ab7a2004431db65a55a66bc32c89565a1640d503434a0
-  data.tar.gz: d06a5d2775c37d831d298469d594d9681488adb2d30180294973619efa478e88
+  metadata.gz: 5e3f42d9a5dff3fd0375ce5c5106e91e0ff8d451ea2a2f4a33c3d9f837707dbd
+  data.tar.gz: 99cd35b1d042eba0b17a84eb2a8b15a023f9220b5d635f4a523e677fb8343236
 SHA512:
-  metadata.gz: e63db7eb3b5fbbffa0291308eecd84b55a315986e124cd353bfad0111d86e1bf5072f42a39913a6b5c31730e65159cfe693694ccfd638996b9204d3b7a2a6d24
-  data.tar.gz: d81718f30c16eb3b504502f437150cc69964375fa0233512edb97d0bf208ee4903bae1911b957f781b6018b52e81eba113e6488ed3e035a417b9d52f9b6f4844
+  metadata.gz: c1327ce0e44b87f4a16000a9d390c658343ee29f4016709e9c80a9e21e194a575cf7083d50b12e3754151d9765b2364e2abba8aa28e121b2b48d1905f1b2a1ad
+  data.tar.gz: 5fc47c017aa6e9af263760bcbb3d44cec879e38338c393562b8c3455912bf4880326a84455d0853168aa9972751bfebf7d4f2ff56c1c2f67a454c4ee63e7719c

data/.github/workflows/ruby.yml

@@ -0,0 +1,70 @@
+name: Test Suite
+
+# Run against all commits and pull requests.
+on: [ push, pull_request ]
+
+jobs:
+  test_matrix:
+
+    strategy:
+      fail-fast: false
+      matrix:
+        os:
+          - ubuntu
+          - macos
+        ruby:
+          - 2.6
+          - 2.7
+          - 3.0
+          - head
+
+    runs-on: ${{ matrix.os }}-latest
+
+    env:
+      TEST_CHECKS: 100
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+      - name: Build Argon2 C library
+        run: bin/setup
+      - name: Test Argon2 C library
+        run: bin/test
+      - name: Run tests
+        run: bundle exec rake test
+      - name: Coveralls Parallel
+        uses: coverallsapp/github-action@master
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          flag-name: run-${{ matrix.ruby-version }}
+          parallel: true
+
+  rubocop:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: 3.0
+        bundler-cache: true
+    - name: Run rubocop
+      run: bundle exec rake rubocop
+
+  finish:
+    runs-on: ubuntu-latest
+    needs: [ test_matrix, rubocop ]
+    steps:
+      - name: Coveralls Finished
+        uses: coverallsapp/github-action@master
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          parallel-finished: true
+      - name: Wait for status checks
+        run: echo "All Green!"

data/.rubocop.yml

@@ -1,20 +1,31 @@
-
 Metrics/AbcSize:
   Max: 20
+
 Metrics/CyclomaticComplexity:
   Enabled: false
+
 Metrics/PerceivedComplexity:
   Enabled: false
-Metrics/LineLength:
+
+Metrics/ParameterLists:
+  Max: 5
+  Exclude:
+    - 'lib/argon2/ffi_engine.rb'
+
+Layout/LineLength:
   Max: 160
+  Exclude:
+    - 'test/low_level_test.rb'
 
 Metrics/MethodLength:
   Max: 24
+  Exclude:
+    - 'test/low_level_test.rb'
 
-Layout/AlignParameters:
+Layout/ParameterAlignment:
   Enabled: false
 
-Layout/AlignArray:
+Layout/ArrayAlignment:
   Enabled: false
 
 # Configuration parameters: Exclude.
@@ -37,7 +48,7 @@ Style/HashSyntax:
 
 # Offense count: 1
 # Cop supports --auto-correct.
-Layout/IndentArray:
+Layout/FirstArrayElementIndentation:
   Exclude:
     - 'lib/argon2/errors.rb'
 
@@ -61,3 +72,165 @@ Layout/MultilineMethodCallBraceLayout:
     - 'lib/argon2.rb'
     - 'test/low_level_test.rb'
 
+Gemspec/RequiredRubyVersion:
+  Enabled: false
+
+Layout/BeginEndAlignment: # (new in 0.91)
+  Enabled: true
+Layout/EmptyLinesAroundAttributeAccessor: # (new in 0.83)
+  Enabled: true
+Layout/SpaceAroundMethodCallOperator: # (new in 0.82)
+  Enabled: true
+Lint/BinaryOperatorWithIdenticalOperands: # (new in 0.89)
+  Enabled: true
+Lint/ConstantDefinitionInBlock: # (new in 0.91)
+  Enabled: true
+Lint/DeprecatedOpenSSLConstant: # (new in 0.84)
+  Enabled: true
+Lint/DuplicateElsifCondition: # (new in 0.88)
+  Enabled: true
+Lint/DuplicateRequire: # (new in 0.90)
+  Enabled: true
+Lint/DuplicateRescueException: # (new in 0.89)
+  Enabled: true
+Lint/EmptyConditionalBody: # (new in 0.89)
+  Enabled: true
+Lint/EmptyFile: # (new in 0.90)
+  Enabled: true
+Lint/FloatComparison: # (new in 0.89)
+  Enabled: true
+Lint/IdentityComparison: # (new in 0.91)
+  Enabled: true
+Lint/MissingSuper: # (new in 0.89)
+  Enabled: true
+Lint/MixedRegexpCaptureTypes: # (new in 0.85)
+  Enabled: true
+Lint/OutOfRangeRegexpRef: # (new in 0.89)
+  Enabled: true
+Lint/RaiseException: # (new in 0.81)
+  Enabled: true
+Lint/SelfAssignment: # (new in 0.89)
+  Enabled: true
+Lint/StructNewOverride: # (new in 0.81)
+  Enabled: true
+Lint/TopLevelReturnWithArgument: # (new in 0.89)
+  Enabled: true
+Lint/TrailingCommaInAttributeDeclaration: # (new in 0.90)
+  Enabled: true
+Lint/UnreachableLoop: # (new in 0.89)
+  Enabled: true
+Lint/UselessMethodDefinition: # (new in 0.90)
+  Enabled: true
+Lint/UselessTimes: # (new in 0.91)
+  Enabled: true
+Style/AccessorGrouping: # (new in 0.87)
+  Enabled: true
+Style/ArrayCoercion: # (new in 0.88)
+  Enabled: true
+Style/BisectedAttrAccessor: # (new in 0.87)
+  Enabled: true
+Style/CaseLikeIf: # (new in 0.88)
+  Enabled: true
+Style/CombinableLoops: # (new in 0.90)
+  Enabled: true
+Style/ExplicitBlockArgument: # (new in 0.89)
+  Enabled: true
+Style/ExponentialNotation: # (new in 0.82)
+  Enabled: true
+Style/GlobalStdStream: # (new in 0.89)
+  Enabled: true
+Style/HashAsLastArrayItem: # (new in 0.88)
+  Enabled: true
+Style/HashEachMethods: # (new in 0.80)
+  Enabled: true
+Style/HashLikeCase: # (new in 0.88)
+  Enabled: true
+Style/HashTransformKeys: # (new in 0.80)
+  Enabled: true
+Style/HashTransformValues: # (new in 0.80)
+  Enabled: true
+Style/KeywordParametersOrder: # (new in 0.90)
+  Enabled: true
+Style/OptionalBooleanParameter: # (new in 0.89)
+  Enabled: true
+Style/RedundantAssignment: # (new in 0.87)
+  Enabled: true
+Style/RedundantFetchBlock: # (new in 0.86)
+  Enabled: true
+Style/RedundantFileExtensionInRequire: # (new in 0.88)
+  Enabled: true
+Style/RedundantRegexpCharacterClass: # (new in 0.85)
+  Enabled: true
+Style/RedundantRegexpEscape: # (new in 0.85)
+  Enabled: true
+Style/RedundantSelfAssignment: # (new in 0.90)
+  Enabled: true
+Style/SingleArgumentDig: # (new in 0.89)
+  Enabled: true
+Style/SlicingWithRange: # (new in 0.83)
+  Enabled: true
+Style/SoleNestedConditional: # (new in 0.89)
+  Enabled: true
+Style/StringConcatenation: # (new in 0.89)
+  Enabled: true
+
+Layout/SpaceBeforeBrackets: # (new in 1.7)
+  Enabled: true
+Lint/AmbiguousAssignment: # (new in 1.7)
+  Enabled: true
+Lint/DuplicateBranch: # (new in 1.3)
+  Enabled: true
+Lint/DuplicateRegexpCharacterClassElement: # (new in 1.1)
+  Enabled: true
+Lint/EmptyBlock: # (new in 1.1)
+  Enabled: true
+Lint/EmptyClass: # (new in 1.3)
+  Enabled: true
+Lint/NoReturnInBeginEndBlocks: # (new in 1.2)
+  Enabled: true
+Lint/ToEnumArguments: # (new in 1.1)
+  Enabled: true
+Lint/UnexpectedBlockArity: # (new in 1.5)
+  Enabled: true
+Lint/UnmodifiedReduceAccumulator: # (new in 1.1)
+  Enabled: true
+Style/ArgumentsForwarding: # (new in 1.1)
+  Enabled: true
+Style/CollectionCompact: # (new in 1.2)
+  Enabled: true
+Style/DocumentDynamicEvalDefinition: # (new in 1.1)
+  Enabled: true
+Style/HashExcept: # (new in 1.7)
+  Enabled: true
+Style/NegatedIfElseCondition: # (new in 1.2)
+  Enabled: true
+Style/NilLambda: # (new in 1.3)
+  Enabled: true
+Style/RedundantArgument: # (new in 1.4)
+  Enabled: true
+Style/SwapValues: # (new in 1.1)
+  Enabled: true
+Gemspec/DateAssignment: # (new in 1.10)
+  Enabled: true
+Lint/DeprecatedConstants: # (new in 1.8)
+  Enabled: true
+Lint/LambdaWithoutLiteralBlock: # (new in 1.8)
+  Enabled: true
+Lint/NumberedParameterAssignment: # (new in 1.9)
+  Enabled: true
+Lint/OrAssignmentToConstant: # (new in 1.9)
+  Enabled: true
+Lint/RedundantDirGlobSort: # (new in 1.8)
+  Enabled: true
+Lint/SymbolConversion: # (new in 1.9)
+  Enabled: true
+Lint/TripleQuotes: # (new in 1.9)
+  Enabled: true
+Style/EndlessMethod: # (new in 1.8)
+  Enabled: true
+Style/HashConversion: # (new in 1.10)
+  Enabled: true
+Style/IfWithBooleanLiteralBranches: # (new in 1.9)
+  Enabled: true
+Style/StringChars: # (new in 1.12)
+  Enabled: true

data/Changelog.md

@@ -1,3 +1,13 @@
+## v2.1.0: 2021-04-09
+- Introduce RBS types
+- Expose p parameter
+
+## v2.0.3: 2021-01-02
+- Address potential memory leak. Unlikely to be exploitable.
+
+## v2.0.0: 2019-01-06
+- Defaults to Argon2id for new hashes
+
 ## v1.2.0: 2018-11-29
 - Support for verifying Argon2id format
 

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in argon2.gemspec

data/README.md

@@ -2,23 +2,21 @@
 
 This Ruby Gem provides FFI bindings, and a simplified interface, to the Argon2 algorithm. [Argon2](https://github.com/P-H-C/phc-winner-argon2) is the official winner of the Password Hashing Competition, a several year project to identify a successor to bcrypt/PBKDF/scrypt methods of securely storing passwords. This is an independant project and not official from the PHC team.
 
-
-[![Build Status](https://travis-ci.org/technion/ruby-argon2.svg?branch=master)](https://travis-ci.org/technion/ruby-argon2)
+![Build Status](https://github.com/technion/ruby-argon2/workflows/Test%20Suite/badge.svg)
 [![Code Climate](https://codeclimate.com/github/technion/ruby-argon2/badges/gpa.svg)](https://codeclimate.com/github/technion/ruby-argon2)
 [![Coverage Status](https://coveralls.io/repos/github/technion/ruby-argon2/badge.svg)](https://coveralls.io/github/technion/ruby-argon2)
 
 ## Design
 
-This project has several key tenants to its design:
+This project has several key tenets to its design:
 
 * The reference Argon2 implementation is to be used "unaltered". To ensure compliance with this goal, and encourage regular updates from upstream, the upstream library is implemented as a git submodule, and is intended to stay that way.
 * The FFI interface is kept as slim as possible, with wrapper classes preferred to implementing context structs in FFI
 * Security and maintainability take top priority. This can have an impact on platform support. A PR that contains platform specific code paths is unlikely to be accepted.
 * Tested platforms are MRI Ruby 2.2, 2.3 and JRuby 9000. No assertions are made on other platforms.
 * Errors from the C interface are raised as Exceptions. There are a lot of exception classes, but they tend to relate to things like very broken input, and code bugs. Calls to this library should generally not require a rescue.
-* Test suits should aim for 100% code coverage.
+* Test suites should aim for 100% code coverage.
 * Default work values should not be considered constants. I will increase them from time to time.
-* Not exposing the threads parameter is a design choice. I believe there is significant risk, and minimal gain in using a value other than '1'. Four threads on a four core box completely ties up the entire server to process one user logon. If you want more security, increase m_cost.
 * Many Rubocop errors have been disabled, but any commit should avoid new alerts or demonstrate their necessity.
 
 ## Usage
@@ -32,7 +30,7 @@ require 'argon2'
 To generate a hash using specific time and memory cost:
 
 ```ruby
-hasher = Argon2::Password.new(t_cost: 2, m_cost: 16)
+hasher = Argon2::Password.new(t_cost: 2, m_cost: 16, p_cost: 1)
 hasher.create("password")
     => "$argon2i$v=19$m=65536,t=2,p=1$jL7lLEAjDN+pY2cG1N8D2g$iwj1ueduCvm6B9YVjBSnAHu+6mKzqGmDW745ALR38Uo"
 ```
@@ -44,8 +42,7 @@ hasher = Argon2::Password.new
 hasher.create("password")
 ```
 
-If you follow this pattern, it is important to create a new `Argon2::Password` every time you generate a hash, in order to ensure a unique salt. See [issue 23](https://github.com/technion/ruby-argon2/issues/23) for more information.
-Alternatively, use this shotcut:
+Alternatively, use this shortcut:
 
 ```ruby
 Argon2::Password.create("password")
@@ -73,6 +70,17 @@ argon = Argon2::Password.new(t_cost: 2, m_cost: 16, secret: KEY)
 myhash = argon.create("A password")
 Argon2::Password.verify_password("A password", myhash, KEY)
 ```
+## Ruby 3 Types
+I am now shipping signatures in sig/. The following command sets up a testing interface.
+```sh
+RBS_TEST_TARGET="Argon2::*" bundle exec ruby -r rbs/test/setup bin/console
+```
+You should also be able to pass Steep checks:
+```sh
+steep check
+```
+These tools will need to be installed manually at this time and will be added to Gemfiles after much further testing.
+
 ## Version 2.0 - Argon 2id
 Version 2.x upwards will now default to the Argon2id hash format. This is consistent with current recommendations regarding Argon2 usage. It remains capable of verifying existing hashes.
 
@@ -81,7 +89,7 @@ Version 1.0.0 included a major version bump over 0.1.4 due to several breaking c
 
 The second of these is that the reference Argon2 implementation introduced an algorithm change, which produces a hash which is not backwards compatible. This is documented on [this PR on the C library](https://github.com/P-H-C/phc-winner-argon2/pull/115). This was a regrettable requirement to address a security concern in the algorithm itself. The two versions of the Argon2 algorithm are numbered 1.0 and 1.3 respectively.
 
-Shortly after this, version 1.0.0 of this gem was released with this breaking change, supporting only Argon2 v1.3. Further time later, the official encoding format was updated, with a spec that included the version number, and the library introduced backward compatibility. This should remove the likelyhood of such breaking changes in future. Version 1.1.0 will silently introduce the current version number in hashes, in order to avoid a further compatibility break.
+Shortly after this, version 1.0.0 of this gem was released with this breaking change, supporting only Argon2 v1.3. Further time later, the official encoding format was updated, with a spec that included the version number, and the library introduced backward compatibility. This should remove the likelihood of such breaking changes in future. 
 
 
 ## Platform Issues
@@ -92,6 +100,8 @@ Windows is not. Nobody anywhere has the resources to support Ruby FFI code on Wi
 
 grsec introduces certain challenges. Please see [documentation here](https://github.com/technion/ruby-argon2/issues/15).
 
+See the .travis.yml file to see currently tested and supported Ruby versions.
+
 ## RubyDocs documentation
 
 [The usual URL](http://www.rubydoc.info/gems/argon2) will provide detailed documentation.
@@ -109,7 +119,7 @@ Although the low level C contains support for "secure memory wipe", any code hit
 
 ### Work maximums may be tighter than reference
 
-The reference implementation is aimed to provide secure hashing for many years. This implementation doesn't want you to DoS yourself in the meantime. Accordingly, some limits artificial limits exist on work powers. This gem can be much more agile in raising these as technology progresses.
+The reference implementation is aimed to provide secure hashing for many years. This implementation doesn't want you to DoS yourself in the meantime. Accordingly, some artificial limits exist on work powers. This gem can be much more agile in raising these as technology progresses.
 
 ### Salts in general
 
@@ -122,17 +132,19 @@ Any form of contribution is appreciated, however, please review [CONTRIBUTING.md
 
 ## Building locally/Tests
 
-To build the gem locally, you will need to checkout the submodule and build it manually:
+To build the gem locally, you will need to run the setup script:
+
+```shell
+./bin/setup
+```
+
+You can test that the Argon2 C library was properly imported by running the C test suite:
 
 ```shell
-git submodule update --init --recursive
-bundle install
-cd ext/argon2_wrap/
-make
-cd ../..
+./bin/test
 ```
 
-The test harness includes a property based test. To more strenuously perform this test, you can tune the iterations parameter:
+The ruby wrapper test suite includes a property based test. To more strenuously perform this test, you can tune the iterations parameter:
 
 ```shell
 TEST_CHECKS=10000 bundle exec rake test

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "bundler/gem_tasks"
 require "rake/testtask"
 require 'rubocop/rake_task'

data/Steepfile

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+target :lib do
+  signature "sig"
+
+  check "argon2.rb"
+  check "lib"                       # Directory name
+  ignore "lib/argon2/ffi_engine.rb"
+  ignore "lib/argon2/errors.rb"
+end
+
+target :spec do
+  signature "sig", "sig-private"
+
+  check "spec"
+end

data/argon2.gemspec

@@ -1,4 +1,6 @@
-lib = File.expand_path('../lib', __FILE__)
+# frozen_string_literal: true
+
+lib = File.expand_path('lib', __dir__)
 
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'argon2/version'
@@ -9,6 +11,8 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Technion"]
   spec.email         = ["technion@lolware.net"]
 
+  spec.required_ruby_version = '>= 2.6.0'
+
   spec.summary       = 'Argon2 Password hashing binding'
   spec.description   = 'Argon2 FFI binding'
   spec.homepage      = 'https://github.com/technion/ruby-argon2'
@@ -20,13 +24,15 @@ Gem::Specification.new do |spec|
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
-  spec.add_dependency 'ffi', '~> 1.9'
-  spec.add_dependency 'ffi-compiler', '~> 0.1'
+  spec.add_dependency 'ffi', '~> 1.14'
+  spec.add_dependency 'ffi-compiler', '~> 1.0'
 
-  spec.add_development_dependency "bundler", '~> 1.10', '>= 1.10.5'
-  spec.add_development_dependency "coveralls", '~> 0.8'
+  spec.add_development_dependency "bundler", '~> 2.0'
   spec.add_development_dependency "minitest", '~> 5.8'
-  spec.add_development_dependency "rake", '~> 10.4', '>= 10.4.2'
-  spec.add_development_dependency "rubocop", '~> 0.49'
+  spec.add_development_dependency "rake", '~> 13.0.1'
+  spec.add_development_dependency "rubocop", '~> 1.7'
+  spec.add_development_dependency "simplecov", '~> 0.20'
+  spec.add_development_dependency "simplecov-lcov", '~> 0.8'
+  spec.add_development_dependency "steep", "~> 0.43.1"
   spec.extensions << 'ext/argon2_wrap/extconf.rb'
 end

data/bin/console

@@ -1,14 +1,15 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
-require "bundler/setup"
-require "argon2"
+require 'bundler/setup'
+require 'argon2'
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
 
 # (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
+# require 'pry'
 # Pry.start
 
-require "irb"
+require 'irb'
 IRB.start

data/bin/setup

@@ -1,10 +1,14 @@
 #!/bin/bash
+# Exit the script immediately if a command fails
 set -euo pipefail
+# Internal Field Separator
 IFS=$'\n\t'
 
+# Initialize Git Submodules
+git submodule update --init --recursive
+
+# Build the Argon2 C Library. Git submodules must be initialized first!
 bundle install
 cd ext/argon2_wrap/
 make
 cd ../..
-
-# Do any other automated setup that you need to do here

data/bin/test

@@ -0,0 +1,10 @@
+#!/bin/bash
+# Exit the script immediately if a command fails
+set -euo pipefail
+# Internal Field Separator
+IFS=$'\n\t'
+
+# Run the Argon2 C Library tests
+cd ext/argon2_wrap/
+make test
+cd ../..

data/ext/argon2_wrap/argon_wrap.c

@@ -73,6 +73,8 @@ int argon2_wrap_version(char *out, const char *pwd, size_t pwd_length,
         result = argon2i_ctx(&context);
     }  else if (type == Argon2_id) {
         result = argon2id_ctx(&context);
+    } else if (type == Argon2_d) {
+        result = argon2d_ctx(&context);
     } else {
         // Unsupported type
         return ARGON2_ENCODING_FAIL;
@@ -124,8 +126,12 @@ int wrap_argon2_verify(const char *encoded, const char *pwd,
         type = Argon2_id;
     } else if (memcmp(encoded, "$argon2i", strlen("$argon2i")) == 0) {
         type = Argon2_i;
+    } else if (memcmp(encoded, "$argon2d", strlen("$argon2d")) == 0) {
+        type = Argon2_d;
     } else {
         // Other types not yet supported
+        free(ctx.salt);
+        free(ctx.out);
         return ARGON2_DECODING_FAIL;
     }
 

data/ext/argon2_wrap/extconf.rb

@@ -1 +1,2 @@
+# frozen_string_literal: true
 #I must admit I have no understanding of why this empty file works.

data/ext/argon2_wrap/test.c

@@ -83,7 +83,6 @@ int main()
     pwd = strdup(PWD); \
     argon2_wrap(out2, pwd, strlen(PWD), salt, strlen((const char *)salt),T, 1<<M, 1, NULL, 0); \
     free(pwd); \
-    fprintf(stderr,out2); \
     assert(memcmp(out2, REF, strlen(REF)) == 0); \
     printf( "Ref test: %s: PASS\n", REF);
 

data/ext/phc-winner-argon2/.gitignore

@@ -2,6 +2,7 @@ argon2
 libargon2.a
 libargon2.so*
 libargon2.dylib
+libargon2.pc
 .DS_Store
 src/*.o
 src/blake2/*.o

data/ext/phc-winner-argon2/Argon2.sln

@@ -1,8 +1,6 @@
 
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
-MinimumVisualStudioVersion = 10.0.40219.1
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Argon2OptTestCI", "vs2015\Argon2OptTestCI\Argon2OptTestCI.vcxproj", "{12956597-5E42-433A-93F3-D4EFF50AA207}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Argon2RefTestCI", "vs2015\Argon2RefTestCI\Argon2RefTestCI.vcxproj", "{8A1F7F84-34AF-4DB2-9D58-D4823DFE79E9}"

data/ext/phc-winner-argon2/LICENSE

@@ -7,8 +7,8 @@ You may use this work under the terms of a Creative Commons CC0 1.0
 License/Waiver or the Apache Public License 2.0, at your option. The terms of
 these licenses can be found at:
 
-- CC0 1.0 Universal : http://creativecommons.org/publicdomain/zero/1.0
-- Apache 2.0        : http://www.apache.org/licenses/LICENSE-2.0
+- CC0 1.0 Universal : https://creativecommons.org/publicdomain/zero/1.0
+- Apache 2.0        : https://www.apache.org/licenses/LICENSE-2.0
 
 The terms of the licenses are reproduced below.