JDK 9 RFR of JDK-8066638: Suppress deprecation warnings in jdk.crypto module
Valerie Peng
valerie.peng at oracle.com
Fri Dec 5 21:05:54 UTC 2014
Looks fine.
Thanks,
Valerie
On 12/4/2014 4:10 PM, Xuelei Fan wrote:
> Looks fine to me, too.
>
> Thanks,
> Xuelei
>
> On 12/5/2014 8:07 AM, Bradford Wetmore wrote:
>> Joe,
>>
>> This looks good to me, but Valerie (PKCS11 owner) and Xuelei (TLS owner)
>> should also have a look at this.
>>
>> Brad
>>
>>
>>
>> On 12/4/2014 3:41 PM, joe darcy wrote:
>>> Hello,
>>>
>>> Please review my changes to fix
>>>
>>> JDK-8066638: Suppress deprecation warnings in jdk.crypto module
>>> http://cr.openjdk.java.net/~darcy/8066638.0/
>>>
>>> Patch inline below.
>>>
>>> (Background effort on the overall deprecation suppression effort written
>>> up at
>>> http://mail.openjdk.java.net/pipermail/core-libs-dev/2014-December/030085.html)
>>>
>>>
>>>
>>> Thanks,
>>>
>>> -Joe
>>>
>>> ---
>>> old/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11Key.java
>>> 2014-12-04 15:39:05.353994901 -0800
>>> +++
>>> new/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11Key.java
>>> 2014-12-04 15:39:05.170086892 -0800
>>> @@ -1,5 +1,5 @@
>>> /*
>>> - * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights
>>> reserved.
>>> + * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights
>>> reserved.
>>> * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
>>> *
>>> * This code is free software; you can redistribute it and/or modify it
>>> @@ -445,6 +445,7 @@
>>> }
>>> }
>>>
>>> + @SuppressWarnings("deprecation")
>>> private static class P11TlsMasterSecretKey extends P11SecretKey
>>> implements TlsMasterSecret {
>>> private static final long serialVersionUID =
>>> -1318560923770573441L;
>>> ---
>>> old/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11RSACipher.java
>>>
>>> 2014-12-04 15:39:05.865738926 -0800
>>> +++
>>> new/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11RSACipher.java
>>>
>>> 2014-12-04 15:39:05.685828917 -0800
>>> @@ -1,5 +1,5 @@
>>> /*
>>> - * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights
>>> reserved.
>>> + * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights
>>> reserved.
>>> * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
>>> *
>>> * This code is free software; you can redistribute it and/or modify it
>>> @@ -169,6 +169,7 @@
>>> }
>>>
>>> // see JCE spec
>>> + @SuppressWarnings("deprecation")
>>> protected void engineInit(int opmode, Key key,
>>> AlgorithmParameterSpec params, SecureRandom random)
>>> throws InvalidKeyException,
>>> InvalidAlgorithmParameterException {
>>> @@ -461,6 +462,7 @@
>>> }
>>>
>>> // see JCE spec
>>> + @SuppressWarnings("deprecation")
>>> protected Key engineUnwrap(byte[] wrappedKey, String algorithm,
>>> int type) throws InvalidKeyException,
>>> NoSuchAlgorithmException {
>>>
>>> ---
>>> old/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11Signature.java
>>>
>>> 2014-12-04 15:39:06.429456952 -0800
>>> +++
>>> new/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11Signature.java
>>>
>>> 2014-12-04 15:39:06.221560942 -0800
>>> @@ -765,12 +765,14 @@
>>> }
>>>
>>> // see JCA spec
>>> + @SuppressWarnings("deprecation")
>>> protected void engineSetParameter(String param, Object value)
>>> throws InvalidParameterException {
>>> throw new UnsupportedOperationException("setParameter() not
>>> supported");
>>> }
>>>
>>> // see JCA spec
>>> + @SuppressWarnings("deprecation")
>>> protected Object engineGetParameter(String param)
>>> throws InvalidParameterException {
>>> throw new UnsupportedOperationException("getParameter() not
>>> supported");
>>> ---
>>> old/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11TlsKeyMaterialGenerator.java
>>>
>>> 2014-12-04 15:39:06.989176978 -0800
>>> +++
>>> new/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11TlsKeyMaterialGenerator.java
>>>
>>> 2014-12-04 15:39:06.777282969 -0800
>>> @@ -1,5 +1,5 @@
>>> /*
>>> - * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights
>>> reserved.
>>> + * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights
>>> reserved.
>>> * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
>>> *
>>> * This code is free software; you can redistribute it and/or modify it
>>> @@ -62,6 +62,7 @@
>>> private long mechanism;
>>>
>>> // parameter spec
>>> + @SuppressWarnings("deprecation")
>>> private TlsKeyMaterialParameterSpec spec;
>>>
>>> // master secret as a P11Key
>>> @@ -82,6 +83,7 @@
>>> throw new InvalidParameterException(MSG);
>>> }
>>>
>>> + @SuppressWarnings("deprecation")
>>> protected void engineInit(AlgorithmParameterSpec params,
>>> SecureRandom random) throws
>>> InvalidAlgorithmParameterException {
>>> if (params instanceof TlsKeyMaterialParameterSpec == false) {
>>> @@ -107,6 +109,7 @@
>>> throw new InvalidParameterException(MSG);
>>> }
>>>
>>> + @SuppressWarnings("deprecation")
>>> protected SecretKey engineGenerateKey() {
>>> if (spec == null) {
>>> throw new IllegalStateException
>>> ---
>>> old/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11TlsMasterSecretGenerator.java
>>>
>>> 2014-12-04 15:39:07.540901004 -0800
>>> +++
>>> new/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11TlsMasterSecretGenerator.java
>>>
>>> 2014-12-04 15:39:07.337002994 -0800
>>> @@ -1,5 +1,5 @@
>>> /*
>>> - * Copyright (c) 2005, 2007, Oracle and/or its affiliates. All rights
>>> reserved.
>>> + * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights
>>> reserved.
>>> * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
>>> *
>>> * This code is free software; you can redistribute it and/or modify it
>>> @@ -57,6 +57,7 @@
>>> // mechanism id
>>> private long mechanism;
>>>
>>> + @SuppressWarnings("deprecation")
>>> private TlsMasterSecretParameterSpec spec;
>>> private P11Key p11Key;
>>>
>>> @@ -74,6 +75,7 @@
>>> throw new InvalidParameterException(MSG);
>>> }
>>>
>>> + @SuppressWarnings("deprecation")
>>> protected void engineInit(AlgorithmParameterSpec params,
>>> SecureRandom random) throws
>>> InvalidAlgorithmParameterException {
>>> if (params instanceof TlsMasterSecretParameterSpec == false) {
>>> ---
>>> old/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11TlsPrfGenerator.java
>>>
>>> 2014-12-04 15:39:08.068637029 -0800
>>> +++
>>> new/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11TlsPrfGenerator.java
>>>
>>> 2014-12-04 15:39:07.848747019 -0800
>>> @@ -1,5 +1,5 @@
>>> /*
>>> - * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights
>>> reserved.
>>> + * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights
>>> reserved.
>>> * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
>>> *
>>> * This code is free software; you can redistribute it and/or modify it
>>> @@ -63,6 +63,7 @@
>>> // mechanism id
>>> private final long mechanism;
>>>
>>> + @SuppressWarnings("deprecation")
>>> private TlsPrfParameterSpec spec;
>>>
>>> private P11Key p11Key;
>>> @@ -79,6 +80,7 @@
>>> throw new InvalidParameterException(MSG);
>>> }
>>>
>>> + @SuppressWarnings("deprecation")
>>> protected void engineInit(AlgorithmParameterSpec params,
>>> SecureRandom random) throws
>>> InvalidAlgorithmParameterException {
>>> if (params instanceof TlsPrfParameterSpec == false) {
>>> ---
>>> old/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11TlsRsaPremasterSecretGenerator.java
>>>
>>> 2014-12-04 15:39:08.672335057 -0800
>>> +++
>>> new/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/P11TlsRsaPremasterSecretGenerator.java
>>>
>>> 2014-12-04 15:39:08.480431048 -0800
>>> @@ -1,5 +1,5 @@
>>> /*
>>> - * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights
>>> reserved.
>>> + * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights
>>> reserved.
>>> * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
>>> *
>>> * This code is free software; you can redistribute it and/or modify it
>>> @@ -57,6 +57,7 @@
>>> // mechanism id
>>> private long mechanism;
>>>
>>> + @SuppressWarnings("deprecation")
>>> private TlsRsaPremasterSecretParameterSpec spec;
>>>
>>> P11TlsRsaPremasterSecretGenerator(Token token, String algorithm,
>>> long mechanism)
>>> @@ -71,6 +72,7 @@
>>> throw new InvalidParameterException(MSG);
>>> }
>>>
>>> + @SuppressWarnings("deprecation")
>>> protected void engineInit(AlgorithmParameterSpec params,
>>> SecureRandom random) throws
>>> InvalidAlgorithmParameterException {
>>> if (!(params instanceof TlsRsaPremasterSecretParameterSpec)) {
>>>
More information about the security-dev
mailing list