8275918: Remove unused local variables in java.base security code

Reviewed-by: weijun

src/java.base/macosx/classes/apple/security/KeychainStore.java

@@ -945,7 +945,6 @@ public final class KeychainStore extends KeyStoreSpi {
             byte[] safeContentsData;
             ContentInfo safeContents;
             DerInputStream sci;
-            byte[] eAlgId = null;
 
             sci = new DerInputStream(safeContentsArray[i].toByteArray());
             safeContents = new ContentInfo(sci);
@@ -984,7 +983,6 @@ public final class KeychainStore extends KeyStoreSpi {
             ObjectIdentifier bagId;
             DerInputStream sbi;
             DerValue bagValue;
-            Object bagItem = null;
 
             sbi = safeBags[i].toDerInputStream();
             bagId = sbi.getOID();

src/java.base/share/classes/com/sun/crypto/provider/BlowfishCrypt.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2021, 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
@@ -64,7 +64,7 @@ final class BlowfishCrypt extends SymmetricCipher
             throw new InvalidKeyException("Key too long (> 448 bits)");
         }
         // Step 1: Init P and then S arrays from pi bytes
-        int i, j, count;
+        int i, j;
 
         System.arraycopy(pi, 0, p, 0, 18);
         System.arraycopy(pi, 18, s0, 0, 256);

src/java.base/share/classes/java/security/AccessControlContext.java

@@ -916,7 +916,6 @@ public final class AccessControlContext {
 
     private boolean containsAllLimits(AccessControlContext that) {
         boolean match = false;
-        Permission thisPerm;
 
         if (this.permissions == null && that.permissions == null)
             return true;

src/java.base/share/classes/sun/security/pkcs10/PKCS10.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2021, 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
@@ -141,7 +141,6 @@ public class PKCS10 {
         // Inner sequence:  version, name, key, attributes
         //
         BigInteger      serial;
-        DerValue        val;
 
         serial = seq[0].data.getBigInteger();
         if (!serial.equals(BigInteger.ZERO))

src/java.base/share/classes/sun/security/rsa/RSAPSSSignature.java

@@ -255,7 +255,6 @@ public class RSAPSSSignature extends SignatureSpi {
      * internal signature parameters.
      */
     private void isValid(RSAKey rsaKey) throws InvalidKeyException {
-        AlgorithmParameterSpec keyParams = rsaKey.getParams();
         // validate key parameters
         if (!isCompatible(rsaKey.getParams(), this.sigParams)) {
             throw new InvalidKeyException

src/java.base/share/classes/sun/security/rsa/RSAPrivateCrtKeyImpl.java

@@ -141,7 +141,7 @@ public final class RSAPrivateCrtKeyImpl
             BigInteger n, BigInteger e, BigInteger d,
             BigInteger p, BigInteger q, BigInteger pe, BigInteger qe,
             BigInteger coeff) throws InvalidKeyException {
-        RSAPrivateKey key;
+
         if ((e.signum() == 0) || (p.signum() == 0) ||
             (q.signum() == 0) || (pe.signum() == 0) ||
             (qe.signum() == 0) || (coeff.signum() == 0)) {

src/java.base/share/classes/sun/security/ssl/DHServerKeyExchange.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2021, 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
@@ -444,7 +444,6 @@ final class DHServerKeyExchange {
          */
         private void updateSignature(Signature sig, byte[] clntNonce,
                 byte[] svrNonce) throws SignatureException {
-            int tmp;
 
             sig.update(clntNonce);
             sig.update(svrNonce);

src/java.base/share/classes/sun/security/ssl/SSLEngineInputRecord.java

@@ -358,7 +358,6 @@ final class SSLEngineInputRecord extends InputRecord implements SSLRecord {
         // The packet should be a complete record.
         //
         int srcPos = packet.position();
-        int srcLim = packet.limit();
 
         byte firstByte = packet.get(srcPos);
         byte thirdByte = packet.get(srcPos + 2);

src/java.base/share/classes/sun/security/x509/CRLNumberExtension.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2021, 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
@@ -199,7 +199,6 @@ implements CertAttrSet<String> {
      * @exception IOException on encoding errors.
      */
     public void encode(OutputStream out) throws IOException {
-        DerOutputStream tmp = new DerOutputStream();
         encode(out, PKIXExtensions.CRLNumber_Id, true);
     }
 

src/java.base/share/classes/sun/security/x509/DeltaCRLIndicatorExtension.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2021, 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
@@ -28,9 +28,6 @@ package sun.security.x509;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.math.BigInteger;
-import java.util.Enumeration;
-
-import sun.security.util.*;
 
 /**
  * Represents the Delta CRL Indicator Extension.
@@ -80,7 +77,7 @@ public class DeltaCRLIndicatorExtension extends CRLNumberExtension {
     }
 
     /**
-     * Creates a delta CRL indictor extension with the BigInteger value .
+     * Creates a delta CRL indicator extension with the BigInteger value .
      * The criticality is set to true.
      *
      * @param crlNum the value to be set for the extension.
@@ -110,7 +107,6 @@ public class DeltaCRLIndicatorExtension extends CRLNumberExtension {
      * @exception IOException on encoding errors.
      */
     public void encode(OutputStream out) throws IOException {
-       DerOutputStream  tmp = new DerOutputStream();
         super.encode(out, PKIXExtensions.DeltaCRLIndicator_Id, true);
     }
 }

src/java.base/share/classes/sun/security/x509/GeneralSubtrees.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2021, 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
@@ -130,7 +130,7 @@ public class GeneralSubtrees implements Cloneable {
     /**
      * Encode the GeneralSubtrees.
      *
-     * @param out the DerOutputStrean to encode this object to.
+     * @param out the DerOutputStream to encode this object to.
      */
     public void encode(DerOutputStream out) throws IOException {
         DerOutputStream seq = new DerOutputStream();
@@ -346,7 +346,6 @@ public class GeneralSubtrees implements Cloneable {
         // same type in this.
         for (int i = 0; i < size(); i++) {
             GeneralNameInterface thisEntry = getGeneralNameInterface(i);
-            boolean removeThisEntry = false;
 
             // Step 3a: If the widest name of this type in other narrows
             // thisEntry, remove thisEntry and add widest other to newThis.

src/java.base/share/classes/sun/security/x509/X509CertInfo.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2021, 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
@@ -729,7 +729,6 @@ public class X509CertInfo implements CertAttrSet<String> {
                         "has no extensions");
             }
             SubjectAlternativeNameExtension subjectAltNameExt = null;
-            SubjectAlternativeNameExtension extValue = null;
             GeneralNames names = null;
             try {
                 subjectAltNameExt = (SubjectAlternativeNameExtension)

src/java.base/share/classes/sun/security/x509/X509Key.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2021, 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
@@ -27,7 +27,6 @@ package sun.security.x509;
 
 import java.io.*;
 import java.util.Arrays;
-import java.util.Properties;
 import java.security.Key;
 import java.security.PublicKey;
 import java.security.KeyFactory;
@@ -150,10 +149,10 @@ public class X509Key implements PublicKey {
      * this kind of key, a subclass is returned.  Otherwise, a generic
      * X509Key object is returned.
      *
-     * <P>This mechanism gurantees that keys (and algorithms) may be
+     * <P>This mechanism guarantees that keys (and algorithms) may be
      * freely manipulated and transferred, without risk of losing
      * information.  Also, when a key (or algorithm) needs some special
-     * handling, that specific need can be accomodated.
+     * handling, that specific need can be accommodated.
      *
      * @param in the DER-encoded SubjectPublicKeyInfo value
      * @exception IOException on data format errors
@@ -233,8 +232,6 @@ public class X509Key implements PublicKey {
          */
         String classname = "";
         try {
-            Properties props;
-            String keytype;
             Provider sunProvider;
 
             sunProvider = Security.getProvider("SUN");