[RFR] [8u] 8u242-b07 Upstream Sync

Andrew John Hughes gnu.andrew at redhat.com
Tue Jan 14 23:41:04 UTC 2020


Webrevs: https://cr.openjdk.java.net/~andrew/shenandoah-8/u242-b07/

Merge changesets:
http://cr.openjdk.java.net/~andrew/shenandoah-8/u242-b07/corba/merge.changeset
http://cr.openjdk.java.net/~andrew/shenandoah-8/u242-b07/jaxp/merge.changeset
http://cr.openjdk.java.net/~andrew/shenandoah-8/u242-b07/jaxws/merge.changeset
http://cr.openjdk.java.net/~andrew/shenandoah-8/u242-b07/jdk/merge.changeset
http://cr.openjdk.java.net/~andrew/shenandoah-8/u242-b07/hotspot/merge.changeset
http://cr.openjdk.java.net/~andrew/shenandoah-8/u242-b07/langtools/merge.changeset
http://cr.openjdk.java.net/~andrew/shenandoah-8/u242-b07/nashorn/merge.changeset
http://cr.openjdk.java.net/~andrew/shenandoah-8/u242-b07/root/merge.changeset

Changes in aarch64-shenandoah-jdk8u242-b07:
  - S8037550: Update RFC references in javadoc to RFC 5280
  - S8039438: Some tests depend on internal API sun.misc.IOUtils
  - S8044500: Add kinit options and krb5.conf flags that allow users to
obtain renewable tickets and specify ticket lifetimes
  - S8058290: JAAS Krb5LoginModule has suspect ticket-renewal logic,
relies on clockskew grace
  - S8073108: [AArch64] Use x86 and SPARC CPU instructions for GHASH
acceleration
  - S8080835: Add blocking bulk read to sun.misc.IOUtils
  - S8138978: Examine usages of sun.misc.IOUtils
  - S8139206: Add InputStream readNBytes(int len)
  - S8183591: Incorrect behavior when reading DER value with
Integer.MAX_VALUE length
  - S8186576: KerberosTicket does not properly handle renewable tickets
at the end of their lifetime
  - S8186831: Kerberos ignores PA-DATA with a non-null s2kparams
  - S8186884: Test native KDC, Java krb5 lib, and native krb5 lib in one
test
  - S8193832: Performance of InputStream.readAllBytes() could be improved
  - S8196956: (ch) More channels cleanup
  - S8201627: Kerberos sequence number issues
  - S8215032: Support Kerberos cross-realm referrals (RFC 6806)
  - S8224909, CVE-2020-2583: Unlink Set of LinkedHashSets
  - S8225261: Better method resolutions
  - S8225279: Better XRender interpolation
  - S8226352, CVE-2020-2590: Improve Kerberos interop capabilities
  - S8226719: Kerberos login to Windows 2000 failed with "Inappropriate
type of checksum in message"
  - S8227061: KDC.java test behaves incorrectly when AS-REQ contains a
PAData not PA-ENC-TS-ENC
  - S8227381: GSS login fails with PREAUTH_FAILED
  - S8227437: S4U2proxy cannot continue because server's TGT cannot be found
  - S8227758: More valid PKIX processing
  - S8227816: More Colorful ICC profiles
  - S8228548, CVE-2020-2593: Normalize normalization for all
  - S8229951, CVE-2020-2601: Better Ticket Granting Services
  - S8230279: Improve Pack200 file reading
  - S8230318: Better trust store usage
  - S8230967: Improve Registry support of clients
  - S8231129: More glyph images
  - S8231139: Improved keystore support
  - S8231422, CVE-2020-2604: Better serial filter handling
  - S8231795, CVE-2020-2659: Enhance datagram socket support
  - S8232381: add result NULL-checking to freetypeScaler.c
  - S8232419: Improve Registry registration
  - S8233944: Make KerberosPrincipal.KRB_NT_ENTERPRISE field package private
  - S8234037, CVE-2020-2654: Improve Object Identifier Processing
  - S8235909: File.exists throws AccessControlException for invalid
paths when a SecurityManager is installed
  - S8236829: JDK-8232102 backport breaks s390
  - S8236983: [TESTBUG] Remove pointless catch block in
test/jdk/sun/security/util/DerValue/BadValue.java
  - S8236984: Add compatibility wrapper for IOUtils.readFully

Main issues of note:
I included the AArch64 part of 8073108, the rest of which was part of
8u242-b04. This just catches the flag and tells the user the intrinsics
aren't supported on this architecture (the same was present in 8073108
for PPC). It may be worth backporting 8131062 & 8134869 to provide
AArch64 support.
Other than that, there's only one security fix on the HotSpot side, plus
some test updates for the IOUtils change on the JDK side.

