diff options
| author | David Shaw <[email protected]> | 2003-12-17 23:04:53 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2003-12-17 23:04:53 +0000 |
| commit | 7847eae02c14adae19b69a329ecf1ee17b7eda1d (patch) | |
| tree | e4a10de8f235b118d05b767056e649cf4d613d0e /g10/build-packet.c | |
| parent | * mpiutil.c (mpi_set_opaque, mpi_get_opaque): Make the length of an opaque (diff) | |
| download | gnupg-7847eae02c14adae19b69a329ecf1ee17b7eda1d.tar.gz gnupg-7847eae02c14adae19b69a329ecf1ee17b7eda1d.zip | |
* build-packet.c (write_fake_data, do_secret_key), seckey-cert.c
(do_check): Use an unsigned length for mpi_get_opaque.
* options.h: It's impolite to assign -1 to an unsigned
opt.force_ownertrust.
Diffstat (limited to '')
| -rw-r--r-- | g10/build-packet.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/g10/build-packet.c b/g10/build-packet.c index c1022fff5..3d246afe2 100644 --- a/g10/build-packet.c +++ b/g10/build-packet.c @@ -182,7 +182,7 @@ static void write_fake_data( IOBUF out, MPI a ) { if( a ) { - int i; + unsigned int i; void *p; p = mpi_get_opaque( a, &i ); @@ -353,15 +353,17 @@ do_secret_key( IOBUF out, int ctb, PKT_secret_key *sk ) else if( sk->is_protected && sk->version >= 4 ) { /* The secret key is protected - write it out as it is */ byte *p; + unsigned int ndata; + assert( mpi_is_opaque( sk->skey[npkey] ) ); - p = mpi_get_opaque( sk->skey[npkey], &i ); - iobuf_write(a, p, i ); + p = mpi_get_opaque( sk->skey[npkey], &ndata ); + iobuf_write(a, p, ndata ); } else if( sk->is_protected ) { /* The secret key is protected te old v4 way. */ for( ; i < nskey; i++ ) { byte *p; - int ndata; + unsigned int ndata; assert (mpi_is_opaque (sk->skey[i])); p = mpi_get_opaque (sk->skey[i], &ndata); |