From ad1ccfd5e713c61e17f8b730765de76078e4054a Mon Sep 17 00:00:00 2001
From: Thorben Groos <thorben.groos@student.uni-siegen.de>
Date: Fri, 30 Oct 2020 14:39:51 +0100
Subject: [PATCH] Named SHA1 to SHA-1 and adjusted help IDs to new Name

---
 .../nl/de/contexts.xml                                        | 4 ++--
 .../nl/en/contexts.xml                                        | 4 ++--
 org.jcryptool.crypto.flexiprovider.integrator/plugin.xml      | 4 ++--
 .../flexiprovider/integrator/prng/sha1/Sha1Handler.java       | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/org.jcryptool.crypto.flexiprovider.integrator/nl/de/contexts.xml b/org.jcryptool.crypto.flexiprovider.integrator/nl/de/contexts.xml
index 8163653a62..cddeb06a15 100644
--- a/org.jcryptool.crypto.flexiprovider.integrator/nl/de/contexts.xml
+++ b/org.jcryptool.crypto.flexiprovider.integrator/nl/de/contexts.xml
@@ -24,7 +24,7 @@
       <description>Dies ist die FlexiProvider Implementierung des HMacMD5 Hashes. In der Algorithmen-Perspektive stehen Ihnen noch weitere Einstellungsmöglichkeiten für diesen Algorithmus zur Verfügung.</description>
   		<topic href="PLUGINS_ROOT/org.jcryptool.core.help/$nl$/help/users/general/perspective_algorithm.html" label="Algorithmen-Perspektive"/>
    </context>
-   <context id="SHA1Wizard" title="SHA-1 Zufallszahlengenerators">
+   <context id="SHA-1Wizard" title="SHA-1 Zufallszahlengenerators">
       <description>Dies ist die FlexiProvider Implementierung des SHA-1 Zufallszahlengenerators. In der Algorithmen-Perspektive stehen Ihnen noch weitere Einstellungsmöglichkeiten für diesen Algorithmus zur Verfügung.</description>
   		<topic href="PLUGINS_ROOT/org.jcryptool.core.help/$nl$/help/users/general/perspective_algorithm.html" label="Algorithmen-Perspektive"/>
    </context>
@@ -36,7 +36,7 @@
       <description>Dies ist die FlexiProvider Implementierung des MD5 Hashes. In der Algorithmen-Perspektive stehen Ihnen noch weitere Einstellungsmöglichkeiten für diesen Algorithmus zur Verfügung.</description>
   		<topic href="PLUGINS_ROOT/org.jcryptool.core.help/$nl$/help/users/general/perspective_algorithm.html" label="Algorithmen-Perspektive"/>
    </context>
-   <context id="SHAWizard" title="SHA-256 Hash">
+   <context id="SHA-256Wizard" title="SHA-256 Hash">
       <description>Dies ist die FlexiProvider Implementierung des SHA-256 Hashes. In der Algorithmen-Perspektive stehen Ihnen noch weitere Einstellungsmöglichkeiten für diesen Algorithmus zur Verfügung.</description>
   		<topic href="PLUGINS_ROOT/org.jcryptool.core.help/$nl$/help/users/general/perspective_algorithm.html" label="Algorithmen-Perspektive"/>
    </context>
diff --git a/org.jcryptool.crypto.flexiprovider.integrator/nl/en/contexts.xml b/org.jcryptool.crypto.flexiprovider.integrator/nl/en/contexts.xml
index 2035f3f674..aed95700af 100644
--- a/org.jcryptool.crypto.flexiprovider.integrator/nl/en/contexts.xml
+++ b/org.jcryptool.crypto.flexiprovider.integrator/nl/en/contexts.xml
@@ -24,7 +24,7 @@
       <description>This is the FlexiProvider implementation of the HMacMD5 message digest. The Algorithm Perspective does provide even more configuration possibilities for this algorithm.</description>
   		<topic href="PLUGINS_ROOT/org.jcryptool.core.help/$nl$/help/users/general/perspective_algorithm.html" label="Algorithm Perspective"/>
    </context>
