[jdk11u-dev] RFR: 8239264: Clearup the legacy ObjectIdentifier constructor from int array [v4]

[Goetz Lindenmaier]

On Tue, 6 Jun 2023 16:25:05 GMT, Goetz Lindenmaier <goetz at openjdk.org> wrote:

>> I had to work on this intensely to get it into 11.
>> 
>> First I resolved the conflicts:
>> 
>> src/java.base/macosx/classes/apple/security/KeychainStore.java
>> Copyright, different way to call loadLibrary.
>> This was wrongly removed anyways, see JDK-8240193
>> 
>> src/java.base/share/classes/com/sun/crypto/provider/DHPrivateKey.java
>> src/java.base/share/classes/com/sun/crypto/provider/DHPublicKey.java
>> src/java.base/share/classes/com/sun/crypto/provider/OAEPParameters.java
>> src/java.base/share/classes/sun/security/pkcs/ContentInfo.java
>> All Copyright
>> 
>> src/java.base/share/classes/sun/security/pkcs/PKCS9Attribute.java
>> The change is subsumed by 8268801: Improve PKCS attribute handling", a
>> closed issue that is not in head.
>> 8268801 brought parts of this change to
>> 11 as it was needed for some security fix.
>> 
>> src/java.base/share/classes/sun/security/pkcs12/PKCS12KeyStore.java
>> Copyright, Complex resolve due to context
>> 
>> src/java.base/share/classes/sun/security/util/ObjectIdentifier.java
>> Copyright
>> Complex resolve due to context.  Hunk in line 486 actually differs, but change
>> is only new formatting.
>> 
>> src/java.base/share/classes/sun/security/x509/AlgorithmId.java
>> Copyright
>> 
>> Second, to make it compile, I had to adapt the newly introduced calls to
>> ObjectIdentifier.of(). Unfortunately, "8268801: Improve PKCS attribute handling"
>> already backported parts of the later change
>> "8242151: Improve OID mapping and reuse among JDK security providers f..."
>> that make of() throw an exception. I restored the original function,
>> renamed it and adapted all the call sites.
>> 
>> This comes in a separate commit.  I will backport "JDK-8242151: Improve OID mapping and reuse among JDK security providers for aliases registration" on top of this, which will remove of1() again.
>
> Goetz Lindenmaier has updated the pull request incrementally with two additional commits since the last revision:
> 
>  - Add comment for of() lost in ObjectIdentifier.java
>  - Remove imports from PKCS9Attribute.java

Hi Martin, 

thanks for looking at this!
I fixed the two code parts. 

I used the /issue command with 8240193, so integrating this change should add the bug to the commit and annotate the issue as backported.

Best regards,
  Goetz.

-------------

PR Comment: https://git.openjdk.org/jdk11u-dev/pull/1898#issuecomment-1579087056