From 13654dcc377d0452413100fcbe6b5cc96a481aa3 Mon Sep 17 00:00:00 2001 From: Chris Roberts Date: Fri, 4 Oct 2019 14:14:59 -0700 Subject: [PATCH] Update box checksum logic to use that supplied from FileChecksum --- lib/vagrant/action/builtin/box_add.rb | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/lib/vagrant/action/builtin/box_add.rb b/lib/vagrant/action/builtin/box_add.rb index b951a805d..60ac6d597 100644 --- a/lib/vagrant/action/builtin/box_add.rb +++ b/lib/vagrant/action/builtin/box_add.rb @@ -527,22 +527,11 @@ module Vagrant end def validate_checksum(checksum_type, checksum, path) - checksum_klass = case checksum_type.to_sym - when :md5 - Digest::MD5 - when :sha1 - Digest::SHA1 - when :sha256 - Digest::SHA2 - else - raise Errors::BoxChecksumInvalidType, - type: checksum_type.to_s - end - - @logger.info("Validating checksum with #{checksum_klass}") + @logger.info("Validating checksum with #{checksum_type}") @logger.info("Expected checksum: #{checksum}") - actual = FileChecksum.new(path, checksum_klass).checksum + actual = FileChecksum.new(path, checksum_type).checksum + @logger.info("Actual checksum: #{actual}") if actual.casecmp(checksum) != 0 raise Errors::BoxChecksumMismatch, actual: actual,