Merge 4b60557518 into 65a91a2711

msgwriter.go

@@ -138,10 +138,6 @@ func (mw *msgWriter) writeMsg(msg *Msg) {
 	if msg.hasMixed() {
 		mw.stopMP()
 	}
-
-	if msg.hasSMime() {
-		mw.stopMP()
-	}
 }
 
 // writeGenHeader writes out all generic headers to the msgWriter
@@ -345,7 +341,7 @@ func (mw *msgWriter) writeBody(writeFunc func(io.Writer) (int64, error), encodin
 		encodedWriter = quotedprintable.NewWriter(&writeBuffer)
 	} else if encoding == EncodingB64 && !singingWithSMime {
 		encodedWriter = base64.NewEncoder(base64.StdEncoding, &lineBreaker)
-	} else if encoding == NoEncoding || singingWithSMime {
+	} else if encoding == NoEncoding {
 		_, err = writeFunc(&writeBuffer)
 		if err != nil {
 			mw.err = fmt.Errorf("bodyWriter function: %w", err)

sime.go

@@ -16,9 +16,6 @@ var (
 	// ErrInvalidKeyPair should be used if key pair is invalid
 	ErrInvalidKeyPair = errors.New("invalid key pair")
 
-	// ErrInvalidCertificate should be used if a certificate is invalid
-	ErrInvalidCertificate = errors.New("invalid certificate")
-
 	// ErrCouldNotInitialize should be used if the signed data could not initialize
 	ErrCouldNotInitialize = errors.New("could not initialize signed data")
 
@@ -49,7 +46,7 @@ func newSMime(keyPair *tls.Certificate) (*SMime, error) {
 	for _, cert := range keyPair.Certificate[1:] {
 		c, err := x509.ParseCertificate(cert)
 		if err != nil {
-			return nil, ErrInvalidCertificate
+			return nil, err
 		}
 		parentCertificates = append(parentCertificates, c)
 	}
@@ -105,10 +102,8 @@ func encodeToPEM(msg []byte) (*string, error) {
 	}
 
 	r := arrayBuffer.String()
-	r = strings.TrimPrefix(r, "-----BEGIN -----")
-	r = strings.Trim(r, "\n")
-	r = strings.TrimSuffix(r, "-----END -----")
-	r = strings.Trim(r, "\n")
+	r = strings.ReplaceAll(r, "-----BEGIN -----\n", "")
+	r = strings.ReplaceAll(r, "-----END -----\n", "")
 
 	return &r, nil
 }