enable direct output of smime file

Author: huehnerhose

writeto.go

@@ -24,22 +24,14 @@ func (m *Message) WriteTo(w io.Writer) (n int64, err error) {
 		if n, encErr := messageEncryptionWriter.writeMessage(m); encErr != nil {
 			return n, encErr
 		}
-		// wt, _ := pgp.Encrypt(&b, []string{"foo@bar.de"}, mockPublicProvider)
-		// wt.WriteTo(os.Stdout)
 
 		s, err := m.protectionWriter.GetEncryptedString()
 		if err != nil {
 			return 0, err
 		}
 
-		// create envelope
-		envelope := NewMessage()
-		envelope.SetHeaders(m.header)
-		envelope.SetProtocol(m.protocol)
-		envelope.SetControlPart(m.protocol, m.controlBody)
-		envelope.SetProtectedPart(m.protectionType, s)
-
-		return mw.writeMessage(envelope)
+		n, err := w.Write([]byte(s))
+		return int64(n), nil
 	}
 
 	return mw.writeMessage(m)
@@ -54,7 +46,7 @@ func (w *messageWriter) writeMessage(m *Message) (int64, error) {
 	}
 	w.writeHeaders(m.header)
 
-	if m.isSetProtocol() && !m.isSecuredMIME() { // fetch the enveloped case
+	if m.isSetProtocol() { // fetch the enveloped case
 		mime := fmt.Sprintf("encrypted;\r\n protocol=\"%s\"", m.protocol)
 		w.openMultipart(mime, m.boundary)