jdk-sandbox: comparison jdk/src/share/classes/javax/crypto/Cipher.java

equal deleted inserted replaced

-:3c7eda3ab2f5
+:0bb1999251f8
 package javax.crypto;
 import java.util.*;
 import java.util.regex.*;
-import static java.util.Locale.ENGLISH;
 import java.security.*;
 import java.security.Provider.Service;
 import java.security.spec.AlgorithmParameterSpec;
 import java.security.spec.InvalidParameterSpecException;
 import java.nio.ByteBuffer;
 import java.nio.ReadOnlyBufferException;
 import sun.security.util.Debug;
 import sun.security.jca.*;
-import sun.security.jca.GetInstance.Instance;
 /**
 * This class provides the functionality of a cryptographic cipher for
 * encryption and decryption. It forms the core of the Java Cryptographic
 * Extension (JCE) framework.
 // null once provider is selected
 private Service firstService;
 // remaining services to try in provider selection
 // null once provider is selected
-private Iterator serviceIterator;
+private Iterator<Service> serviceIterator;
 // list of transform Strings to lookup in the provider
-private List transforms;
+private List<Transform> transforms;
 private final Object lock;
 /**
 * Creates a Cipher object.
 this.cryptoPerm = CryptoAllPermission.INSTANCE;
 this.lock = null;
 }
 private Cipher(CipherSpi firstSpi, Service firstService,
-Iterator serviceIterator, String transformation, List transforms) {
+Iterator<Service> serviceIterator, String transformation,
+List<Transform> transforms) {
 this.firstSpi = firstSpi;
 this.firstService = firstService;
 this.serviceIterator = serviceIterator;
 this.transforms = transforms;
 this.transformation = transformation;
 return matches(regexp, value) ? S_YES : S_NO;
 }
 // Map<String,Pattern> for previously compiled patterns
 // XXX use ConcurrentHashMap once available
-private final static Map patternCache =
+private final static Map<String, Pattern> patternCache =
-Collections.synchronizedMap(new HashMap());
+Collections.synchronizedMap(new HashMap<String, Pattern>());
 private static boolean matches(String regexp, String str) {
-Pattern pattern = (Pattern)patternCache.get(regexp);
+Pattern pattern = patternCache.get(regexp);
 if (pattern == null) {
 pattern = Pattern.compile(regexp);
 patternCache.put(regexp, pattern);
 }
 return pattern.matcher(str.toUpperCase(Locale.ENGLISH)).matches();
 }
 }
-private static List getTransforms(String transformation)
+private static List<Transform> getTransforms(String transformation)
 throws NoSuchAlgorithmException {
 String[] parts = tokenizeTransformation(transformation);
 String alg = parts[0];
 String mode = parts[1];
 // DES
 Transform tr = new Transform(alg, "", null, null);
 return Collections.singletonList(tr);
 } else { // if ((mode != null) && (pad != null)) {
 // DES/CBC/PKCS5Padding
-List list = new ArrayList(4);
+List<Transform> list = new ArrayList<>(4);
 list.add(new Transform(alg, "/" + mode + "/" + pad, null, null));
 list.add(new Transform(alg, "/" + mode, null, pad));
 list.add(new Transform(alg, "//" + pad, mode, null));
 list.add(new Transform(alg, "", mode, pad));
 return list;
 }
 }
 // get the transform matching the specified service
-private static Transform getTransform(Service s, List transforms) {
+private static Transform getTransform(Service s,
+List<Transform> transforms) {
 String alg = s.getAlgorithm().toUpperCase(Locale.ENGLISH);
-for (Iterator t = transforms.iterator(); t.hasNext(); ) {
+for (Transform tr : transforms) {
-Transform tr = (Transform)t.next();
 if (alg.endsWith(tr.suffix)) {
 return tr;
 }
 }
 return null;
 * @see java.security.Provider
 */
 public static final Cipher getInstance(String transformation)
 throws NoSuchAlgorithmException, NoSuchPaddingException
 {
-List transforms = getTransforms(transformation);
+List<Transform> transforms = getTransforms(transformation);
-List cipherServices = new ArrayList(transforms.size());
+List<ServiceId> cipherServices = new ArrayList<>(transforms.size());
-for (Iterator t = transforms.iterator(); t.hasNext(); ) {
+for (Transform transform : transforms) {
-Transform transform = (Transform)t.next();
 cipherServices.add(new ServiceId("Cipher", transform.transform));
 }
-List services = GetInstance.getServices(cipherServices);
+List<Service> services = GetInstance.getServices(cipherServices);
 // make sure there is at least one service from a signed provider
 // and that it can use the specified mode and padding
-Iterator t = services.iterator();
+Iterator<Service> t = services.iterator();
 Exception failure = null;
 while (t.hasNext()) {
-Service s = (Service)t.next();
+Service s = t.next();
 if (JceSecurity.canUseProvider(s.getProvider()) == false) {
 continue;
 }
 Transform tr = getTransform(s, transforms);
 if (tr == null) {
 {
 if (provider == null) {
 throw new IllegalArgumentException("Missing provider");
 }
 Exception failure = null;
-List transforms = getTransforms(transformation);
+List<Transform> transforms = getTransforms(transformation);
 boolean providerChecked = false;
 String paddingError = null;
-for (Iterator t = transforms.iterator(); t.hasNext();) {
+for (Transform tr : transforms) {
-Transform tr = (Transform)t.next();
 Service s = provider.getService("Cipher", tr.transform);
 if (s == null) {
 continue;
 }
 if (providerChecked == false) {
 s = firstService;
 thisSpi = firstSpi;
 firstService = null;
 firstSpi = null;
 } else {
-s = (Service)serviceIterator.next();
+s = serviceIterator.next();
 thisSpi = null;
 }
 if (JceSecurity.canUseProvider(s.getProvider()) == false) {
 continue;
 }
 s = firstService;
 thisSpi = firstSpi;
 firstService = null;
 firstSpi = null;
 } else {
-s = (Service)serviceIterator.next();
+s = serviceIterator.next();
 thisSpi = null;
 }
 // if provider says it does not support this key, ignore it
 if (s.supportsParameter(key) == false) {
 continue;
 // type X.509.
 if (certificate instanceof java.security.cert.X509Certificate) {
 // Check whether the cert has a key usage extension
 // marked as a critical extension.
 X509Certificate cert = (X509Certificate)certificate;
-Set critSet = cert.getCriticalExtensionOIDs();
+Set<String> critSet = cert.getCriticalExtensionOIDs();
 if (critSet != null && !critSet.isEmpty()
 && critSet.contains(KEY_USAGE_EXTENSION_OID)) {
 boolean[] keyUsageInfo = cert.getKeyUsage();
 // keyUsageInfo[2] is for keyEncipherment;

changeset 10336	0bb1999251f8
parent 9275	1df1f7dfab7f
child 11671	60fdf1412864