Merge branch 'master' of github.com:RUB-NDS/WS-Attacker-Development

Author: CheariX

plugins/XML_Encryption_Attack/src/main/java/wsattacker/plugin/xmlencryptionattack/gui/OptionPayloadEncGUI.form

@@ -450,7 +450,7 @@
         </Property>
         <Property name="text" type="java.lang.String" value="&lt;"/>
         <Property name="cursor" type="java.awt.Cursor" editor="org.netbeans.modules.form.editors2.CursorEditor">
-          <Color id="Standardcursor"/>
+          <Color id="Default Cursor"/>
         </Property>
         <Property name="horizontalAlignment" type="int" value="10"/>
         <Property name="horizontalTextPosition" type="int" value="10"/>
@@ -466,7 +466,7 @@
         </Property>
         <Property name="text" type="java.lang.String" value="&gt;"/>
         <Property name="cursor" type="java.awt.Cursor" editor="org.netbeans.modules.form.editors2.CursorEditor">
-          <Color id="Standardcursor"/>
+          <Color id="Default Cursor"/>
         </Property>
         <Property name="horizontalAlignment" type="int" value="10"/>
         <Property name="horizontalTextPosition" type="int" value="10"/>

plugins/XML_Encryption_Attack/src/main/java/wsattacker/plugin/xmlencryptionattack/gui/OptionPayloadEncGUI.java

@@ -660,7 +660,7 @@ public void actionPerformed( java.awt.event.ActionEvent evt )
 
     private void tbCmpThresFocusLost( java.awt.event.FocusEvent evt )
     {// GEN-FIRST:event_tbCmpThresFocusLost
-        double dValue = 1.0;
+        double dValue;
         try
         {
             dValue = Double.parseDouble( tbCmpThres.getText() );
@@ -684,7 +684,7 @@ private void tbCmpThresFocusLost( java.awt.event.FocusEvent evt )
 
     private void tbThresHoldWrapFocusLost( java.awt.event.FocusEvent evt )
     {// GEN-FIRST:event_tbThresHoldWrapFocusLost
-        double dValue = 1.0;
+        double dValue;
         try
         {
             dValue = Double.parseDouble( tbThresHoldWrap.getText() );

plugins/XML_Encryption_Attack/src/main/java/wsattacker/plugin/xmlencryptionattack/option/OptionManagerEncryption.java

@@ -143,8 +143,8 @@ public void initAttackCfg()
         m_AttackCfg.setSimStringStrategyType( SimStringStrategy.DICE_COEFF );
         m_AttackCfg.setChosenAttackPayload( null );
         m_AttackCfg.setChosenWrapPayload( null );
-        m_AttackCfg.setStringCmpThresHold( 1.0 );
-        m_AttackCfg.setStringCmpWrappThreshold( 1.0 );
+        m_AttackCfg.setStringCmpThresHold( AttackConfig.DEFAULT_STRING_CMP_THRESHOLD );
+        m_AttackCfg.setStringCmpWrappThreshold( AttackConfig.DEFAULT_STRING_CMP_WRAP_ERROR_THRESHOLD );
         m_AttackCfg.getPKCS1AttackCfg().setServerRSAPubKey( null );
         m_AttackCfg.getPKCS1AttackCfg().setPKCS1Strategy( CBC_WEAK );