module Mail
  module Gpg
    class SignPart < Mail::Part

      def initialize(cleartext_mail, options = {})
        signature = GpgmeHelper.sign(cleartext_mail.encoded, options)
        super() do
          body signature.to_s
          content_type "application/pgp-signature; name=\"signature.asc\""
          content_disposition 'attachment; filename="signature.asc"'
          content_description 'OpenPGP digital signature'
        end
      end

      def self.signature_valid?(plain, signature, options = {})
        if !(signature.has_content_type? && ('application/pgp-signature' == signature.mime_type))
          return false
        end

        GpgmeHelper.sign_verify(plain.encoded, signature.body.encoded, options)
      end
    end
  end
end

module Mail
  module Gpg
    class SignPart < Mail::Part

      def initialize(cleartext_mail, options = {})
        signature = GpgmeHelper.sign(cleartext_mail.encoded, options)
        super() do
          body signature.to_s
          content_type "application/pgp-signature; name=\"signature.asc\""
          content_disposition 'attachment; filename="signature.asc"'
          content_description 'OpenPGP digital signature'
        end
      end

      def self.signature_valid?(plain_part, signature_part, options = {})
        if !(signature_part.has_content_type? &&
             ('application/pgp-signature' == signature_part.mime_type))
          return false
        end

        # Work around the problem that plain_part.raw_source prefixes an
        # erronous CRLF, <https://github.com/mikel/mail/issues/702>.
        if ! plain_part.raw_source.empty?
          plaintext = [ plain_part.header.raw_source,
                        "\r\n\r\n",
                        plain_part.body.raw_source
                      ].join
        else
          plaintext = plain_part.encoded
        end

        signature = signature_part.body.encoded
        GpgmeHelper.sign_verify(plaintext, signature, options)
      end
    end
  end
end

Fix signature verification for external messages.
Fix signature verification for external messages.

Mail::Body.encoded returns an altered string compared to the original if
the original wasn't created with Mail.
