diff options
| author | David Shaw <[email protected]> | 2002-12-11 17:50:38 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2002-12-11 17:50:38 +0000 |
| commit | eb9607707e5f8e86e732b92b137cb55ff6b26c71 (patch) | |
| tree | 0b6ccb58c2439262252afe98a571aaacc8162907 /g10/tdbio.c | |
| parent | * gpg.sgml: Clarify include-revoked and include-disabled so they match (diff) | |
| download | gnupg-eb9607707e5f8e86e732b92b137cb55ff6b26c71.tar.gz gnupg-eb9607707e5f8e86e732b92b137cb55ff6b26c71.zip | |
* tdbio.c (tdbio_read_record, tdbio_write_record): Compact the
RECTYPE_TRUST records a bit.
* g10.c (main): Comment out --list-trust-path until it can be implemented.
* import.c (import_one): Warn when importing an Elgamal primary that this
may take some time (to verify self-sigs). (chk_self_sigs): Try and cache
all self-sigs so the keyblock is written to the keyring with a good rich
cache.
* keygen.c (ask_algo): Make the Elgamal sign+encrypt warning stronger, and
remove the RSA sign+encrypt warning.
Diffstat (limited to 'g10/tdbio.c')
| -rw-r--r-- | g10/tdbio.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/g10/tdbio.c b/g10/tdbio.c index 993cb06f3..8c49fefb9 100644 --- a/g10/tdbio.c +++ b/g10/tdbio.c @@ -1210,9 +1210,9 @@ tdbio_read_record( ulong recnum, TRUSTREC *rec, int expected ) memcpy( rec->r.trust.fingerprint, p, 20); p+=20; rec->r.trust.ownertrust = *p++; rec->r.trust.depth = *p++; - p += 2; - rec->r.trust.validlist = buftoulong(p); p += 4; rec->r.trust.min_ownertrust = *p++; + p++; + rec->r.trust.validlist = buftoulong(p); p += 4; break; case RECTYPE_VALID: memcpy( rec->r.valid.namehash, p, 20); p+=20; @@ -1290,9 +1290,9 @@ tdbio_write_record( TRUSTREC *rec ) memcpy( p, rec->r.trust.fingerprint, 20); p += 20; *p++ = rec->r.trust.ownertrust; *p++ = rec->r.trust.depth; - p += 2; - ulongtobuf( p, rec->r.trust.validlist); p += 4; *p++ = rec->r.trust.min_ownertrust; + p++; + ulongtobuf( p, rec->r.trust.validlist); p += 4; break; case RECTYPE_VALID: |