diffstat for root
 b/.hgtags |    1 +
 1 file changed, 1 insertion(+)

diffstat for corba
 b/.hgtags |    1 +
 1 file changed, 1 insertion(+)

diffstat for jaxp
 b/.hgtags |    1 +
 1 file changed, 1 insertion(+)

diffstat for jaxws
 b/.hgtags |    1 +
 1 file changed, 1 insertion(+)

diffstat for langtools
 b/.hgtags |    1 +
 1 file changed, 1 insertion(+)

diffstat for nashorn
 b/.hgtags |    1 +
 1 file changed, 1 insertion(+)

diffstat for jdk
 a/test/sun/security/krb5/auto/SaslGSS.java
                   |  137 -
 b/.hgtags
                   |    1
 b/src/share/classes/com/sun/crypto/provider/JceKeyStore.java
                   |   61
 b/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java
                   |   39
 b/src/share/classes/com/sun/jndi/ldap/Connection.java
                   |   29
 b/src/share/classes/com/sun/security/auth/module/Krb5LoginModule.java
                   |   53
 b/src/share/classes/com/sun/security/sasl/gsskerb/GssKrb5Base.java
                   |   24
 b/src/share/classes/com/sun/security/sasl/gsskerb/GssKrb5Client.java
                   |    6
 b/src/share/classes/com/sun/security/sasl/gsskerb/GssKrb5Server.java
                   |    6
 b/src/share/classes/java/awt/color/ICC_Profile.java
                   |   45
 b/src/share/classes/java/beans/beancontext/BeanContextSupport.java
                   |   16
 b/src/share/classes/java/io/FilePermission.java
                   |   39
 b/src/share/classes/java/io/ObjectInputStream.java
                   |   76 -
 b/src/share/classes/java/lang/System.java
                   |    3
 b/src/share/classes/java/net/URL.java
                   |    5
 b/src/share/classes/java/nio/channels/SelectableChannel.java
                   |    2
 b/src/share/classes/java/nio/channels/spi/AbstractSelectableChannel.java                  |   34
 b/src/share/classes/java/rmi/server/RemoteObjectInvocationHandler.java
                   |   10
 b/src/share/classes/java/security/CodeSource.java
                   |    2
 b/src/share/classes/java/security/Key.java
                   |    4
 b/src/share/classes/java/security/UnresolvedPermission.java
                   |    2
 b/src/share/classes/java/security/cert/CRLReason.java
                   |    6
 b/src/share/classes/java/security/cert/CertificateRevokedException.java
                  |    2
 b/src/share/classes/java/security/cert/PKIXReason.java
                   |    4
 b/src/share/classes/java/security/cert/TrustAnchor.java
                   |   10
 b/src/share/classes/java/security/cert/X509CRL.java
                   |    4
 b/src/share/classes/java/security/cert/X509CRLSelector.java
                   |    2
 b/src/share/classes/java/security/cert/X509CertSelector.java
                   |   26
 b/src/share/classes/java/security/cert/X509Certificate.java
                   |   10
 b/src/share/classes/java/util/jar/JarFile.java
                   |    7
 b/src/share/classes/javax/security/auth/kerberos/JavaxSecurityAuthKerberosAccessImpl.java |   16
 b/src/share/classes/javax/security/auth/kerberos/KerberosPrincipal.java
                  |    7
 b/src/share/classes/javax/security/auth/kerberos/KerberosTicket.java
                   |   19
 b/src/share/classes/javax/security/auth/x500/X500Principal.java
                   |   12
 b/src/share/classes/javax/security/auth/x500/package-info.java
                   |   12
 b/src/share/classes/jdk/internal/util/StaticProperty.java
                   |   58
 b/src/share/classes/sun/applet/AppletClassLoader.java
                   |    5
 b/src/share/classes/sun/misc/IOUtils.java
                   |  301 +++-
 b/src/share/classes/sun/misc/JavaObjectInputStreamReadString.java
                   |   38
 b/src/share/classes/sun/misc/ObjectInputFilter.java
                   |    4
 b/src/share/classes/sun/misc/SharedSecrets.java
                   |   13
 b/src/share/classes/sun/nio/ch/DatagramChannelImpl.java
                   |   26
 b/src/share/classes/sun/nio/ch/DatagramSocketAdaptor.java
                   |   30
 b/src/share/classes/sun/nio/ch/ServerSocketAdaptor.java
                   |   32
 b/src/share/classes/sun/nio/ch/ServerSocketChannelImpl.java
                   |    5
 b/src/share/classes/sun/nio/ch/SocketAdaptor.java
                   |   37
 b/src/share/classes/sun/nio/ch/SocketChannelImpl.java
                   |    3
 b/src/share/classes/sun/reflect/misc/MethodUtil.java
                   |   16
 b/src/share/classes/sun/rmi/registry/RegistryImpl_Skel.java
                   |   26
 b/src/share/classes/sun/rmi/server/UnicastRef.java
                   |    5
 b/src/share/classes/sun/rmi/transport/tcp/TCPEndpoint.java
                   |    6
 b/src/share/classes/sun/security/action/GetPropertyAction.java
                   |   23
 b/src/share/classes/sun/security/jgss/krb5/CipherHelper.java
                   |   12
 b/src/share/classes/sun/security/jgss/krb5/InitSecContextToken.java
                   |   46
 b/src/share/classes/sun/security/jgss/krb5/Krb5Context.java
                   |   14
 b/src/share/classes/sun/security/jgss/krb5/Krb5InitCredential.java
                   |   40
 b/src/share/classes/sun/security/jgss/krb5/Krb5Util.java
                   |   23
 b/src/share/classes/sun/security/jgss/krb5/MessageToken_v2.java
                   |   12
 b/src/share/classes/sun/security/jgss/krb5/SubjectComber.java
                   |   39
 b/src/share/classes/sun/security/krb5/Checksum.java
                   |  139 -
 b/src/share/classes/sun/security/krb5/Config.java
                   |  120 +
 b/src/share/classes/sun/security/krb5/Credentials.java
                   |   55
 b/src/share/classes/sun/security/krb5/JavaxSecurityAuthKerberosAccess.java                |    9
 b/src/share/classes/sun/security/krb5/KrbApReq.java
                   |    4
 b/src/share/classes/sun/security/krb5/KrbAsRep.java
                   |   19
 b/src/share/classes/sun/security/krb5/KrbAsReq.java
                   |   48
 b/src/share/classes/sun/security/krb5/KrbAsReqBuilder.java
                   |   98 +
 b/src/share/classes/sun/security/krb5/KrbCred.java
                   |    8
 b/src/share/classes/sun/security/krb5/KrbKdcRep.java
                   |  105 +
 b/src/share/classes/sun/security/krb5/KrbTgsRep.java
                   |   27
 b/src/share/classes/sun/security/krb5/KrbTgsReq.java
                   |  141 -
 b/src/share/classes/sun/security/krb5/PrincipalName.java
                   |   12
 b/src/share/classes/sun/security/krb5/internal/CredentialsUtil.java
                   |  224 ++-
 b/src/share/classes/sun/security/krb5/internal/EncASRepPart.java
                   |    4
 b/src/share/classes/sun/security/krb5/internal/EncKDCRepPart.java
                   |   73 -
 b/src/share/classes/sun/security/krb5/internal/EncTGSRepPart.java
                   |    4
 b/src/share/classes/sun/security/krb5/internal/HostAddresses.java
                   |    4
 b/src/share/classes/sun/security/krb5/internal/KDCOptions.java
                   |    4
 b/src/share/classes/sun/security/krb5/internal/KDCReq.java
                   |   20
 b/src/share/classes/sun/security/krb5/internal/KRBError.java
                   |   20
 b/src/share/classes/sun/security/krb5/internal/KerberosTime.java
                   |    9
 b/src/share/classes/sun/security/krb5/internal/Krb5.java
                   |    7
 b/src/share/classes/sun/security/krb5/internal/NetClient.java
                   |    4
 b/src/share/classes/sun/security/krb5/internal/PAData.java
                   |   50
 b/src/share/classes/sun/security/krb5/internal/PAForUserEnc.java
                   |    3
 b/src/share/classes/sun/security/krb5/internal/ReferralsCache.java
                   |  159 ++
 b/src/share/classes/sun/security/krb5/internal/TicketFlags.java
                   |    6
 b/src/share/classes/sun/security/krb5/internal/ccache/CCacheInputStream.java              |    8
 b/src/share/classes/sun/security/krb5/internal/ccache/Credentials.java
                   |    5
 b/src/share/classes/sun/security/krb5/internal/crypto/CksumType.java
                   |   38
 b/src/share/classes/sun/security/krb5/internal/crypto/Crc32CksumType.java                 |   18
 b/src/share/classes/sun/security/krb5/internal/crypto/DesCbcCrcEType.java                 |    2
 b/src/share/classes/sun/security/krb5/internal/crypto/DesMacCksumType.java                |   10
 b/src/share/classes/sun/security/krb5/internal/crypto/DesMacKCksumType.java               |   12
 b/src/share/classes/sun/security/krb5/internal/crypto/EType.java
                   |   22
 b/src/share/classes/sun/security/krb5/internal/crypto/HmacMd5ArcFourCksumType.java        |   14
 b/src/share/classes/sun/security/krb5/internal/crypto/HmacSha1Aes128CksumType.java        |   14
 b/src/share/classes/sun/security/krb5/internal/crypto/HmacSha1Aes256CksumType.java        |   14
 b/src/share/classes/sun/security/krb5/internal/crypto/HmacSha1Des3KdCksumType.java        |   14
 b/src/share/classes/sun/security/krb5/internal/crypto/KeyUsage.java
                   |    3
 b/src/share/classes/sun/security/krb5/internal/crypto/RsaMd5CksumType.java                |   26
 b/src/share/classes/sun/security/krb5/internal/crypto/RsaMd5DesCksumType.java             |   17
 b/src/share/classes/sun/security/provider/JavaKeyStore.java
                   |   19
 b/src/share/classes/sun/security/provider/SunEntries.java
                   |    6
 b/src/share/classes/sun/security/provider/certpath/PolicyChecker.java
                   |    4
 b/src/share/classes/sun/security/provider/certpath/PolicyNodeImpl.java
                   |    4
 b/src/share/classes/sun/security/timestamp/HttpTimestamper.java
                   |    8
 b/src/share/classes/sun/security/tools/jarsigner/TimestampedSigner.java
                  |    2
 b/src/share/classes/sun/security/util/DerInputBuffer.java
                   |    2
 b/src/share/classes/sun/security/util/DerOutputStream.java
                   |    4
 b/src/share/classes/sun/security/util/DerValue.java
                   |    6
 b/src/share/classes/sun/security/validator/PKIXValidator.java
                   |  103 +
 b/src/share/classes/sun/security/x509/AVA.java
                   |    2
 b/src/share/classes/sun/security/x509/AuthorityInfoAccessExtension.java
                  |    4
 b/src/share/classes/sun/security/x509/CertificateIssuerExtension.java
                   |    4
 b/src/share/classes/sun/security/x509/DeltaCRLIndicatorExtension.java
                   |    4
 b/src/share/classes/sun/security/x509/ExtendedKeyUsageExtension.java
                   |    4
 b/src/share/classes/sun/security/x509/FreshestCRLExtension.java
                   |    4
 b/src/share/classes/sun/security/x509/InvalidityDateExtension.java
                   |    4
 b/src/share/classes/sun/security/x509/IssuingDistributionPointExtension.java              |    4
 b/src/share/classes/sun/security/x509/RDN.java
                   |    4
 b/src/share/classes/sun/security/x509/README
                   |    2
 b/src/share/classes/sun/security/x509/SubjectInfoAccessExtension.java
                   |    4
 b/src/share/classes/sun/security/x509/URIName.java
                   |   14
 b/src/share/classes/sun/security/x509/X500Name.java
                   |  156 --
 b/src/share/classes/sun/security/x509/X509CRLImpl.java
                   |    4
 b/src/share/classes/sun/security/x509/X509CertInfo.java
                   |    4
 b/src/share/lib/security/java.security-aix
                   |   32
 b/src/share/lib/security/java.security-linux
                   |   32
 b/src/share/lib/security/java.security-macosx
                   |   32
 b/src/share/lib/security/java.security-solaris
                   |   32
 b/src/share/lib/security/java.security-windows
                   |   32
 b/src/share/native/sun/font/freetypeScaler.c
                   |   12
 b/src/share/native/sun/security/krb5/nativeccache.c
                   |    6
 b/src/solaris/native/sun/java2d/x11/X11SurfaceData.c
                   |   48
 b/src/solaris/native/sun/java2d/x11/X11SurfaceData.h
                   |    2
 b/src/windows/classes/sun/security/krb5/internal/tools/Kinit.java
                   |   66
 b/src/windows/classes/sun/security/krb5/internal/tools/KinitOptions.java                  |   60
 b/src/windows/native/sun/security/krb5/NativeCreds.c
                   |    6
 b/test/java/io/Serializable/serialFilter/GlobalFilterTest.java
                   |   30
 b/test/java/io/Serializable/serialFilter/security.policy
                   |    2
 b/test/java/lang/annotation/AnnotationType/AnnotationTypeRuntimeAssumptionTest.java       |   13
 b/test/java/lang/invoke/lambda/LambdaClassLoaderSerialization.java
                   |   44
 b/test/java/lang/reflect/Method/InterfaceStatic/StaticInterfaceMethodInWayOfDefault.java  |   11
 b/test/java/security/testlibrary/Proc.java
                   |   15
 b/test/lib/testlibrary/jdk/testlibrary/FileUtils.java
                   |    1
 b/test/lib/testlibrary/jdk/testlibrary/IOUtils.java
                   |   71
 b/test/sun/misc/IOUtils/ReadAllBytes.java
                   |  103 +
 b/test/sun/misc/IOUtils/ReadNBytes.java
                   |  164 ++
 b/test/sun/security/krb5/auto/Basic.java
                   |    7
 b/test/sun/security/krb5/auto/BasicKrb5Test.java
                   |    2
 b/test/sun/security/krb5/auto/BasicProc.java
                   |  434 +++---
 b/test/sun/security/krb5/auto/Context.java
                   |  103 +
 b/test/sun/security/krb5/auto/DiffSaltParams.java
                   |   50
 b/test/sun/security/krb5/auto/KDC.java
                   |  723 ++++++++--
 b/test/sun/security/krb5/auto/LifeTimeInSeconds.java
                   |    2
 b/test/sun/security/krb5/auto/NullRenewUntil.java
                   |   67
 b/test/sun/security/krb5/auto/ReferralsTest.java
                   |  248 +++
 b/test/sun/security/krb5/auto/Renew.java
                   |   99 +
 b/test/sun/security/krb5/auto/Renewal.java
                   |  164 ++
 b/test/sun/security/krb5/config/Duration.java
                   |   71
 b/test/sun/security/provider/DSA/TestMaxLengthDER.java
                   |   84 +
 b/test/sun/security/tools/jarsigner/EntriesOrder.java
                   |    9
 b/test/sun/security/tools/jarsigner/TimestampCheck.java
                   |    2
 b/test/sun/security/tools/jarsigner/TsacertOptionTest.java
                   |    1
 b/test/sun/security/tools/jarsigner/Warning.java
                   |    2
 b/test/sun/security/tools/jarsigner/concise_jarsigner.sh
                   |   14
 b/test/sun/security/tools/jarsigner/ec.sh
                   |    2
 b/test/sun/security/tools/jarsigner/onlymanifest.sh
                   |    2
 b/test/sun/security/tools/jarsigner/warnings/BadExtendedKeyUsageTest.java                 |    4
 b/test/sun/security/tools/jarsigner/warnings/BadKeyUsageTest.java
                   |    4
 b/test/sun/security/tools/jarsigner/warnings/BadNetscapeCertTypeTest.java                 |    4
 b/test/sun/security/tools/jarsigner/warnings/ChainNotValidatedTest.java
                  |    4
 b/test/sun/security/tools/jarsigner/warnings/HasExpiredCertTest.java
                   |    4
 b/test/sun/security/tools/jarsigner/warnings/HasExpiringCertTest.java
                   |    4
 b/test/sun/security/tools/jarsigner/warnings/HasUnsignedEntryTest.java
                   |    4
 b/test/sun/security/tools/jarsigner/warnings/MultipleWarningsTest.java
                   |    4
 b/test/sun/security/tools/jarsigner/warnings/NoTimestampTest.java
                   |    4
 b/test/sun/security/tools/jarsigner/warnings/NotSignedByAliasTest.java
                   |    4
 b/test/sun/security/tools/jarsigner/warnings/NotYetValidCertTest.java
                   |    4
 b/test/sun/security/util/DerValue/BadValue.java
                   |   37
 b/test/sun/security/validator/EndEntityExtensionCheck.java
                   |    3
 182 files changed, 4914 insertions(+), 1584 deletions(-)

diffstat for hotspot
 b/.hgtags
        |    1
 b/src/share/vm/oops/klassVtable.cpp
        |   13 ++++++----
 b/test/compiler/classUnloading/anonymousClass/TestAnonymousClassUnloading.java |   11 ++++++--
 b/test/runtime/8003720/VictimClassLoader.java
        |    8 ++++--
 4 files changed, 24 insertions(+), 9 deletions(-)

Successfully built on x86, x86_64, s390, s390x, ppc, ppc64,
ppc64le & aarch64. We picked up the s390 fix with this build, so no
patches necessary for any architecture.

Ok to push?

Thanks,
-- 
Andrew :)

Senior Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

PGP Key: ed25519/0xCFDA0F9B35964222 (hkp://keys.gnupg.net)
Fingerprint = 5132 579D D154 0ED2 3E04  C5A0 CFDA 0F9B 3596 4222
https://keybase.io/gnu_andrew



More information about the shenandoah-dev mailing list