security-and-privacy/gnupg
security-and-privacy
/
gnupg
mirror of git://git.gnupg.org/gnupg.git
1
0
Fork 0
Code Releases Activity

Fixed that nasty 64 bit but.

This commit is contained in:
Werner Koch 2006-11-10 11:32:00 +00:00
parent c1f4a8edff
commit cd3e8c9b89
2 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
g10/ChangeLog
View File

@ -1,3 +1,10 @@
2006-11-10 Werner Koch <wk@g10code.com>
* parse-packet.c (mpi_read): Changed NREAD to size_t to match the
gcry_mpi-scan prototype.
(mpi_read): Fixed double increment of bytes read to correctly
detect overlong MPIs.
2006-11-05 Werner Koch <wk@g10code.com> 2006-11-05 Werner Koch <wk@g10code.com>
* gpg.c (main): Remove the default --require-cross-certification. * gpg.c (main): Remove the default --require-cross-certification.

20
g10/parse-packet.c
View File

@ -112,41 +112,41 @@ mpi_read (iobuf_t inp, unsigned int *ret_nread, int secure)
/*FIXME: Needs to be synced with gnupg14/mpi/mpicoder.c*/ /*FIXME: Needs to be synced with gnupg14/mpi/mpicoder.c*/
int c, c1, c2, i; int c, c1, c2, i;
unsigned int nbits, nbytes, nread=0; unsigned int nbits, nbytes;
size_t nread;
gcry_mpi_t a = NULL; gcry_mpi_t a = NULL;
byte *buf = NULL; byte *buf = NULL;
byte *p; byte *p;
if( (c = c1 = iobuf_get(inp)) == -1 ) if ( (c = c1 = iobuf_get (inp)) == -1 )
goto leave; goto leave;
nbits = c << 8; nbits = c << 8;
if( (c = c2 = iobuf_get(inp)) == -1 ) if ( (c = c2 = iobuf_get (inp)) == -1 )
goto leave; goto leave;
nbits |= c; nbits |= c;
if( nbits > MAX_EXTERN_MPI_BITS ) if ( nbits > MAX_EXTERN_MPI_BITS )
{ {
log_error("mpi too large (%u bits)\n", nbits); log_error("mpi too large (%u bits)\n", nbits);
goto leave; goto leave;
} }
nread = 2; nread = 2;
nbytes = (nbits+7) / 8; nbytes = (nbits+7) / 8;
buf = secure? gcry_xmalloc_secure( nbytes+2 ) : gcry_xmalloc( nbytes+2 ); buf = secure ? gcry_xmalloc_secure (nbytes + 2) : gcry_xmalloc (nbytes + 2);
p = buf; p = buf;
p[0] = c1; p[0] = c1;
p[1] = c2; p[1] = c2;
for( i=0 ; i < nbytes; i++ ) for ( i=0 ; i < nbytes; i++ )
{ {
p[i+2] = iobuf_get(inp) & 0xff; p[i+2] = iobuf_get(inp) & 0xff;
nread++; nread++;
} }
nread += nbytes; if ( gcry_mpi_scan( &a, GCRYMPI_FMT_PGP, buf, nread, &nread ) )
if( gcry_mpi_scan( &a, GCRYMPI_FMT_PGP, buf, nread, &nread ) )
a = NULL; a = NULL;
leave: leave:
gcry_free(buf); gcry_free(buf);
if( nread > *ret_nread ) if ( nread > *ret_nread )
log_bug("mpi larger than packet"); log_bug ("mpi larger than packet");
else else
*ret_nread = nread; *ret_nread = nread;
return a; return a;