Alon Bar-Lev has uploaded a new change for review. Change subject: pki: cleanup: Found reliance on default encoding ......................................................................
pki: cleanup: Found reliance on default encoding Change-Id: Id561cc7e04301ef92000f66301a7cb81713cdde1 Signed-off-by: Alon Bar-Lev <[email protected]> --- M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/crypt/EncryptionUtils.java M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/hostinstall/OpenSslCAWrapper.java 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/12/13512/1 diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/crypt/EncryptionUtils.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/crypt/EncryptionUtils.java index f683b86..824333e 100644 --- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/crypt/EncryptionUtils.java +++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/crypt/EncryptionUtils.java @@ -227,7 +227,7 @@ if (keyMaterial == null || "".equals(keyMaterial)) { secretKey = new SecretKeySpec("jaas is the way".getBytes(Charset.forName("UTF-8")), this.algorithm); } else { - secretKey = new SecretKeySpec(keyMaterial.getBytes(), this.algorithm); + secretKey = new SecretKeySpec(keyMaterial.getBytes(Charset.forName("UTF-8")), this.algorithm); } } } diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/hostinstall/OpenSslCAWrapper.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/hostinstall/OpenSslCAWrapper.java index 7ef6c70..d303442 100644 --- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/hostinstall/OpenSslCAWrapper.java +++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/hostinstall/OpenSslCAWrapper.java @@ -142,7 +142,7 @@ log.debug("Running Sign Certificate request script"); Process process = getRuntime().exec(command_array); stdOutput = new BufferedReader(new InputStreamReader(process.getInputStream(), Charset.forName("UTF-8"))); - stdError = new BufferedReader(new InputStreamReader(process.getErrorStream())); + stdError = new BufferedReader(new InputStreamReader(process.getErrorStream(), Charset.forName("UTF-8"))); int exitCode = 0; boolean completed = false; for (int x = 0; x < signatureTimeout; x++) { -- To view, visit http://gerrit.ovirt.org/13512 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id561cc7e04301ef92000f66301a7cb81713cdde1 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alon Bar-Lev <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