-   <context id="SHA1Wizard" title="SHA-1 random number generator">
+   <context id="SHA-1Wizard" title="SHA-1 random number generator">
       <description>This is the FlexiProvider implementation of the SHA-1 random number generator. The Algorithm Perspective does provide even more configuration possibilities for this algorithm.</description>
   		<topic href="PLUGINS_ROOT/org.jcryptool.core.help/$nl$/help/users/general/perspective_algorithm.html" label="Algorithm Perspective"/>
    </context>
@@ -36,7 +36,7 @@
       <description>This is the FlexiProvider implementation of the MD5 hash. The Algorithm Perspective does provide even more configuration possibilities for this algorithm.</description>
   		<topic href="PLUGINS_ROOT/org.jcryptool.core.help/$nl$/help/users/general/perspective_algorithm.html" label="Algorithm Perspective"/>
    </context>
-   <context id="SHAWizard" title="SHA-256 hash">
+   <context id="SHA-256Wizard" title="SHA-256 hash">
       <description>This is the FlexiProvider implementation of the SHA-256 hash. The Algorithm Perspective does provide even more configuration possibilities for this algorithm.</description>
   		<topic href="PLUGINS_ROOT/org.jcryptool.core.help/$nl$/help/users/general/perspective_algorithm.html" label="Algorithm Perspective"/>
    </context>
diff --git a/org.jcryptool.crypto.flexiprovider.integrator/plugin.xml b/org.jcryptool.crypto.flexiprovider.integrator/plugin.xml
index e61fc8d46a..bc7bac622e 100644
--- a/org.jcryptool.crypto.flexiprovider.integrator/plugin.xml
+++ b/org.jcryptool.crypto.flexiprovider.integrator/plugin.xml
@@ -44,7 +44,7 @@
          point="org.jcryptool.core.operations.algorithms_cmd">
       <algorithm_cmd
             class="org.jcryptool.crypto.flexiprovider.integrator.messagedigest.sha.Sha"
-            contextHelpId="org.jcryptool.crypto.flexiprovider.integrator.SHAWizard"
+            contextHelpId="org.jcryptool.crypto.flexiprovider.integrator.SHA-256Wizard"
             handlerClass="org.jcryptool.crypto.flexiprovider.integrator.messagedigest.sha.ShaHandler"
             id="org.jcryptool.crypto.flexiprovider.integrator.messagedigest.sha"
             isFlexiProviderAlgorithm="true"
@@ -122,7 +122,7 @@
          point="org.jcryptool.core.operations.algorithms_cmd">
       <algorithm_cmd
             class="org.jcryptool.crypto.flexiprovider.integrator.prng.sha1.Sha1"
-            contextHelpId="org.jcryptool.crypto.flexiprovider.integrator.SHA1Wizard"
+            contextHelpId="org.jcryptool.crypto.flexiprovider.integrator.SHA-1Wizard"
             handlerClass="org.jcryptool.crypto.flexiprovider.integrator.prng.sha1.Sha1Handler"
             id="org.jcryptool.crypto.flexiprovider.integrator.prng.sha1"
             isFlexiProviderAlgorithm="true"
diff --git a/org.jcryptool.crypto.flexiprovider.integrator/src/org/jcryptool/crypto/flexiprovider/integrator/prng/sha1/Sha1Handler.java b/org.jcryptool.crypto.flexiprovider.integrator/src/org/jcryptool/crypto/flexiprovider/integrator/prng/sha1/Sha1Handler.java
index 77a9a4246c..01415f1d86 100644
--- a/org.jcryptool.crypto.flexiprovider.integrator/src/org/jcryptool/crypto/flexiprovider/integrator/prng/sha1/Sha1Handler.java
+++ b/org.jcryptool.crypto.flexiprovider.integrator/src/org/jcryptool/crypto/flexiprovider/integrator/prng/sha1/Sha1Handler.java
@@ -21,7 +21,7 @@ public class Sha1Handler extends IntegratorHandler {
 	@Override
 	protected String getFlexiProviderAlgorithmName() {return "SHA1PRNG";} //$NON-NLS-1$
 	@Override
-	protected String getReadableAlgorithmName() {return "SHA1";} //$NON-NLS-1$
+	protected String getReadableAlgorithmName() {return "SHA-1";} //$NON-NLS-1$
 	@Override
 	protected String getShowKey() {return null;}
 }
\ No newline at end of file