Merge master into isRequiredFix

Author: ic0ns

TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/config/Config.java

@@ -315,7 +315,7 @@ public static Config createEmptyConfig() {
     /**
      * Default ALPN announced protocols
      */
-    private String[] alpnAnnouncedProtocols = new String[] { "h2" };
+    private String[] alpnAnnouncedProtocols = new String[]{"h2"};
 
     /**
      * Default SRP Identifier
@@ -764,7 +764,7 @@ public static Config createEmptyConfig() {
      * How much padding bytes should be send by default
      */
     @XmlJavaTypeAdapter(ByteArrayAdapter.class)
-    private byte[] defaultPaddingExtensionBytes = new byte[] { 0, 0, 0, 0, 0, 0 };
+    private byte[] defaultPaddingExtensionBytes = new byte[]{0, 0, 0, 0, 0, 0};
 
     /**
      * How long should our DTLSCookies be by default
@@ -2275,6 +2275,11 @@ public final void setSupportedSignatureAndHashAlgorithms(
                 Arrays.asList(supportedSignatureAndHashAlgorithms));
     }
 
+    public final void setSupportedSignatureAndHashAlgorithms(
+            List<SignatureAndHashAlgorithm> supportedSignatureAndHashAlgorithms) {
+        this.defaultClientSupportedSignatureAndHashAlgorithms = supportedSignatureAndHashAlgorithms;
+    }
+
     public List<ProtocolVersion> getSupportedVersions() {
         return supportedVersions;
     }
@@ -2882,8 +2887,7 @@ public byte[] getEarlyData() {
     }
 
     /**
-     * @param earlyData
-     *            the earlyData to set
+     * @param earlyData the earlyData to set
      */
     public void setEarlyData(byte[] earlyData) {
         this.earlyData = earlyData;
@@ -2897,8 +2901,7 @@ public List<PskSet> getDefaultPskSets() {
     }
 
     /**
-     * @param defaultPskSets
-     *            the defaultPskSets to set
+     * @param defaultPskSets the defaultPskSets to set
      */
     public void setDefaultPskSets(List<PskSet> defaultPskSets) {
         this.defaultPskSets = defaultPskSets;
@@ -2912,8 +2915,7 @@ public byte[] getPsk() {
     }
 
     /**
-     * @param psk
-     *            the psk to set
+     * @param psk the psk to set
      */
     public void setPsk(byte[] psk) {
         this.psk = psk;
@@ -2927,8 +2929,7 @@ public byte[] getDefaultSessionTicketAgeAdd() {
     }
 
     /**
-     * @param defaultSessionTicketAgeAdd
-     *            the defaultSessionTicketAgeAdd to set
+     * @param defaultSessionTicketAgeAdd the defaultSessionTicketAgeAdd to set
      */
     public void setDefaultSessionTicketAgeAdd(byte[] defaultSessionTicketAgeAdd) {
         this.defaultSessionTicketAgeAdd = defaultSessionTicketAgeAdd;
@@ -2942,8 +2943,7 @@ public byte[] getDefaultSessionTicketNonce() {
     }
 
     /**
-     * @param defaultSessionTicketNonce
-     *            the defaultSessionTicketNonce to set
+     * @param defaultSessionTicketNonce the defaultSessionTicketNonce to set
      */
     public void setDefaultSessionTicketNonce(byte[] defaultSessionTicketNonce) {
         this.defaultSessionTicketNonce = defaultSessionTicketNonce;
@@ -2957,8 +2957,8 @@ public byte[] getDefaultSessionTicketIdentity() {
     }
 
     /**
-     * @param defaultSessionTicketIdentity
-     *            the defaultSessionTicketIdentity to set
+     * @param defaultSessionTicketIdentity the defaultSessionTicketIdentity to
+     * set
      */
     public void setDefaultSessionTicketIdentity(byte[] defaultSessionTicketIdentity) {
         this.defaultSessionTicketIdentity = defaultSessionTicketIdentity;
@@ -2972,8 +2972,7 @@ public byte[] getClientEarlyTrafficSecret() {
     }
 
     /**
-     * @param clientEarlyTrafficSecret
-     *            the clientEarlyTrafficSecret to set
+     * @param clientEarlyTrafficSecret the clientEarlyTrafficSecret to set
      */
     public void setClientEarlyTrafficSecret(byte[] clientEarlyTrafficSecret) {
         this.clientEarlyTrafficSecret = clientEarlyTrafficSecret;
@@ -2987,8 +2986,7 @@ public byte[] getEarlySecret() {
     }
 
     /**
-     * @param earlySecret
-     *            the earlySecret to set
+     * @param earlySecret the earlySecret to set
      */
     public void setEarlySecret(byte[] earlySecret) {
         this.earlySecret = earlySecret;
@@ -3002,8 +3000,7 @@ public CipherSuite getEarlyDataCipherSuite() {
     }
 
     /**
-     * @param earlyDataCipherSuite
-     *            the earlyDataCipherSuite to set
+     * @param earlyDataCipherSuite the earlyDataCipherSuite to set
      */
     public void setEarlyDataCipherSuite(CipherSuite earlyDataCipherSuite) {
         this.earlyDataCipherSuite = earlyDataCipherSuite;
@@ -3017,8 +3014,7 @@ public byte[] getEarlyDataPsk() {
     }
 
     /**
-     * @param earlyDataPsk
-     *            the earlyDataPsk to set
+     * @param earlyDataPsk the earlyDataPsk to set
      */
     public void setEarlyDataPsk(byte[] earlyDataPsk) {
         this.earlyDataPsk = earlyDataPsk;
@@ -3032,8 +3028,7 @@ public Boolean isUsePsk() {
     }
 
     /**
-     * @param usePsk
-     *            the usePsk to set
+     * @param usePsk the usePsk to set
      */
     public void setUsePsk(Boolean usePsk) {
         this.usePsk = usePsk;