fix: more leasurely decode pem (ignore whitespace)

diff --git a/src/org/cacert/gigi/Launcher.java b/src/org/cacert/gigi/Launcher.java
index 5811be77f5b00dc7a12ab30adcb2c5933b323c3e..f5b65d73c64d0527ca7526a1803ae12410e5cfdb 100644 (file)
--- 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 049822c1b5eabcb306624e86e816101812bce446..3be46531dc93bf9d26740399c6e3aa311a47a2ce 100644 (file)
--- 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);