Changeset 3394 for branches/2.2/security/ExpressoCert/src/br/gov/serpro/cert

Timestamp:

10/21/10 15:52:45 (14 years ago)

Author:

rafaelraymundo

Message:

Ticket #1265 - Tratamento de mensagens encapsuladas do Outlook.

File:

• branches/2.2/security/ExpressoCert/src/br/gov/serpro/cert/DigitalCertificate.java (modified) (2 diffs)

branches/2.2/security/ExpressoCert/src/br/gov/serpro/cert/DigitalCertificate.java

@@ -55 +55 @@
 import br.gov.serpro.ui.DialogBuilder;
 import br.gov.serpro.util.Base64Utils;
-import com.sun.mail.util.BASE64DecoderStream;
-import java.io.InputStreamReader;
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
-import java.io.PipedInputStream;
-import java.io.PipedOutputStream;
 import java.security.AlgorithmParameters;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 import javax.activation.CommandMap;
 import javax.activation.MailcapCommandMap;
-import javax.mail.BodyPart;
 import javax.mail.internet.ContentType;
 import javax.mail.internet.MimeUtility;
 import javax.mail.internet.PreencodedMimeBodyPart;
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.DERObject;
 import org.bouncycastle.cms.CMSException;
 import org.bouncycastle.cms.RecipientId;
@@ -623 +618 @@
             }
 
+            // Corrige problemas com e-mails vindos do Outlook
+            // Corrige linhas que são terminadas por \n (\x0A) e deveriam ser terminadas por \r\n (\x0D\x0A)
+            Pattern p = Pattern.compile("(?<!\\r)\\n");
+            Matcher matcher = p.matcher(retorno);
+            retorno = matcher.replaceAll(CRLF);
+
             return retorno;
         } else {