add: rate limit for Login (+check Signup Limit earlier)

[gigi.git] / src / org / cacert / gigi / crypto / SMIME.java

diff --git a/src/org/cacert/gigi/crypto/SMIME.java b/src/org/cacert/gigi/crypto/SMIME.java
index f3ac0f766b6f00e9eff6960abdf675f592e0f9ff..f37fbe8a17b428202430fcb27dc5a5bc5acde764 100644 (file)
--- a/src/org/cacert/gigi/crypto/SMIME.java
+++ b/src/org/cacert/gigi/crypto/SMIME.java
@@ -8,9 +8,10 @@ import java.security.GeneralSecurityException;
 import java.security.PrivateKey;
 import java.security.Signature;
 import java.security.cert.X509Certificate;
-import java.util.Base64;
 import java.util.Random;
 
+import org.cacert.gigi.util.PEM;
+
 import sun.security.pkcs.ContentInfo;
 import sun.security.pkcs.PKCS7;
 import sun.security.pkcs.SignerInfo;
@@ -71,10 +72,10 @@ public class SMIME {
         ByteArrayOutputStream bOut = new DerOutputStream();
         p7.encodeSignedData(bOut);
 
-        mimeEncode(contents, Base64.getEncoder().encodeToString(bOut.toByteArray()).replaceAll("(.{64})(?=.)", "$1\n"), to);
+        mimeEncode(contents, PEM.formatBase64(bOut.toByteArray()), to);
     }
 
-    static Random r = new Random();
+    private static Random r = new Random();
 
     private static void mimeEncode(String contents, String signature, PrintWriter to) {
         String boundary = generateBoundary(contents, null);