Changeset 1253 for trunk

Timestamp:

03/18/19 14:10:09 (5 years ago)

Author:

bln4

Message:

 

File:

• trunk/src/org/expeditee/auth/Authenticator.java (modified) (2 diffs)

trunk/src/org/expeditee/auth/Authenticator.java

@@ -83 +83 @@
         
         private Authenticator() throws KeyStoreException, FileNotFoundException, IOException, NoSuchAlgorithmException, CertificateException, ClassNotFoundException, SQLException {
-                
                 try {
                         keyStore = KeyStore.getInstance(KeystoreType, "SunJSSE");
@@ -192 +191 @@
                 
                 char[] password_ca = password.toCharArray();
-                final KeyStore.ProtectionParameter entryPassword = new KeyStore.PasswordProtection(password_ca);
+                //final KeyStore.ProtectionParameter entryPassword = new KeyStore.PasswordProtection(password_ca);
                 
                 SecretKey secret_key;
                 try {
-                        SecretKeyEntry entry = (SecretKeyEntry) keyStore.getEntry(label, entryPassword);
-                        secret_key = entry.getSecretKey();
-                        
+                        //SecretKeyEntry entry = (SecretKeyEntry) keyStore.getEntry(label, entryPassword);
+                        //secret_key = entry.getSecretKey();
+                        secret_key = (SecretKey) keyStore.getKey(label, password_ca);                   
                 } catch (final UnrecoverableEntryException e) {
                         secret_key = null;