Skip to content

Commit 54d7ec1

Browse files
Merge branch 'master' of https://github.com/RUB-NDS/TLS-Attacker
2 parents 9817942 + bba0802 commit 54d7ec1

File tree

2 files changed

+15
-18
lines changed

2 files changed

+15
-18
lines changed

TLS/src/main/java/de/rub/nds/tlsattacker/tls/protocol/handshake/DHEServerKeyExchangeHandler.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
import de.rub.nds.tlsattacker.tls.constants.SignatureAlgorithm;
1717
import de.rub.nds.tlsattacker.tls.constants.SignatureAndHashAlgorithm;
1818
import de.rub.nds.tlsattacker.tls.exceptions.ConfigurationException;
19-
;
2019
import de.rub.nds.tlsattacker.tls.workflow.TlsContext;
2120
import de.rub.nds.tlsattacker.util.ArrayConverter;
2221
import java.io.ByteArrayInputStream;

pom.xml

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -151,23 +151,21 @@
151151
</goals>
152152
</execution>
153153
</executions>
154-
</plugin>
155-
</plugins>
156-
</pluginManagement>
157-
<plugins>
158-
<plugin>
159-
<groupId>com.googlecode.maven-java-formatter-plugin</groupId>
160-
<artifactId>maven-java-formatter-plugin</artifactId>
161-
<configuration>
162-
<configFile>${main.basedir}/maven-eclipse-codestyle.xml</configFile>
163-
<lineEnding>LF</lineEnding>
164-
</configuration>
165-
</plugin>
166-
<plugin>
167-
<artifactId>maven-project-info-reports-plugin</artifactId>
168-
<version>2.7</version>
169-
</plugin>
170-
</plugins>
154+
</plugin>
155+
<plugin>
156+
<groupId>com.googlecode.maven-java-formatter-plugin</groupId>
157+
<artifactId>maven-java-formatter-plugin</artifactId>
158+
<configuration>
159+
<configFile>${main.basedir}/maven-eclipse-codestyle.xml</configFile>
160+
<lineEnding>LF</lineEnding>
161+
</configuration>
162+
</plugin>
163+
<plugin>
164+
<artifactId>maven-project-info-reports-plugin</artifactId>
165+
<version>2.7</version>
166+
</plugin>
167+
</plugins>
168+
</pluginManagement>
171169
</build>
172170

173171
<reporting>

0 commit comments

Comments
 (0)