view fsg.sh.in @ 2681:79947984e110

PR3807: Allow the number of curves supported to be specified 2020-08-19 Andrew John Hughes <gnu_andrew@member.fsf.org> PR3807: Allow the number of curves supported to be specified * INSTALL: Rename --enable-non-nss-curves to --with-curves and provide additional section documenting its use. Use "Mercurial" in the description of --with-hg-revision, rather than the command name, "hg". * acinclude.m4: (IT_WITH_CURVES): Renamed from IT_ENABLE_NON_NSS_CURVES. Allow the curve set to be chosen from 3/nist, 4/nist+ or all. * configure.ac: Invoke IT_WITH_CURVES instead of IT_ENABLE_NON_NSS_CURVES. * fsg.sh.in: Use CURVES instead of the obsolete ENABLE_NON_NSS_CURVES. Apply either the 3 curve or 4 curve patch, depending on the value of CURVES. * patches/pr3681.patch: Resurrect the 3 curve version of the patch from PR3751.
author Andrew John Hughes <gnu_andrew@member.fsf.org>
date Mon, 19 Oct 2020 03:02:10 +0100
parents f1702bbbc1d2
children dcab611ca0d6
line wrap: on
line source

#!/bin/sh

echo "Further liberating OpenJDK..."

# PRx denotes bug x in the IcedTea bug database (http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=x)
# Sx denotes bug x in the Sun/Oracle bug database (https://bugs.openjdk.java.net/browse/JDK-X)

echo "Removing support for proprietary SNMP plug"
rm -rvf openjdk/jdk/src/share/classes/sun/management/snmp
rm -rvf openjdk/jdk/src/share/classes/com/sun/jmx/snmp
rm -rvf openjdk/jdk/test/com/sun/jmx/snmp

echo "Removing EC source code we don't build"
rm -rvf openjdk/jdk/src/share/native/sun/security/ec/impl

if test "x@CURVES@" != "xall"; then
  echo "Removing non-NSS ECC curves"
  rm -vf openjdk/jdk/src/share/native/sun/security/ec/impl/ec2.h
  rm -vf openjdk/jdk/src/share/native/sun/security/ec/impl/ec2_163.c
  rm -vf openjdk/jdk/src/share/native/sun/security/ec/impl/ec2_193.c
  rm -vf openjdk/jdk/src/share/native/sun/security/ec/impl/ec2_233.c
  rm -vf openjdk/jdk/src/share/native/sun/security/ec/impl/ec2_aff.c
  rm -vf openjdk/jdk/src/share/native/sun/security/ec/impl/ec2_mont.c
  rm -vf openjdk/jdk/src/share/native/sun/security/ec/impl/ecp_192.c
  rm -vf openjdk/jdk/src/share/native/sun/security/ec/impl/ecp_224.c
  if test "x@CURVES@" = "x3"; then
      PATCH_FILE="@abs_top_srcdir@/patches/pr3681.patch"
  else
      PATCH_FILE="@abs_top_srcdir@/patches/pr3751.patch"
  fi
  echo "Applying ${PATCH_FILE}..."
  patch -Np0 < ${PATCH_FILE}
fi