Skip to content

Commit d052c01

Browse files
authored
Merge pull request #663 from RUB-NDS/qfix
Fixes build issues due to implicit merge
2 parents faabbf7 + 614d9dc commit d052c01

File tree

4 files changed

+8
-6
lines changed

4 files changed

+8
-6
lines changed

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -262,6 +262,7 @@ The following people have contributed code to the TLS-Attacker project:
262262
- Paul Fiterau Brostean: DTLS reintegration
263263
- Malte Poll: High precision timing measurements
264264
- Mario Korth: Client Authentication Analysis
265+
- Nils Hanke: OCSP
265266
Additionally we would like to thank all the other people who have contributed code to the project.
266267

267268
Further contributions and pull requests are welcome.

TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/protocol/handler/CertificateStatusHandler.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ public CertificateStatusHandler(TlsContext tlsContext) {
2525

2626
@Override
2727
public CertificateStatusParser getParser(byte[] message, int pointer) {
28-
return new CertificateStatusParser(pointer, message, tlsContext.getChooser().getLastRecordVersion());
28+
return new CertificateStatusParser(pointer, message, tlsContext.getChooser().getLastRecordVersion(),
29+
tlsContext.getConfig());
2930
}
3031

3132
@Override

TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/protocol/parser/CertificateStatusParser.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@
99
*/
1010
package de.rub.nds.tlsattacker.core.protocol.parser;
1111

12-
import de.rub.nds.modifiablevariable.util.ArrayConverter;
13-
import de.rub.nds.tlsattacker.core.constants.HandshakeByteLength;
12+
import de.rub.nds.tlsattacker.core.config.Config;
1413
import de.rub.nds.tlsattacker.core.constants.HandshakeMessageType;
1514
import de.rub.nds.tlsattacker.core.constants.ProtocolVersion;
1615
import de.rub.nds.tlsattacker.core.protocol.message.CertificateStatusMessage;
@@ -22,8 +21,8 @@ public class CertificateStatusParser extends HandshakeMessageParser<CertificateS
2221

2322
private static final Logger LOGGER = LogManager.getLogger();
2423

25-
public CertificateStatusParser(int pointer, byte[] array, ProtocolVersion version) {
26-
super(pointer, array, HandshakeMessageType.CERTIFICATE_STATUS, version);
24+
public CertificateStatusParser(int pointer, byte[] array, ProtocolVersion version, Config config) {
25+
super(pointer, array, HandshakeMessageType.CERTIFICATE_STATUS, version, config);
2726
}
2827

2928
@Override

TLS-Core/src/test/java/de/rub/nds/tlsattacker/core/protocol/parser/CertificateStatusMessageParserTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
package de.rub.nds.tlsattacker.core.protocol.parser;
1111

1212
import de.rub.nds.modifiablevariable.util.ArrayConverter;
13+
import de.rub.nds.tlsattacker.core.config.Config;
1314
import de.rub.nds.tlsattacker.core.constants.HandshakeMessageType;
1415
import de.rub.nds.tlsattacker.core.constants.ProtocolVersion;
1516
import de.rub.nds.tlsattacker.core.protocol.message.CertificateStatusMessage;
@@ -61,7 +62,7 @@ public CertificateStatusMessageParserTest(byte[] message, HandshakeMessageType t
6162

6263
@Test
6364
public void testParse() {
64-
CertificateStatusParser parser = new CertificateStatusParser(0, message, version);
65+
CertificateStatusParser parser = new CertificateStatusParser(0, message, version, Config.createConfig());
6566
CertificateStatusMessage msg = parser.parse();
6667
assertEquals((int) msg.getLength().getValue(), length);
6768
assertEquals((byte) msg.getType().getValue(), type.getValue());

0 commit comments

Comments
 (0)