Support decrypting a server CA certificate so we can get its expiration (valid-before...

[moonshot-ui.git] / src / moonshot-provisioning-common.vala

diff --git a/src/moonshot-provisioning-common.vala b/src/moonshot-provisioning-common.vala
index 87d7630..b18cd8b 100644 (file)
--- a/src/moonshot-provisioning-common.vala
+++ b/src/moonshot-provisioning-common.vala
@@ -238,8 +238,16 @@ namespace WebProvisioning
             {
                 var dis = new DataInputStream(file.read());
                 string line;
-                while ((line = dis.read_line(null)) != null)
+                while ((line = dis.read_line(null)) != null) {
                     text += line;
+
+                    // Preserve newlines -- important for certificate import.
+                    // (X509 certs can't be parsed without the newlines.)
+                    // 
+                    // This may add an extra newline at EOF. Maybe use
+                    // dis.read_upto("\n", ...) followed by dis.read_byte() instead?
+                    text += "\n";
+                }
             }
             catch(GLib.Error e)
             {