1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-14 21:47:19 +02:00

* 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.
This commit is contained in:
David Shaw 2003-12-17 23:04:53 +00:00
parent e49672d5a3
commit 7847eae02c
4 changed files with 17 additions and 11 deletions

View file

@ -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);