X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2Fcrypto%2FSMIME.java;h=2ca455c173621ef8ca7e6836e2d960e65ce7078f;hb=ed391f95fa080212a1bec06afd0e0fd0dbb213bb;hp=f37fbe8a17b428202430fcb27dc5a5bc5acde764;hpb=ec24cf6925bb3729a644580ad4a9375d05883c62;p=gigi.git diff --git a/src/org/cacert/gigi/crypto/SMIME.java b/src/org/cacert/gigi/crypto/SMIME.java index f37fbe8a..2ca455c1 100644 --- a/src/org/cacert/gigi/crypto/SMIME.java +++ b/src/org/cacert/gigi/crypto/SMIME.java @@ -62,11 +62,11 @@ public class SMIME { // Create PKCS7 Signed data PKCS7 p7 = new PKCS7(new AlgorithmId[] { - new AlgorithmId(AlgorithmId.SHA_oid) + new AlgorithmId(AlgorithmId.SHA_oid) }, cInfo, new java.security.cert.X509Certificate[] { - c + c }, new SignerInfo[] { - sInfo + sInfo }); ByteArrayOutputStream bOut = new DerOutputStream(); @@ -79,21 +79,21 @@ public class SMIME { private static void mimeEncode(String contents, String signature, PrintWriter to) { String boundary = generateBoundary(contents, null); - to.println("MIME-Version: 1.0"); - to.println("Content-Type: multipart/signed; protocol=\"application/x-pkcs7-signature\"; micalg=\"sha1\"; boundary=\"" + boundary + "\""); - to.println(""); - to.println("This is an S/MIME signed message"); - to.println(""); - to.println("--" + boundary); - to.println(contents); - to.println("--" + boundary); - to.println("Content-Type: application/x-pkcs7-signature; name=\"smime.p7s\""); - to.println("Content-Transfer-Encoding: base64"); - to.println("Content-Disposition: attachment; filename=\"smime.p7s\""); - to.println(""); - to.println(signature); - to.println(); - to.println("--" + boundary + "--"); + to.print("MIME-Version: 1.0\r\n"); + to.print("Content-Type: multipart/signed; protocol=\"application/x-pkcs7-signature\"; micalg=\"sha1\"; boundary=\"" + boundary + "\"\r\n"); + to.print("\r\n"); + to.print("This is an S/MIME signed message\r\n"); + to.print("\r\n"); + to.print("--" + boundary + "\r\n"); + to.print(contents + "\r\n"); + to.print("--" + boundary + "\r\n"); + to.print("Content-Type: application/x-pkcs7-signature; name=\"smime.p7s\"\r\n"); + to.print("Content-Transfer-Encoding: base64\r\n"); + to.print("Content-Disposition: attachment; filename=\"smime.p7s\"\r\n"); + to.print("\r\n"); + to.print(signature + "\r\n"); + to.print("\r\n"); + to.print("--" + boundary + "--\r\n"); } private static String generateBoundary(String contents, String contents2) {