From 782d01544ecc4ed6319c59e41cb1b73bb3eb4827 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Felix=20D=C3=B6rre?= Date: Sun, 22 Feb 2015 01:37:09 +0100 Subject: [PATCH] Fix: reliance on default charset in 3 more places. --- tests/org/cacert/gigi/api/IssueCert.java | 2 +- tests/org/cacert/gigi/email/TestSendmail.java | 2 +- util-testing/org/cacert/gigi/util/SimpleSigner.java | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/tests/org/cacert/gigi/api/IssueCert.java b/tests/org/cacert/gigi/api/IssueCert.java index 83a20a98..007edb56 100644 --- a/tests/org/cacert/gigi/api/IssueCert.java +++ b/tests/org/cacert/gigi/api/IssueCert.java @@ -42,7 +42,7 @@ public class IssueCert extends ClientTest { assertEquals(connection.getResponseCode(), 200); String cert = IOUtils.readURL(new InputStreamReader(connection.getInputStream(), "UTF-8")); CertificateFactory cf = CertificateFactory.getInstance("X509"); - Collection certs = cf.generateCertificates(new ByteArrayInputStream(cert.getBytes())); + Collection certs = cf.generateCertificates(new ByteArrayInputStream(cert.getBytes("UTF-8"))); assertEquals("a b", ((X500Name) ((X509Certificate) certs.iterator().next()).getSubjectDN()).getCommonName()); } } diff --git a/tests/org/cacert/gigi/email/TestSendmail.java b/tests/org/cacert/gigi/email/TestSendmail.java index 3b21541f..4c24701a 100644 --- a/tests/org/cacert/gigi/email/TestSendmail.java +++ b/tests/org/cacert/gigi/email/TestSendmail.java @@ -54,7 +54,7 @@ public class TestSendmail extends ConfiguredTest { Socket s = SSLSocketFactory.getDefault().createSocket(imap, 993); PrintWriter pw = new PrintWriter(new OutputStreamWriter(s.getOutputStream(), "UTF-8"), true); - BufferedReader br = new BufferedReader(new InputStreamReader(s.getInputStream())); + BufferedReader br = new BufferedReader(new InputStreamReader(s.getInputStream(), "UTF-8")); pw.println("a001 login " + imapuser + " " + pass); imapUntil(br, "a001"); pw.println("a002 select inbox"); diff --git a/util-testing/org/cacert/gigi/util/SimpleSigner.java b/util-testing/org/cacert/gigi/util/SimpleSigner.java index c6f4660f..c07067e5 100644 --- a/util-testing/org/cacert/gigi/util/SimpleSigner.java +++ b/util-testing/org/cacert/gigi/util/SimpleSigner.java @@ -3,9 +3,11 @@ package org.cacert.gigi.util; import java.io.BufferedReader; import java.io.File; import java.io.FileInputStream; +import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; +import java.io.OutputStreamWriter; import java.io.PrintWriter; import java.io.Reader; import java.math.BigInteger; @@ -236,7 +238,7 @@ public class SimpleSigner { GigiResultSet san = getSANSs.executeQuery(); File f = new File("keys", "SANFile" + System.currentTimeMillis() + (counter++) + ".cfg"); - PrintWriter cfg = new PrintWriter(f); + PrintWriter cfg = new PrintWriter(new OutputStreamWriter(new FileOutputStream(f), "UTF-8")); boolean first = true; while (san.next()) { if ( !first) { -- 2.39.2