Hi Goetz, this looks good to me. I compared security.cpp after I've applied your changes to the version in jdk/jdk and there are only the changes missing that come with newer changes JDK-8223003 and JDK-8223063.
Thanks for backporting this. Cheers Christoph > -----Original Message----- > From: jdk-updates-dev <jdk-updates-dev-boun...@openjdk.java.net> On > Behalf Of Lindenmaier, Goetz > Sent: Samstag, 21. Dezember 2019 13:21 > To: jdk-updates-...@openjdk.java.net; OpenJDK Dev list <security- > d...@openjdk.java.net> > Subject: [CAUTION] [11u] RFR: 8213010: Supporting keys created with > certmgr.exe > > Hi, > > I would like to downport this for parity with 11.0.7-Oracle. > It does not apply clean because in 11 changes were applied in > a different order than in 14. > > http://cr.openjdk.java.net/~goetz/wr19/8213010-certmgr.exe_keys-jdk11/ > > In ECUtil.java I had to resolve the Copyright. > > patching file > src/jdk.crypto.mscapi/windows/native/libsunmscapi/security.cpp > This fails because "8221407: Windows 32bit build error in > libsunmscapi/security.cpp" and > "8210870: Libsunmscapi improved interactions" are already in 11, but in 14 > they come > on top of this change. > I resolved this file so that it looks the same as in 14 after 8221407. > > After pushing 8213009 and this, jdk11u-dev and jdk/jdk will have the same > changes > for security.cpp: > > jdk11 Filelog for security.cpp: > > 8213010: Supporting keys created with certmgr.exe > 8213009: Refactoring existing SunMSCAPI classes > 8210476: sun/security/mscapi/PrngSlow.java fails with Still too slow > 8201355: Avoid native memory allocation in > sun.security.mscapi.PRNG.generateSeed > 8221407: Windows 32bit build error in libsunmscapi/security.cpp > 8210870: Libsunmscapi improved interactions > 8196897: Improve PRNG supportjdk-11.0.1+0 > 8205445: Add RSASSA-PSS Signature support to SunMSCAPI > 8204572: SetupJdkLibrary should setup SRC and -I flags automatically > 8193262: JNI array not released in libsunmscapi convertToLittleEndian > 8198898: Compilation errors in jdk.crypto.mscapi with VS 2017 > 8199198: Remove unused functions in jdk.crypto.mscapi native code > 8187443: Forest Consolidation: Move files to unified layout > > Jdk/jdk filelog for security.cpp: > > 8221407: Windows 32bit build error in libsunmscapi/security.cpp > 8210870: Libsunmscapi improved interactions > 8213010: Supporting keys created with certmgr.exe > 8213009: Refactoring existing SunMSCAPI classes > 8210476: sun/security/mscapi/PrngSlow.java fails with Still too slow > 8201355: Avoid native memory allocation in > sun.security.mscapi.PRNG.generateSeed > 8196897: Improve PRNG support > 8205445: Add RSASSA-PSS Signature support to SunMSCAPI > 8204572: SetupJdkLibrary should setup SRC and -I flags automatically > 8193262: JNI array not released in libsunmscapi convertToLittleEndian > 8198898: Compilation errors in jdk.crypto.mscapi with VS 2017 > 8199198: Remove unused functions in jdk.crypto.mscapi native code > 8187443: Forest Consolidation: Move files to unified layout > > Jdk/jdk has two changes on top of this. > But if updating to 8221407 in jdk/jdk, security.cpp are > Similar in both repos. > > Best regards, > Goetz.
