Skip to content

Commit 285eb80

Browse files
author
gefeili
committed
Remove warning
1 parent 6dd785d commit 285eb80

6 files changed

Lines changed: 12 additions & 11 deletions

File tree

pgsc/src/main/java/org/bouncycastle/openpgp/smartcard/yubikey/YubikeySmartCardBackend.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -227,6 +227,7 @@ PublicKeyValues convertPublicKey(PGPPublicKey pgpPublicKey)
227227
* @throws NoSuchAlgorithmException if no Provider supports an implementation for the PublicKeyValues algorithm
228228
* @throws InvalidKeySpecException if the PublicKeyValues specification is inappropriate to produce a public key
229229
*/
230+
@SuppressWarnings("deprecation")
230231
public PGPPublicKey convertPublicKey(PublicKeyValues pkVal,
231232
byte[] storedFingerprint,
232233
Date creationTime)

prov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/edec/EdDSAKeys.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ static AsymmetricKeyParameter generatePublicKeyParameter(PublicKey key)
7070
* when the request is not one this JDK version bridges - the caller then falls through to
7171
* its own handling.
7272
*/
73-
static KeySpec getKeySpec(Key key, Class spec)
73+
static KeySpec getKeySpec(Key key, Class<?> spec)
7474
throws InvalidKeySpecException
7575
{
7676
return null;

prov/src/main/java/org/bouncycastle/jcajce/util/SpecUtil.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ public class SpecUtil
1212

1313
public static String getNameFrom(final AlgorithmParameterSpec paramSpec)
1414
{
15-
return (String)AccessController.doPrivileged(new PrivilegedAction()
15+
return (String)AccessController.doPrivileged(new PrivilegedAction<Object>()
1616
{
1717
public Object run()
1818
{
@@ -34,7 +34,7 @@ public Object run()
3434

3535
public static byte[] getContextFrom(final AlgorithmParameterSpec paramSpec)
3636
{
37-
return (byte[])AccessController.doPrivileged(new PrivilegedAction()
37+
return (byte[])AccessController.doPrivileged(new PrivilegedAction<Object>()
3838
{
3939
public Object run()
4040
{

prov/src/main/jdk1.11/org/bouncycastle/jcajce/util/SpecUtil.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public static String getNameFrom(final AlgorithmParameterSpec paramSpec)
1818
return ((NamedParameterSpec)paramSpec).getName();
1919
}
2020

21-
return (String)AccessController.doPrivileged(new PrivilegedAction()
21+
return (String)AccessController.doPrivileged(new PrivilegedAction<Object>()
2222
{
2323
public Object run()
2424
{
@@ -40,7 +40,7 @@ public Object run()
4040

4141
public static byte[] getContextFrom(final AlgorithmParameterSpec paramSpec)
4242
{
43-
return (byte[])AccessController.doPrivileged(new PrivilegedAction()
43+
return (byte[])AccessController.doPrivileged(new PrivilegedAction<Object>()
4444
{
4545
public Object run()
4646
{

prov/src/main/jdk1.15/org/bouncycastle/jcajce/provider/asymmetric/edec/EdDSAKeys.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ static AsymmetricKeyParameter generatePublicKeyParameter(PublicKey key)
171171
* Return a KeySpec for a version-specific spec type - here the JDK 15+ EdEC key specs -
172172
* or null when the request is not one this JDK version bridges.
173173
*/
174-
static KeySpec getKeySpec(Key key, Class spec)
174+
static KeySpec getKeySpec(Key key, Class<?> spec)
175175
throws InvalidKeySpecException
176176
{
177177
if (spec.isAssignableFrom(EdECPrivateKeySpec.class))

test/src/main/java/org/bouncycastle/test/est/examples/ExampleUtils.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
public class ExampleUtils
6363
{
6464

65-
private static Map algIds = new HashMap();
65+
private static Map<String, AlgorithmIdentifier> algIds = new HashMap<String, AlgorithmIdentifier>();
6666

6767
static
6868
{
@@ -232,7 +232,7 @@ public static X509Certificate createASignedCert(
232232
certGen.setSubject(subjectDN);
233233
certGen.setStartDate(new Time(new Date(time - 24 * 60 * 60000)));
234234
certGen.setEndDate(new Time(new Date(time + 30 * 60 * 60000)));
235-
certGen.setSignature((AlgorithmIdentifier)algIds.get(sigName));
235+
certGen.setSignature(algIds.get(sigName));
236236
certGen.setSubjectPublicKeyInfo(subjectPublicKeyInfo);
237237
certGen.setExtensions(extGenerator.generate());
238238

@@ -248,7 +248,7 @@ public static X509Certificate createASignedCert(
248248
ASN1EncodableVector v = new ASN1EncodableVector();
249249

250250
v.add(tbsCert);
251-
v.add((AlgorithmIdentifier)algIds.get(sigName));
251+
v.add(algIds.get(sigName));
252252
v.add(new DERBitString(sig.sign()));
253253

254254
return (X509Certificate)
@@ -291,7 +291,7 @@ public static X509Certificate createSelfsignedCert(
291291
certGen.setSubject(subjectDN);
292292
certGen.setStartDate(new Time(new Date(time - 24 * 60 * 60000)));
293293
certGen.setEndDate(new Time(new Date(time + 30 * 60 * 60000)));
294-
certGen.setSignature((AlgorithmIdentifier)algIds.get(sigName));
294+
certGen.setSignature(algIds.get(sigName));
295295
certGen.setSubjectPublicKeyInfo(subjectPublicKeyInfo);
296296

297297

@@ -306,7 +306,7 @@ public static X509Certificate createSelfsignedCert(
306306
ASN1EncodableVector v = new ASN1EncodableVector();
307307

308308
v.add(tbsCert);
309-
v.add((AlgorithmIdentifier)algIds.get(sigName));
309+
v.add(algIds.get(sigName));
310310
v.add(new DERBitString(sig.sign()));
311311

312312
return (X509Certificate)

0 commit comments

Comments
 (0)