On 18/06/2019 19:37, Andrew John Hughes wrote: > On 14/06/2019 22:37, Alvarez, David wrote: >> Hi, >> >> Here is the proper RFR for 8208648: ECC Field Arithmetic Enhancements >> >> Sorry for the confusion >> >> Bug: https://bugs.openjdk.java.net/browse/JDK-8208648 >> Original: http://hg.openjdk.java.net/jdk/jdk/rev/746602d9682f >> Webrev: http://cr.openjdk.java.net/~phh/8208648/webrev.8u.00/ >> >> JDK-8208648 is marked as jdk8u-critical-yes >> >> This is the second of a chain of three patches, JDK-8181594, JDK-8208648 and >> JDK-8208698 I will be sending today. >> >> The patch did not apply cleanly. The following conflicts appeared: >> >> sun/security/util/ArrayUtil.java is not present in jdk8u. ArrayUtil is a >> utility class with static methods. I created the file but only with the >> static methods that were required for this patch (all of them were included >> in the original patch). > > That seems fine. The file originally arises from JDK-8179098, which in > turn fixes a performance regression introduced by JDK-8076112 adding > bounds checks. That is a JDK & HotSpot change to mark intrinsics, which > I doubt is suitable for backport, so I'm happy with ArrayUtil being > created just by this patch. > >> sun/security/util/math/intpoly/IntegerPolynomial1305.java had a minor >> conflict due to mismatching of the context lines >> sun/security/util/math/intpoly/IntegerPolynomial.java had significant amount >> of rejections, but they were mostly easy to fix, caused by context >> mismatching. >> >> Additionally, some of the new implementations of IntegerPolynomial contained >> an @Override for a method (finalCarryReduceLast) that is not present in the >> jdk8u version of IntegerPolynomial.java, so I removed the annotation. >> > > I think this is because JDK-8203228 & JDK-8201317 are missing, which are > also part of the 8u222 list. I'll post backports of those two, based on > your JDK-8181594 work and then those changes should apply cleanly. > >> Below are the relevant changes I've done to resolve the rejects and >> compilation errors. >> >> Thanks, >> David >> >> > >
Looking at JDK-8203228 & JDK8201317, they both apply cleanly (once changes to XDHKeyAgreement are dropped from the latter), so they can go straight in after JDK-8181594 is pushed. You should then be able to backport JDK-8208648 more simply. -- 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
signature.asc
Description: OpenPGP digital signature
