Mar 22, 2022 · Mar 22, 2022 · Mar 22, 2022 · Mar 23, 2022 · Mar 24, 2022 · Mar 25, 2022
diff --git a/arduino/errors.go b/arduino/errors.go
diff --git a/cli/keys/generate.go b/cli/keys/generate.go
diff --git a/commands/keys/generate.go b/commands/keys/generate.go
diff --git a/test/test_keys.py b/test/test_keys.py
Original file line number	Diff line number	Diff line change
Expand Up		@@ -698,7 +698,7 @@ func (e TempDirCreationFailedError) ToRPCStatus() status.Status {
		return status.New(codes.Unavailable, e.Error())
		}

	// FileCreationFailedError is returned if a temp file could not be created
	// FileCreationFailedError is returned if a file could not be created
		type FileCreationFailedError struct {
Copy link Contributor @per1234 per1234 Mar 24, 2022 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others. Learn more. As this is an exported object, this will be a breaking change and so the standard procedure should be followed to communicate that to the users. umbynos reacted with thumbs up emoji Copy link Contributor Author @umbynos umbynos Mar 24, 2022 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others. Learn more. I did not though about it, but you are right
		Message string
		Cause error
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -67,7 +67,7 @@ func runGenerateCommand(command *cobra.Command, args []string) {
		KeysKeychain: keysKeychain,
		})
		if err != nil {
	feedback.Errorf(tr("Error during Generate: %v"), err)
	feedback.Errorf(tr("Error during generate: %v"), err)
		os.Exit(errorcodes.ErrGeneric)
		}
		feedback.PrintResult(result{resp})
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -194,11 +194,13 @@ func genEcdsaP256() ([]byte, []byte, error) {
		}

		// genCFile will take a file as input, the byte slice that represents the key and the type of the key.
	// If will then write the file and report an error if one is found
	// It will then write the file and report an error if one is found
		func genCFile(file *os.File, bytes []byte, t string) (err error) {
		fileContent := fmt.Sprintf(`/* Autogenerated, do not edit */
		const unsigned char rsa_%s_key[] = {
	%s
	// clang-format off
	%s
	// clang-format on
		};
		const unsigned int ec_%s_key_len = %d;
		`, t, formatCData(bytes), t, len(bytes))
Expand All		@@ -210,16 +212,17 @@ const unsigned int ec_%s_key_len = %d;
		// taken and adapted from https://git.furworks.de/Zephyr/mcuboot/src/commit/3869e760901a27adff47ccaea803a42f1b0169c0/imgtool/imgtool.go#L313
		func formatCData(data []byte) string {
		buf := new(bytes.Buffer)
	indText := strings.Repeat("\t", 1)
	indText := strings.Repeat("", 2)
		for i, b := range data {
		if i%8 == 0 {
	if i > 0 {
	fmt.Fprintf(buf, "\n%s", indText)
	}
	fmt.Fprintf(buf, indText)
		} else {
		fmt.Fprintf(buf, " ")
		}
		fmt.Fprintf(buf, "0x%02x,", b)
	if i%8 == 7 {
	fmt.Fprintf(buf, "\n")
	}
		}
		return buf.String()
		}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -32,7 +32,7 @@ def test_keys_generate(run_command, working_dir):
		# Overwrite security keys
		result = run_command(["keys", "generate", "--key-name", sign_key_name])
		assert result.failed
	assert f"Error during Generate: Cannot create file: File already exists: {working_dir}" in result.stderr
	assert f"Error during generate: Cannot create file: File already exists: {working_dir}" in result.stderr

		# Create security keys in specified directory
		keychain_name = "keychain"
Expand Down Expand Up		@@ -64,4 +64,4 @@ def test_keys_generate(run_command, working_dir):
		["keys", "generate", "--key-name", sign_key_name, "--keys-keychain", keychain_path, "-t", "rsa"]
		)
		assert result.failed
	assert "Error during Generate: Cannot create file: Unsupported algorithm: rsa" in result.stderr
	assert "Error during generate: Cannot create file: Unsupported algorithm: rsa" in result.stderr