From: Felix Dörre <felix@dogcraft.de>
Date: Wed, 21 Sep 2016 11:22:21 +0000 (+0200)
Subject: fix: S/MIME signature
X-Git-Url: https://code.wpia.club/?p=gigi.git;a=commitdiff_plain;h=62e4773810a8c9a028cfc5b9fdb83dfb13cdfa2d

fix: S/MIME signature

See https://tools.ietf.org/html/rfc5751#section-3.1.1 for reference.

Change-Id: I9fcd558182395ec83cadb42c0d2bc5c785d49864
---

diff --git a/src/org/cacert/gigi/crypto/SMIME.java b/src/org/cacert/gigi/crypto/SMIME.java
index 2ca455c1..de39f5a1 100644
--- a/src/org/cacert/gigi/crypto/SMIME.java
+++ b/src/org/cacert/gigi/crypto/SMIME.java
@@ -45,6 +45,7 @@ public class SMIME {
     }
 
     public static void smime(String contents, PrivateKey pKey, X509Certificate c, PrintWriter to) throws IOException, GeneralSecurityException {
+        contents = normalizeNewlinesToCRLF(contents);
 
         Signature signature = Signature.getInstance("SHA1WithRSA");
         signature.initSign(pKey);
@@ -75,6 +76,10 @@ public class SMIME {
         mimeEncode(contents, PEM.formatBase64(bOut.toByteArray()), to);
     }
 
+    private static String normalizeNewlinesToCRLF(String contents) {
+        return contents.replace("\r\n", "\r").replace("\r", "\n").replace("\n", "\r\n");
+    }
+
     private static Random r = new Random();
 
     private static void mimeEncode(String contents, String signature, PrintWriter to) {