stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8022443: Fix lint warnings in sun.security.pkcs12

Browse Source 
Reviewed-by: darcy
This commit is contained in:
Jason Uh 2013-08-06 14:10:06 -07:00
parent ebb9d2fb06
commit 6ecdd925d1
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
jdk/src/share/classes/sun/security/pkcs12/PKCS12KeyStore.java
View File

@ -775,7 +775,7 @@ public final class PKCS12KeyStore extends KeyStoreSpi {
}
}
if (params != null) {
if (algorithm.equals(pbes2_OID)) {
if (algorithm.equals((Object)pbes2_OID)) {
algParams = AlgorithmParameters.getInstance("PBES2");
} else {
algParams = AlgorithmParameters.getInstance("PBE");
@ -912,7 +912,7 @@ public final class PKCS12KeyStore extends KeyStoreSpi {
private static String mapPBEParamsToAlgorithm(ObjectIdentifier algorithm,
AlgorithmParameters algParams) throws NoSuchAlgorithmException {
// Check for PBES2 algorithms
if (algorithm.equals(pbes2_OID) && algParams != null) {
if (algorithm.equals((Object)pbes2_OID) && algParams != null) {
return algParams.toString();
}
return algorithm.toString();
@ -1921,7 +1921,7 @@ public final class PKCS12KeyStore extends KeyStoreSpi {
}
safeContentsData = safeContents.getData();
} else if (contentType.equals(ContentInfo.ENCRYPTED_DATA_OID)) {
} else if (contentType.equals((Object)ContentInfo.ENCRYPTED_DATA_OID)) {
if (password == null) {
continue;
}