Use p7m and p7s also for armored CMS data

This is already handled gracefully. Otherwise we would use
.pem for both and this breaks because then the signature
and the encrypted file have the same filename.

• GnuPG-Bug-Id: T4041