Skip to content

Commit 600332c

Browse files
committed
Minor fixes
1 parent 5b6aa65 commit 600332c

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ public void adjustTLSContext(ChangeCipherSpecMessage message) {
5757
public void adjustTlsContextAfterSerialize(ChangeCipherSpecMessage message) {
5858

5959
if (tlsContext.getTalkingConnectionEndType() == tlsContext.getChooser().getConnectionEndType()) {
60-
tlsContext.setWriteSequenceNumber(0);
6160
if (!tlsContext.getChooser().getSelectedProtocolVersion().isTLS13()) {
61+
tlsContext.setWriteSequenceNumber(0);
6262
tlsContext.getRecordLayer().updateEncryptionCipher();
6363
tlsContext.getRecordLayer().updateCompressor();
6464
tlsContext.increaseDtlsWriteEpoch();

TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/protocol/serializer/extension/SessionTicketTLSExtensionSerializer.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ public SessionTicketTLSExtensionSerializer(SessionTicketTLSExtensionMessage mess
3838
@Override
3939
public byte[] serializeExtensionContent() {
4040
appendBytes(message.getTicket().getValue());
41-
LOGGER
42-
.debug("Serialized PaddingExtension with SessionTicket of length " + message.getTicket().getValue().length);
41+
LOGGER.debug("Serialized SessionTicketTLSExtension with SessionTicket of length "
42+
+ message.getTicket().getValue().length);
4343
return getAlreadySerialized();
4444
}
4545

TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/workflow/ParallelExecutor.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -121,13 +121,14 @@ public void shutdown() {
121121
}
122122

123123
/**
124-
* Creates a new thread monitoring the executorService. If the last {@link TlsTask} was finished more than
124+
* Creates a new thread monitoring the executorService. If the time since the last {@link TlsTask} was finished
125+
* exceeds the timeout, the function assiged to {@link ParallelExecutor#timeoutAction } is executed. The
126+
* {@link ParallelExecutor#timeoutAction } function can, for example, try to restart the client/server, so that the
127+
* remaining {@link TlsTask}s can be finished.
125128
*
126129
* @param timeout
127-
* milliseconds ago, the function assiged to {@link ParallelExecutor#timeoutAction } is executed.
130+
* The timeout in milliseconds
128131
*
129-
* The {@link ParallelExecutor#timeoutAction } function can, for example, try to restart the client/server, so that
130-
* the remaining {@link TlsTask}s can be finished.
131132
*/
132133
public void armTimeoutAction(int timeout) {
133134
if (timeoutAction == null) {

0 commit comments

Comments
 (0)