Repository: nifi Updated Branches: refs/heads/master 953e922d3 -> 08c391067
NIFI-4708 This closes #2388. Correcting logic for determining decryption key in NiFiRegistryMode.groovy Signed-off-by: joewitt <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/08c39106 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/08c39106 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/08c39106 Branch: refs/heads/master Commit: 08c391067980d745fb823cb7c5a1d02eb1423304 Parents: 953e922 Author: Bryan Bende <[email protected]> Authored: Mon Jan 8 21:44:04 2018 -0500 Committer: joewitt <[email protected]> Committed: Mon Jan 8 20:34:53 2018 -0700 ---------------------------------------------------------------------- .../org/apache/nifi/toolkit/encryptconfig/NiFiRegistryMode.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/08c39106/nifi-toolkit/nifi-toolkit-encrypt-config/src/main/groovy/org/apache/nifi/toolkit/encryptconfig/NiFiRegistryMode.groovy ---------------------------------------------------------------------- diff --git a/nifi-toolkit/nifi-toolkit-encrypt-config/src/main/groovy/org/apache/nifi/toolkit/encryptconfig/NiFiRegistryMode.groovy b/nifi-toolkit/nifi-toolkit-encrypt-config/src/main/groovy/org/apache/nifi/toolkit/encryptconfig/NiFiRegistryMode.groovy index 2034f00..4c5eac8 100644 --- a/nifi-toolkit/nifi-toolkit-encrypt-config/src/main/groovy/org/apache/nifi/toolkit/encryptconfig/NiFiRegistryMode.groovy +++ b/nifi-toolkit/nifi-toolkit-encrypt-config/src/main/groovy/org/apache/nifi/toolkit/encryptconfig/NiFiRegistryMode.groovy @@ -371,7 +371,7 @@ class NiFiRegistryMode implements ToolMode { private String determineDecryptionKey() { if (rawOptions.oldPassword) { logger.debug("Attempting to generate decryption key (for migration) from old password.") - encryptionKey = ToolUtilities.determineKey(TextDevices.defaultTextDevice(), null, rawOptions.oldPassword, true) + decryptionKey = ToolUtilities.determineKey(TextDevices.defaultTextDevice(), null, rawOptions.oldPassword, true) } else if (rawOptions.oldKey) { decryptionKey = rawOptions.oldKey }
