diff --git a/.clusterfuzzlite/Dockerfile b/.clusterfuzzlite/Dockerfile index d9fedb9a557..d27db151840 100644 --- a/.clusterfuzzlite/Dockerfile +++ b/.clusterfuzzlite/Dockerfile @@ -3,7 +3,7 @@ FROM gcr.io/oss-fuzz-base/base-builder-go:v1 ARG TARGETPLATFORM RUN echo "TARGETPLATFORM: ${TARGETPLATFORM}" -ENV GOVERSION=1.22.0 +ENV GOVERSION=1.21.5 RUN platform=$(echo ${TARGETPLATFORM} | tr '/' '-') && \ filename="go${GOVERSION}.${platform}.tar.gz" && \ diff --git a/internal/qtls/client_session_cache.go b/internal/qtls/client_session_cache.go index 4acac9e2e1d..a45edd378c8 100644 --- a/internal/qtls/client_session_cache.go +++ b/internal/qtls/client_session_cache.go @@ -1,3 +1,5 @@ +//go:build go1.21 + package qtls import ( diff --git a/oss-fuzz.sh b/oss-fuzz.sh index 22a577fe16e..f72fb1b03f5 100644 --- a/oss-fuzz.sh +++ b/oss-fuzz.sh @@ -3,12 +3,12 @@ # Install Go manually, since oss-fuzz ships with an outdated Go version. # See https://github.com/google/oss-fuzz/pull/10643. export CXX="${CXX} -lresolv" # required by Go 1.20 -wget https://go.dev/dl/go1.22.0.linux-amd64.tar.gz \ +wget https://go.dev/dl/go1.21.5.linux-amd64.tar.gz \ && mkdir temp-go \ && rm -rf /root/.go/* \ - && tar -C temp-go/ -xzf go1.22.0.linux-amd64.tar.gz \ + && tar -C temp-go/ -xzf go1.21.5.linux-amd64.tar.gz \ && mv temp-go/go/* /root/.go/ \ - && rm -rf temp-go go1.22.0.linux-amd64.tar.gz + && rm -rf temp-go go1.21.5.linux-amd64.tar.gz ( # fuzz qpack