Changeset 1244 for trunk/src/org/expeditee/auth/Authenticator.java

Timestamp:

03/17/19 22:29:23 (5 years ago)

Author:

davidb

Message:

After change to have resources-public and resources-private, some changes needed to support running Expeditee for a single user; other main change is to allow FrameDirs to specify relative directory paths, to help with when Expeditee is run on the cloud -- similar work still needs to occurr for ImageDir and AudioDir; some other minor changes also made.

File:

• trunk/src/org/expeditee/auth/Authenticator.java (modified) (1 diff)

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

@@ -180 +180 @@
         }
         
-        final SecretKey getSecretKey(final String label, final String password) throws NoSuchAlgorithmException, KeyStoreException {            
-                final KeyStore.ProtectionParameter entryPassword = new KeyStore.PasswordProtection(password.toCharArray());
-                KeyStore.SecretKeyEntry entry = null;
+        final SecretKey getSecretKey(final String label, final String password) throws NoSuchAlgorithmException, KeyStoreException {    
+                
+                char[] password_ca = password.toCharArray();
+                final KeyStore.ProtectionParameter entryPassword = new KeyStore.PasswordProtection(password_ca);
+                
+                SecretKey secret_key;
                 try {
-                        entry = (SecretKeyEntry) keyStore.getEntry(label, entryPassword);
+                        SecretKeyEntry entry = (SecretKeyEntry) keyStore.getEntry(label, entryPassword);
+                        secret_key = entry.getSecretKey();
+                        
                 } catch (final UnrecoverableEntryException e) {
-                        entry = null;
-                }
-                if (entry == null) { return null; }
-                else { return entry.getSecretKey(); }
+                        secret_key = null;
+                }
+                
+                return secret_key;
         }