Fixed failing tests

Author: ic0ns

TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/constants/AlgorithmResolver.java

@@ -160,7 +160,7 @@ public static KeyExchangeAlgorithm getKeyExchangeAlgorithm(CipherSuite cipherSui
         if (cipherSuite == CipherSuite.TLS_FALLBACK_SCSV
                 || cipherSuite == CipherSuite.TLS_EMPTY_RENEGOTIATION_INFO_SCSV
                 || cipherSuite == CipherSuite.TLS_UNKNOWN_CIPHER) {
-            throw new IllegalArgumentException("The CipherSuite:" + cipherSuite.name()
+            throw new UnsupportedOperationException("The CipherSuite:" + cipherSuite.name()
                     + " does not specify a KeyExchangeAlgorithm");
         }
         throw new UnsupportedOperationException("The key exchange algorithm in " + cipherSuite.toString()
@@ -253,7 +253,8 @@ public static CipherAlgorithm getCipher(CipherSuite cipherSuite) {
         if (cipherSuite == CipherSuite.TLS_FALLBACK_SCSV
                 || cipherSuite == CipherSuite.TLS_EMPTY_RENEGOTIATION_INFO_SCSV
                 || cipherSuite == CipherSuite.TLS_UNKNOWN_CIPHER) {
-            throw new IllegalArgumentException("The CipherSuite:" + cipherSuite.name() + " does not specify a Cipher");
+            throw new UnsupportedOperationException("The CipherSuite:" + cipherSuite.name()
+                    + " does not specify a Cipher");
         }
         throw new UnsupportedOperationException("The cipher algorithm in " + cipherSuite + " is not supported yet.");
     }
@@ -354,7 +355,7 @@ public static MacAlgorithm getMacAlgorithm(ProtocolVersion protocolVersion, Ciph
         if (cipherSuite == CipherSuite.TLS_FALLBACK_SCSV
                 || cipherSuite == CipherSuite.TLS_EMPTY_RENEGOTIATION_INFO_SCSV
                 || cipherSuite == CipherSuite.TLS_UNKNOWN_CIPHER) {
-            throw new IllegalArgumentException("The CipherSuite:" + cipherSuite.name()
+            throw new UnsupportedOperationException("The CipherSuite:" + cipherSuite.name()
                     + " does not specify a MAC-Algorithm");
         }
         if (result != null) {

TLS-Core/src/test/java/de/rub/nds/tlsattacker/core/constants/AlgorithmResolverTest.java

@@ -158,11 +158,11 @@ public void testAllCipherSuitesGetKeyExchange() {
         // Checks that we can retrieve all ciphersuites key exchange algorithms
         // and
         // that none throws an unsupported operation exception
-        // Only IllegalArgmumentExceptions are allowed here
+        // Only UnsupportedOperationException are allowed here
         for (CipherSuite suite : CipherSuite.values()) {
             try {
                 AlgorithmResolver.getKeyExchangeAlgorithm(suite);
-            } catch (IllegalArgumentException E) {
+            } catch (UnsupportedOperationException E) {
             }
         }
     }
@@ -212,7 +212,7 @@ public void testGetAllCipher() {
         for (CipherSuite suite : CipherSuite.values()) {
             try {
                 AlgorithmResolver.getCipher(suite);
-            } catch (IllegalArgumentException E) {
+            } catch (UnsupportedOperationException E) {
             }
         }
     }
@@ -239,7 +239,7 @@ public void testGetAllCipherTypes() {
         for (CipherSuite suite : CipherSuite.values()) {
             try {
                 AlgorithmResolver.getCipherType(suite);
-            } catch (IllegalArgumentException E) {
+            } catch (UnsupportedOperationException E) {
             }
         }
     }
@@ -306,7 +306,7 @@ public void getAllMacAlgorithms() {
             try {
                 AlgorithmResolver.getMacAlgorithm(ProtocolVersion.SSL3, suite);
                 AlgorithmResolver.getMacAlgorithm(ProtocolVersion.TLS12, suite);
-            } catch (IllegalArgumentException E) {
+            } catch (UnsupportedOperationException E) {
 
             }
         }