Skip to content

Commit dccbc81

Browse files
authored
Merge pull request #609 from RUB-NDS/sigHashAlgoSetter
readded signature and hash algorithm setter
2 parents 5feef3c + ea03c3d commit dccbc81

File tree

1 file changed

+19
-24
lines changed
  • TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/config

1 file changed

+19
-24
lines changed

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

Lines changed: 19 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,7 @@ public static Config createEmptyConfig() {
314314
/**
315315
* Default ALPN announced protocols
316316
*/
317-
private String[] alpnAnnouncedProtocols = new String[] { "h2" };
317+
private String[] alpnAnnouncedProtocols = new String[]{"h2"};
318318

319319
/**
320320
* Default SRP Identifier
@@ -763,7 +763,7 @@ public static Config createEmptyConfig() {
763763
* How much padding bytes should be send by default
764764
*/
765765
@XmlJavaTypeAdapter(ByteArrayAdapter.class)
766-
private byte[] defaultPaddingExtensionBytes = new byte[] { 0, 0, 0, 0, 0, 0 };
766+
private byte[] defaultPaddingExtensionBytes = new byte[]{0, 0, 0, 0, 0, 0};
767767

768768
/**
769769
* How long should our DTLSCookies be by default
@@ -2274,6 +2274,11 @@ public final void setSupportedSignatureAndHashAlgorithms(
22742274
Arrays.asList(supportedSignatureAndHashAlgorithms));
22752275
}
22762276

2277+
public final void setSupportedSignatureAndHashAlgorithms(
2278+
List<SignatureAndHashAlgorithm> supportedSignatureAndHashAlgorithms) {
2279+
this.defaultClientSupportedSignatureAndHashAlgorithms = supportedSignatureAndHashAlgorithms;
2280+
}
2281+
22772282
public List<ProtocolVersion> getSupportedVersions() {
22782283
return supportedVersions;
22792284
}
@@ -2881,8 +2886,7 @@ public byte[] getEarlyData() {
28812886
}
28822887

28832888
/**
2884-
* @param earlyData
2885-
* the earlyData to set
2889+
* @param earlyData the earlyData to set
28862890
*/
28872891
public void setEarlyData(byte[] earlyData) {
28882892
this.earlyData = earlyData;
@@ -2896,8 +2900,7 @@ public List<PskSet> getDefaultPskSets() {
28962900
}
28972901

28982902
/**
2899-
* @param defaultPskSets
2900-
* the defaultPskSets to set
2903+
* @param defaultPskSets the defaultPskSets to set
29012904
*/
29022905
public void setDefaultPskSets(List<PskSet> defaultPskSets) {
29032906
this.defaultPskSets = defaultPskSets;
@@ -2911,8 +2914,7 @@ public byte[] getPsk() {
29112914
}
29122915

29132916
/**
2914-
* @param psk
2915-
* the psk to set
2917+
* @param psk the psk to set
29162918
*/
29172919
public void setPsk(byte[] psk) {
29182920
this.psk = psk;
@@ -2926,8 +2928,7 @@ public byte[] getDefaultSessionTicketAgeAdd() {
29262928
}
29272929

29282930
/**
2929-
* @param defaultSessionTicketAgeAdd
2930-
* the defaultSessionTicketAgeAdd to set
2931+
* @param defaultSessionTicketAgeAdd the defaultSessionTicketAgeAdd to set
29312932
*/
29322933
public void setDefaultSessionTicketAgeAdd(byte[] defaultSessionTicketAgeAdd) {
29332934
this.defaultSessionTicketAgeAdd = defaultSessionTicketAgeAdd;
@@ -2941,8 +2942,7 @@ public byte[] getDefaultSessionTicketNonce() {
29412942
}
29422943

29432944
/**
2944-
* @param defaultSessionTicketNonce
2945-
* the defaultSessionTicketNonce to set
2945+
* @param defaultSessionTicketNonce the defaultSessionTicketNonce to set
29462946
*/
29472947
public void setDefaultSessionTicketNonce(byte[] defaultSessionTicketNonce) {
29482948
this.defaultSessionTicketNonce = defaultSessionTicketNonce;
@@ -2956,8 +2956,8 @@ public byte[] getDefaultSessionTicketIdentity() {
29562956
}
29572957

29582958
/**
2959-
* @param defaultSessionTicketIdentity
2960-
* the defaultSessionTicketIdentity to set
2959+
* @param defaultSessionTicketIdentity the defaultSessionTicketIdentity to
2960+
* set
29612961
*/
29622962
public void setDefaultSessionTicketIdentity(byte[] defaultSessionTicketIdentity) {
29632963
this.defaultSessionTicketIdentity = defaultSessionTicketIdentity;
@@ -2971,8 +2971,7 @@ public byte[] getClientEarlyTrafficSecret() {
29712971
}
29722972

29732973
/**
2974-
* @param clientEarlyTrafficSecret
2975-
* the clientEarlyTrafficSecret to set
2974+
* @param clientEarlyTrafficSecret the clientEarlyTrafficSecret to set
29762975
*/
29772976
public void setClientEarlyTrafficSecret(byte[] clientEarlyTrafficSecret) {
29782977
this.clientEarlyTrafficSecret = clientEarlyTrafficSecret;
@@ -2986,8 +2985,7 @@ public byte[] getEarlySecret() {
29862985
}
29872986

29882987
/**
2989-
* @param earlySecret
2990-
* the earlySecret to set
2988+
* @param earlySecret the earlySecret to set
29912989
*/
29922990
public void setEarlySecret(byte[] earlySecret) {
29932991
this.earlySecret = earlySecret;
@@ -3001,8 +2999,7 @@ public CipherSuite getEarlyDataCipherSuite() {
30012999
}
30023000

30033001
/**
3004-
* @param earlyDataCipherSuite
3005-
* the earlyDataCipherSuite to set
3002+
* @param earlyDataCipherSuite the earlyDataCipherSuite to set
30063003
*/
30073004
public void setEarlyDataCipherSuite(CipherSuite earlyDataCipherSuite) {
30083005
this.earlyDataCipherSuite = earlyDataCipherSuite;
@@ -3016,8 +3013,7 @@ public byte[] getEarlyDataPsk() {
30163013
}
30173014

30183015
/**
3019-
* @param earlyDataPsk
3020-
* the earlyDataPsk to set
3016+
* @param earlyDataPsk the earlyDataPsk to set
30213017
*/
30223018
public void setEarlyDataPsk(byte[] earlyDataPsk) {
30233019
this.earlyDataPsk = earlyDataPsk;
@@ -3031,8 +3027,7 @@ public Boolean isUsePsk() {
30313027
}
30323028

30333029
/**
3034-
* @param usePsk
3035-
* the usePsk to set
3030+
* @param usePsk the usePsk to set
30363031
*/
30373032
public void setUsePsk(Boolean usePsk) {
30383033
this.usePsk = usePsk;

0 commit comments

Comments
 (0)