security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-02 22:46:30 +02:00
Code Activity

See ChangeLog: Sun Jan 10 15:10:02 CET 1999 Werner Koch

Browse source
This commit is contained in:
Werner Koch 1999-01-10 14:13:03 +00:00
parent 198846752e
commit 0ec9401aaf
4 changed files with 17 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
g10/ChangeLog
View file

@ -1,3 +1,7 @@
Sun Jan 10 15:10:02 CET 1999 Werner Koch <wk@isil.d.shuttle.de>
* armor.c (fake_packet): Fixed not-dash-escaped bug.
Sat Jan 9 16:02:23 CET 1999 Werner Koch <wk@isil.d.shuttle.de>
* sig-check.c (do_check): Output time diff on error

13
g10/armor.c
View file

@ -499,7 +499,8 @@ fake_packet( armor_filter_context_t *afx, IOBUF a,
else {
while( len < size && afx->buffer_pos < afx->buffer_len )
buf[len++] = afx->buffer[afx->buffer_pos++];
if( afx->buffer_pos >= afx->buffer_len ) {
if( afx->buffer_pos >= afx->buffer_len
&& !afx->not_dash_escaped ) {
buf[len++] = '\r';
buf[len++] = '\n';
}
@ -518,7 +519,9 @@ fake_packet( armor_filter_context_t *afx, IOBUF a,
}
if( !maxlen )
afx->truncated++;
afx->buffer_len = trim_trailing_spaces( afx->buffer, afx->buffer_len );
if( !afx->not_dash_escaped )
afx->buffer_len = trim_trailing_spaces( afx->buffer,
afx->buffer_len );
p = afx->buffer;
n = afx->buffer_len;
@ -540,7 +543,7 @@ fake_packet( armor_filter_context_t *afx, IOBUF a,
putc('\n', stderr);
}
lastline = 1;
if( len >= 2 )
if( len >= 2 && !afx->not_dash_escaped )
len -= 2; /* remove the last CR,LF */
rc = -1;
}
@ -726,7 +729,7 @@ armor_filter( void *opaque, int control,
int idx, idx2;
size_t n=0;
u32 crc;
#if 0
#if 1
static FILE *fp ;
if( !fp ) {
@ -824,7 +827,7 @@ armor_filter( void *opaque, int control,
}
else
rc = radix64_read( afx, a, &n, buf, size );
#if 0
#if 1
if( n )
if( fwrite(buf, n, 1, fp ) != 1 )
BUG();