diff --git a/sop-java/src/main/java/sop/Profile.java b/sop-java/src/main/java/sop/Profile.java index 801f748..4a981f4 100644 --- a/sop-java/src/main/java/sop/Profile.java +++ b/sop-java/src/main/java/sop/Profile.java @@ -4,7 +4,7 @@ package sop; -import java.nio.charset.Charset; +import sop.util.UTF8Util; /** * Tuple class bundling a profile name and description. @@ -77,6 +77,6 @@ public class Profile { */ private static boolean exceeds1000CharLineLimit(Profile profile) { String line = profile.toString(); - return line.getBytes(Charset.forName("UTF8")).length > 1000; + return line.getBytes(UTF8Util.UTF8).length > 1000; } } diff --git a/sop-java/src/main/java/sop/operation/AbstractSign.java b/sop-java/src/main/java/sop/operation/AbstractSign.java index 3f9d6fc..508d741 100644 --- a/sop-java/src/main/java/sop/operation/AbstractSign.java +++ b/sop-java/src/main/java/sop/operation/AbstractSign.java @@ -5,11 +5,11 @@ package sop.operation; import sop.exception.SOPGPException; +import sop.util.UTF8Util; import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; -import java.nio.charset.Charset; public interface AbstractSign { @@ -67,7 +67,7 @@ public interface AbstractSign { default T withKeyPassword(String password) throws SOPGPException.UnsupportedOption, SOPGPException.PasswordNotHumanReadable { - return withKeyPassword(password.getBytes(Charset.forName("UTF8"))); + return withKeyPassword(password.getBytes(UTF8Util.UTF8)); } /** diff --git a/sop-java/src/main/java/sop/operation/Decrypt.java b/sop-java/src/main/java/sop/operation/Decrypt.java index d695032..0123bbc 100644 --- a/sop-java/src/main/java/sop/operation/Decrypt.java +++ b/sop-java/src/main/java/sop/operation/Decrypt.java @@ -8,11 +8,11 @@ import sop.DecryptionResult; import sop.ReadyWithResult; import sop.SessionKey; import sop.exception.SOPGPException; +import sop.util.UTF8Util; import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; -import java.nio.charset.Charset; import java.util.Date; public interface Decrypt { @@ -138,7 +138,7 @@ public interface Decrypt { default Decrypt withKeyPassword(String password) throws SOPGPException.UnsupportedOption, SOPGPException.PasswordNotHumanReadable { - return withKeyPassword(password.getBytes(Charset.forName("UTF8"))); + return withKeyPassword(password.getBytes(UTF8Util.UTF8)); } /** diff --git a/sop-java/src/main/java/sop/operation/Encrypt.java b/sop-java/src/main/java/sop/operation/Encrypt.java index fed1210..b380d32 100644 --- a/sop-java/src/main/java/sop/operation/Encrypt.java +++ b/sop-java/src/main/java/sop/operation/Encrypt.java @@ -4,15 +4,15 @@ package sop.operation; -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.nio.charset.Charset; - import sop.Profile; import sop.Ready; import sop.enums.EncryptAs; import sop.exception.SOPGPException; +import sop.util.UTF8Util; + +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InputStream; public interface Encrypt { @@ -82,7 +82,7 @@ public interface Encrypt { default Encrypt withKeyPassword(String password) throws SOPGPException.PasswordNotHumanReadable, SOPGPException.UnsupportedOption { - return withKeyPassword(password.getBytes(Charset.forName("UTF8"))); + return withKeyPassword(password.getBytes(UTF8Util.UTF8)); } /**