diff options
| author | Werner Koch <[email protected]> | 2007-03-20 16:57:40 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2007-03-20 16:57:40 +0000 |
| commit | 12cc96a17617cdb30710ebf51279d0dc39822bb3 (patch) | |
| tree | 857c3dd12235e676623088871b636490dc826883 /kbx/keybox-update.c | |
| parent | Make gpgconf aware of --p12-charset. (diff) | |
| download | gnupg-12cc96a17617cdb30710ebf51279d0dc39822bb3.tar.gz gnupg-12cc96a17617cdb30710ebf51279d0dc39822bb3.zip | |
kbx/
* keybox.h (KEYBOX_FLAG_BLOB_SECRET, KEYBOX_FLAG_BLOB_EPHEMERAL):
New.
* keybox-update.c (keybox_compress): Use it here instead of a
magic constant.
sm/
* fingerprint.c (gpgsm_get_fingerprint): Add caching.
(gpgsm_get_fingerprint_string): Use bin2hexcolon().
(gpgsm_get_fingerprint_hexstring): Use bin2hex and allocate only
as much memory as required.
(gpgsm_get_keygrip_hexstring): Use bin2hex.
* certchain.c (gpgsm_validate_chain): Keep track of the
certificate chain and reset the ephemeral flags.
* keydb.c (keydb_set_cert_flags): New args EPHEMERAL and MASK.
Changed caller to use a mask of ~0. Return a proper error code if
the certificate is not available.
Diffstat (limited to 'kbx/keybox-update.c')
| -rw-r--r-- | kbx/keybox-update.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kbx/keybox-update.c b/kbx/keybox-update.c index bb43d287b..6657187e2 100644 --- a/kbx/keybox-update.c +++ b/kbx/keybox-update.c @@ -452,7 +452,7 @@ keybox_set_flags (KEYBOX_HANDLE hd, int what, int idx, unsigned int value) ec = _keybox_get_flag_location (buffer, length, what, &flag_pos, &flag_size); if (ec) return gpg_error (ec); - + off += flag_pos; if (hd->fp) @@ -631,7 +631,7 @@ keybox_compress (KEYBOX_HANDLE hd) /* Processing loop. By reading using _keybox_read_blob we - automagically skip and blobs flagged as deleted. Thus what we + automagically skip any blobs flagged as deleted. Thus what we only have to do is to check all ephemeral flagged blocks whether their time has come and write out all other blobs. */ cut_time = time(NULL) - 86400; @@ -682,7 +682,7 @@ keybox_compress (KEYBOX_HANDLE hd) break; } blobflags = ((buffer[pos] << 8) | (buffer[pos+1])); - if ((blobflags & 2)) + if ((blobflags & KEYBOX_FLAG_BLOB_EPHEMERAL)) { /* This is an ephemeral blob. */ if (_keybox_get_flag_location (buffer, length, |