1 files changed, 2 insertions, 0 deletions
diff --git a/g10/armor.c b/g10/armor.c
index 80de65551..142e0bd82 100644
--- a/g10/armor.c
+++ b/g10/armor.c
@@ -318,6 +318,8 @@ find_header( fhdr_state_t state, byte *buf, size_t *r_buflen,
 	    if( n < buflen || c == '\n' ) {
 		if( n && buf[0] != '\r') { /* maybe a header */
 		    if( strchr( buf, ':') ) { /* yes */
+			if( buf[n-1] == '\r' )
+			    buf[--n] = 0;
 			if( opt.verbose ) {
 			    log_info("armor header: ");
 			    print_string( stderr, buf, n );