Dispatcher cares only about its own required attributes,

SecDispatcher handles the 'n' and 'v'.

Author: cstamas

src/main/java/org/codehaus/plexus/components/secdispatcher/internal/DefaultSecDispatcher.java

@@ -21,7 +21,6 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 import java.util.Set;
 import java.util.StringTokenizer;
 import java.util.stream.Collectors;
@@ -120,11 +119,11 @@ public String encrypt(String str, Map<String, String> attr) throws SecDispatcher
             Dispatcher dispatcher = dispatchers.get(name);
             if (dispatcher == null) throw new SecDispatcherException("no dispatcher for name " + name);
             Dispatcher.EncryptPayload payload = dispatcher.encrypt(str, attr, prepareDispatcherConfig(name));
-            if (!Objects.equals(payload.getAttributes().get(DISPATCHER_NAME_ATTR), name)) {
-                throw new SecDispatcherException("Dispatcher " + name + " bug: mismatched name attribute");
-            }
+            HashMap<String, String> resultAttributes = new HashMap<>(payload.getAttributes());
+            resultAttributes.put(SecDispatcher.DISPATCHER_NAME_ATTR, name);
+            resultAttributes.put(SecDispatcher.DISPATCHER_VERSION_ATTR, SecUtil.specVersion());
             String res = ATTR_START
-                    + payload.getAttributes().entrySet().stream()
+                    + resultAttributes.entrySet().stream()
                             .map(e -> e.getKey() + "=" + e.getValue())
                             .collect(Collectors.joining(","))
                     + ATTR_STOP;

src/main/java/org/codehaus/plexus/components/secdispatcher/internal/dispatchers/MasterDispatcher.java

@@ -31,7 +31,6 @@
 import org.codehaus.plexus.components.secdispatcher.MasterSourceMeta;
 import org.codehaus.plexus.components.secdispatcher.SecDispatcher;
 import org.codehaus.plexus.components.secdispatcher.SecDispatcherException;
-import org.codehaus.plexus.components.secdispatcher.internal.SecUtil;
 
 /**
  * This dispatcher is logically equivalent (but much more secure) that Maven3 "master password" encryption.
@@ -106,8 +105,6 @@ public EncryptPayload encrypt(String str, Map<String, String> attributes, Map<St
             String masterCipher = getMasterCipher(config, true);
             String encrypted = cipher.encrypt(masterCipher, str, getMasterPassword(config));
             HashMap<String, String> attr = new HashMap<>(attributes);
-            attr.put(SecDispatcher.DISPATCHER_NAME_ATTR, NAME);
-            attr.put(SecDispatcher.DISPATCHER_VERSION_ATTR, SecUtil.specVersion());
             attr.put(MASTER_CIPHER_ATTR, masterCipher);
             return new EncryptPayload(attr, encrypted);
         } catch (PlexusCipherException e) {