From 6bc8d84e4b0527f680b78a9a0c808cda74d4933d Mon Sep 17 00:00:00 2001
From: Andrew John Hughes <gnu_andrew@member.fsf.org>
Date: Fri, 19 Jun 2015 16:04:59 +0100
Subject: Mention PR66376.

2015-06-19  Andrew John Hughes  <gnu_andrew@member.fsf.org>

	* NEWS: Mention PR66376.
---
 gnu/javax/net/ssl/PrivateCredentials.java | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

(limited to 'gnu/javax/net/ssl/PrivateCredentials.java')

diff --git a/gnu/javax/net/ssl/PrivateCredentials.java b/gnu/javax/net/ssl/PrivateCredentials.java
index 7fff253dd..9da9e7eba 100644
--- a/gnu/javax/net/ssl/PrivateCredentials.java
+++ b/gnu/javax/net/ssl/PrivateCredentials.java
@@ -1,5 +1,5 @@
 /* PrivateCredentials.java -- private key/certificate pairs.
-   Copyright (C) 2006, 2007  Free Software Foundation, Inc.
+   Copyright (C) 2006, 2007, 2015  Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
 
@@ -118,7 +118,7 @@ public class PrivateCredentials implements ManagerFactoryParameters
   {
     CertificateFactory cf = CertificateFactory.getInstance("X.509");
     Collection<? extends Certificate> certs = cf.generateCertificates(certChain);
-    X509Certificate[] chain = (X509Certificate[]) certs.toArray(new X509Certificate[0]);
+    X509Certificate[] chain = certs.toArray(new X509Certificate[certs.size()]);
 
     String alg = null;
     String line = readLine(privateKey);
@@ -234,9 +234,9 @@ public class PrivateCredentials implements ManagerFactoryParameters
   // Own methods.
   // -------------------------------------------------------------------------
 
-  private String readLine(InputStream in) throws IOException
+  private static String readLine(InputStream in) throws IOException
   {
-    boolean eol_is_cr = System.getProperty("line.separator").equals("\r");
+    boolean eolIsCR = System.getProperty("line.separator").equals("\r");
     CPStringBuilder str = new CPStringBuilder();
     while (true)
       {
@@ -245,12 +245,11 @@ public class PrivateCredentials implements ManagerFactoryParameters
           {
             if (str.length() > 0)
               break;
-            else
-              return null;
+	    return null;
           }
         else if (i == '\r')
           {
-            if (eol_is_cr)
+            if (eolIsCR)
               break;
           }
         else if (i == '\n')
@@ -269,7 +268,7 @@ public class PrivateCredentials implements ManagerFactoryParameters
     if (cipher.equals("DES-EDE3-CBC"))
       {
         mode = ModeFactory.getInstance("CBC", "TripleDES", 8);
-        HashMap attr = new HashMap();
+        HashMap<String,Object> attr = new HashMap<String,Object>();
         attr.put(IMode.KEY_MATERIAL, deriveKey(salt, 24));
         attr.put(IMode.IV, salt);
         attr.put(IMode.STATE, new Integer(IMode.DECRYPTION));
@@ -278,7 +277,7 @@ public class PrivateCredentials implements ManagerFactoryParameters
     else if (cipher.equals("DES-CBC"))
       {
         mode = ModeFactory.getInstance("CBC", "DES", 8);
-        HashMap attr = new HashMap();
+        HashMap<String,Object> attr = new HashMap<String,Object>();
         attr.put(IMode.KEY_MATERIAL, deriveKey(salt, 8));
         attr.put(IMode.IV, salt);
         attr.put(IMode.STATE, new Integer(IMode.DECRYPTION));
@@ -304,13 +303,13 @@ public class PrivateCredentials implements ManagerFactoryParameters
     return result;
   }
 
-  private byte[] deriveKey(byte[] salt, int keylen)
+  private static byte[] deriveKey(byte[] salt, int keylen)
     throws IOException
   {
     CallbackHandler passwordHandler = new ConsoleCallbackHandler();
     try
       {
-        Class c = Class.forName(Security.getProperty("jessie.password.handler"));
+        Class<?> c = Class.forName(Security.getProperty("jessie.password.handler"));
         passwordHandler = (CallbackHandler) c.newInstance();
       }
     catch (Exception x) { }
@@ -348,7 +347,7 @@ public class PrivateCredentials implements ManagerFactoryParameters
     return key;
   }
 
-  private byte[] toByteArray(String hex)
+  private static byte[] toByteArray(String hex)
   {
     hex = hex.toLowerCase();
     byte[] buf = new byte[hex.length() / 2];
-- 
cgit v1.2.1