From e25234076cbbb5c7b91d0699cb27c06d9cc96b33 Mon Sep 17 00:00:00 2001
From: Guido Vranken <guidovranken@users.noreply.github.com>
Date: Tue, 11 Apr 2023 18:37:00 +0200
Subject: [PATCH] [cryptofuzz] Remove Java (#10006)

Unfortunately it's not working.

https://github.com/google/oss-fuzz/issues/9255
---
 projects/cryptofuzz/Dockerfile |  3 +--
 projects/cryptofuzz/build.sh   | 15 ---------------
 2 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/projects/cryptofuzz/Dockerfile b/projects/cryptofuzz/Dockerfile
index 4d005e010..b9ab01570 100644
--- a/projects/cryptofuzz/Dockerfile
+++ b/projects/cryptofuzz/Dockerfile
@@ -27,8 +27,8 @@ RUN git clone --depth 1 https://github.com/guidovranken/cryptofuzz
 RUN git clone --depth 1 https://github.com/guidovranken/cryptofuzz-corpora
 RUN git clone --depth 1 https://github.com/openssl/openssl
 RUN git clone --depth 1 https://boringssl.googlesource.com/boringssl
-RUN git clone --depth 1 https://github.com/weidai11/cryptopp/
 RUN git clone --depth 1 git://git.gnupg.org/libgcrypt.git
+RUN git clone --depth 1 https://github.com/weidai11/cryptopp/
 RUN wget https://gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-1.36.tar.bz2
 RUN git clone --depth 1 -b oss-fuzz https://github.com/project-everest/hacl-star evercrypt
 RUN git clone --depth 1 https://github.com/google/cityhash.git
@@ -57,7 +57,6 @@ RUN apt-get remove -y libunwind8
 RUN apt-get install -y libssl-dev
 RUN wget https://boostorg.jfrog.io/artifactory/main/release/1.74.0/source/boost_1_74_0.tar.bz2
 RUN wget https://nodejs.org/dist/v14.17.1/node-v14.17.1-linux-x64.tar.xz
-RUN wget https://download.java.net/java/GA/jdk18.0.1/3f48cabb83014f9fab465e280ccf630b/10/GPL/openjdk-18.0.1_linux-x64_bin.tar.gz
 RUN pip3 install -r $SRC/mbedtls/scripts/basic.requirements.txt
 RUN bash -c "wget $(curl https://ziglang.org/download/index.json | jq -r '.master."x86_64-linux".tarball') -O zig-latest.tar.xz"
 
diff --git a/projects/cryptofuzz/build.sh b/projects/cryptofuzz/build.sh
index 9bf53e77c..ca195250c 100755
--- a/projects/cryptofuzz/build.sh
+++ b/projects/cryptofuzz/build.sh
@@ -94,21 +94,6 @@ then
     make
 fi
 
-# Compile Java module
-if [ "$SANITIZER" = undefined ]; then
-    mkdir -p $OUT/lib/
-    cd $OUT/lib/
-    tar zxf $SRC/openjdk-18.0.1_linux-x64_bin.tar.gz
-    export JDK_PATH=$(realpath jdk-18.0.1)
-    cp $JDK_PATH/lib/server/libjvm.so $OUT/lib/
-    export LINK_FLAGS="$LINK_FLAGS -L$JDK_PATH/lib/server/ -ljvm"
-    export CXXFLAGS="$CXXFLAGS -DCRYPTOFUZZ_JAVA"
-
-    cd $SRC/cryptofuzz/modules/java/
-    make -f Makefile-OSS-Fuzz -j$(nproc)
-    cp CryptofuzzJavaHarness.class $OUT/
-fi
-
 if [[ $CFLAGS != *-m32* && "$SANITIZER" != "coverage" ]]
 then
     cd $SRC/