X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.util%2Fsrc%2Forg%2Fargeo%2Futil%2FPasswordEncryption.java;h=c95c7879ef3f1225b438f11e5c8f8c718c58c908;hb=986233dff943b24e545caecaa4658639c36172eb;hp=a026bed22a36e5356a8033b85e1732e21174e092;hpb=0b15752581b8fffd1913478240b63327781ec32a;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.util/src/org/argeo/util/PasswordEncryption.java b/org.argeo.util/src/org/argeo/util/PasswordEncryption.java
index a026bed22..c95c7879e 100644
--- a/org.argeo.util/src/org/argeo/util/PasswordEncryption.java
+++ b/org.argeo.util/src/org/argeo/util/PasswordEncryption.java
@@ -5,6 +5,8 @@ import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.security.GeneralSecurityException;
 import java.security.InvalidKeyException;
 import java.security.Key;
@@ -26,7 +28,8 @@ public class PasswordEncryption {
 	public final static String DEFAULT_SECRETE_KEY_FACTORY = "PBKDF2WithHmacSHA1";
 	public final static String DEFAULT_SECRETE_KEY_ENCRYPTION = "AES";
 	public final static String DEFAULT_CIPHER_NAME = "AES/CBC/PKCS5Padding";
-	public final static String DEFAULT_CHARSET = "UTF-8";
+//	public final static String DEFAULT_CHARSET = "UTF-8";
+	public final static Charset DEFAULT_CHARSET = StandardCharsets.UTF_8;
 
 	private Integer iterationCount = DEFAULT_ITERATION_COUNT;
 	private Integer secreteKeyLength = DEFAULT_SECRETE_KEY_LENGTH;
@@ -68,11 +71,11 @@ public class PasswordEncryption {
 					+ " secrete key length instead of " + previousSecreteKeyLength);
 			try {
 				initKeyAndCiphers(password, passwordSalt, initializationVector);
-			} catch (Exception e1) {
-				throw new UtilsException("Cannot get secret key (with restricted length)", e1);
+			} catch (GeneralSecurityException e1) {
+				throw new IllegalStateException("Cannot get secret key (with restricted length)", e1);
 			}
-		} catch (Exception e) {
-			throw new UtilsException("Cannot get secret key", e);
+		} catch (GeneralSecurityException e) {
+			throw new IllegalStateException("Cannot get secret key", e);
 		}
 	}
 
@@ -110,8 +113,6 @@ public class PasswordEncryption {
 			StreamUtils.closeQuietly(out);
 		} catch (IOException e) {
 			throw e;
-		} catch (Exception e) {
-			throw new UtilsException("Cannot encrypt", e);
 		} finally {
 			StreamUtils.closeQuietly(decryptedIn);
 		}
@@ -123,8 +124,6 @@ public class PasswordEncryption {
 			StreamUtils.copy(decryptedIn, decryptedOut);
 		} catch (IOException e) {
 			throw e;
-		} catch (Exception e) {
-			throw new UtilsException("Cannot decrypt", e);
 		} finally {
 			StreamUtils.closeQuietly(encryptedIn);
 		}
@@ -138,8 +137,8 @@ public class PasswordEncryption {
 			in = new ByteArrayInputStream(str.getBytes(DEFAULT_CHARSET));
 			encrypt(in, out);
 			return out.toByteArray();
-		} catch (Exception e) {
-			throw new UtilsException("Cannot encrypt", e);
+		} catch (IOException e) {
+			throw new RuntimeException(e);
 		} finally {
 			StreamUtils.closeQuietly(out);
 		}
@@ -152,8 +151,8 @@ public class PasswordEncryption {
 			out = new ByteArrayOutputStream();
 			decrypt(in, out);
 			return new String(out.toByteArray(), DEFAULT_CHARSET);
-		} catch (Exception e) {
-			throw new UtilsException("Cannot decrypt", e);
+		} catch (IOException e) {
+			throw new RuntimeException(e);
 		} finally {
 			StreamUtils.closeQuietly(out);
 		}