Skip to content

Commit 368fd8c

Browse files
authored
Merge branch 'master' into tls-attacker-5.1.6
2 parents 7540343 + 8bcc4aa commit 368fd8c

File tree

3 files changed

+9
-20
lines changed

3 files changed

+9
-20
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ jobs:
214214
- name: Setup Golang
215215
uses: actions/setup-go@v5
216216
with:
217-
go-version: '1.13.8'
217+
go-version: '1.22.2'
218218

219219
- name: Install DTLS-Fuzzer
220220
run: ./install.sh
@@ -239,7 +239,7 @@ jobs:
239239
- name: Setup Golang
240240
uses: actions/setup-go@v5
241241
with:
242-
go-version: '1.13.8'
242+
go-version: '1.22.2'
243243

244244
- name: Install DTLS-Fuzzer
245245
run: ./install.sh

pom.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
<maven.compiler.source>11</maven.compiler.source>
1010
<maven.compiler.target>11</maven.compiler.target>
1111

12-
<!-- Alphaberically sorted -->
13-
<error-prone.version>2.28.0</error-prone.version>
12+
<!-- Alphabetically sorted -->
13+
<error-prone.version>2.29.0</error-prone.version>
1414
<jakarta-xml.version>4.0.2</jakarta-xml.version>
1515
<jcommander.version>1.82</jcommander.version>
1616
<learnlib.version>0.17.0</learnlib.version>
@@ -104,7 +104,7 @@
104104
<dependency>
105105
<groupId>org.apache.commons</groupId>
106106
<artifactId>commons-lang3</artifactId>
107-
<version>3.14.0</version>
107+
<version>3.16.0</version>
108108
</dependency>
109109
<dependency>
110110
<groupId>org.apache.logging.log4j</groupId>
@@ -176,7 +176,7 @@
176176
<plugin>
177177
<groupId>org.apache.maven.plugins</groupId>
178178
<artifactId>maven-dependency-plugin</artifactId>
179-
<version>3.7.0</version>
179+
<version>3.7.1</version>
180180
<executions>
181181
<execution>
182182
<id>analyze-only</id>
@@ -253,7 +253,7 @@
253253
<plugin>
254254
<groupId>com.github.spotbugs</groupId>
255255
<artifactId>spotbugs-maven-plugin</artifactId>
256-
<version>4.8.5.0</version>
256+
<version>4.8.6.2</version>
257257
<configuration>
258258
<includeFilterFile>.spotbugs/include.xml</includeFilterFile>
259259
</configuration>
@@ -270,7 +270,7 @@
270270
<plugin>
271271
<groupId>org.apache.maven.plugins</groupId>
272272
<artifactId>maven-jar-plugin</artifactId>
273-
<version>3.4.1</version>
273+
<version>3.4.2</version>
274274
<configuration>
275275
<archive>
276276
<manifest>

setup_sut.sh

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -417,17 +417,6 @@ function install_sut_dep() {
417417
fi
418418

419419
install_dep "$jdk_name" "$jdk_url"
420-
elif [[ $sut == pion* ]]; then
421-
if [[ $sut == *usenix* ]]; then
422-
go get github.com/pion/dtls@$PIONDTLS_USENIX_REP_COMMIT
423-
else
424-
ver=$(get_ver "$sut")
425-
if [[ $sut == *piondtls-1* ]]; then
426-
go get github.com/pion/dtls@v"$ver"
427-
elif [[ $sut == *piondtls-2* ]]; then
428-
go get github.com/pion/dtls/v2@v"$ver"
429-
fi
430-
fi
431420
elif [[ $sut == gnutls* ]]; then
432421
install_dep $M4 $M4_ARCH_URL
433422
sudo apt-get install pkg-config
@@ -464,7 +453,7 @@ function make_sut() {
464453
( cd "$sut_dir" || exit ; JAVA_HOME=$MODULES_DIR/jdk-$ver mvn install assembly:single; cp target/jsse-dtls-clientserver.jar ../jsse-"$ver"-dtls-clientserver.jar)
465454
return 0
466455
elif [[ $sut == pion* ]]; then
467-
( cd "$sut_dir" || exit ; go build -o dtls-clientserver main/main.go )
456+
( cd "$sut_dir" || exit ; go mod tidy ; go build -o dtls-clientserver main/main.go )
468457
return 0
469458
elif [[ $sut == gnutls* ]]; then
470459
(

0 commit comments

Comments
 (0)