From cc328145806d21aa58f433db7774196972ac86a1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Felix=20D=C3=B6rre?= Date: Thu, 5 Nov 2015 14:23:57 +0100 Subject: [PATCH] fix: more leasurely decode pem (ignore whitespace) --- src/org/cacert/gigi/Launcher.java | 1 - src/org/cacert/gigi/util/PEM.java | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/org/cacert/gigi/Launcher.java b/src/org/cacert/gigi/Launcher.java index 5811be77..f5b65d73 100644 --- a/src/org/cacert/gigi/Launcher.java +++ b/src/org/cacert/gigi/Launcher.java @@ -69,7 +69,6 @@ public class Launcher { String proto = httpFields.getStringField("X-Real-Proto"); String cert = httpFields.getStringField("X-Client-Cert"); request.setSecure("https".equals(proto)); - System.out.println(request.isSecure()); request.setScheme(proto); if ( !"https".equals(proto)) { cert = null; diff --git a/src/org/cacert/gigi/util/PEM.java b/src/org/cacert/gigi/util/PEM.java index 049822c1..3be46531 100644 --- a/src/org/cacert/gigi/util/PEM.java +++ b/src/org/cacert/gigi/util/PEM.java @@ -14,9 +14,10 @@ public class PEM { } public static byte[] decode(String type, String data) { - data = data.replaceAll("-----BEGIN " + type + "-----", "").replace("\n", "").replace("\r", ""); + data = data.replaceAll("-----BEGIN " + type + "-----", ""); // Remove the first and last lines data = data.replaceAll("-----END " + type + "-----", ""); + data = data.replace("\n", "").replace("\r", "").replace(" ", "").replace("\t", ""); // Base64 decode the data return Base64.getDecoder().decode(data); -- 2.39.2