Cryptography module, integrity checking commands and small fixes

cmd/errors/errors.go

@@ -28,7 +28,6 @@ var (
 	ErrPackNotPurgeable      = errors.New("pack not purgeable")
 	ErrPdscEntryExists       = errors.New("pdsc already in index")
 	ErrPdscEntryNotFound     = errors.New("pdsc not found in index")
-	ErrEula                  = errors.New("user does not agree with the pack's license")
 	ErrExtractEula           = errors.New("user wants to extract embedded license only")
 	ErrLicenseNotFound       = errors.New("embedded license not found")
 	ErrPackRootNotFound      = errors.New("no CMSIS Pack Root directory specified. Either the environment CMSIS_PACK_ROOT needs to be set or the path specified using the command line option -R/--pack-root string")

cmd/installer/pack.go

@@ -256,7 +256,8 @@ func (p *PackType) install(installation *PacksInstallationType, checkEula bool)
 			}
 
 			if !ok {
-				return errs.ErrEula
+				log.Info("User does not agree with the pack's license")
+				return nil
 			}
 		} else {
 			// Explicitly inform the user that license has been agreed

cmd/installer/root_pack_add_test.go

@@ -390,30 +390,6 @@ func TestAddPack(t *testing.T) {
 		})
 	})
 
-	t.Run("test installing pack with license disagreed", func(t *testing.T) {
-		localTestingDir := "test-add-pack-with-license-disagreed"
-		assert.Nil(installer.SetPackRoot(localTestingDir, CreatePackRoot))
-		defer os.RemoveAll(localTestingDir)
-
-		packPath := packWithLicense
-
-		info, err := utils.ExtractPackInfo(packPath)
-		assert.Nil(err)
-
-		// Should NOT be installed if license is not agreed
-		ui.LicenseAgreed = &ui.Disagreed
-		err = installer.AddPack(packPath, CheckEula, !ExtractEula, !ForceReinstall)
-
-		// Sanity check
-		assert.NotNil(err)
-		assert.Equal(errs.ErrEula, err)
-		assert.False(utils.FileExists(installer.Installation.PackIdx))
-
-		// Check in installer internals
-		pack := packInfoToType(info)
-		assert.False(installer.Installation.PackIsInstalled(pack))
-	})
-
 	t.Run("test installing pack with license agreed", func(t *testing.T) {
 		localTestingDir := "test-add-pack-with-license-agreed"
 		assert.Nil(installer.SetPackRoot(localTestingDir, CreatePackRoot))