diff options
Diffstat (limited to 'g10')
| -rw-r--r-- | g10/encrypt.c | 20 | ||||
| -rw-r--r-- | g10/keyring.c | 4 |
2 files changed, 12 insertions, 12 deletions
diff --git a/g10/encrypt.c b/g10/encrypt.c index 46b0be0cc..49ec65b4a 100644 --- a/g10/encrypt.c +++ b/g10/encrypt.c @@ -825,18 +825,18 @@ encrypt_filter (void *opaque, int control, if (rc) return rc; - if(efx->symkey_s2k && efx->symkey_dek) - { - rc=write_symkey_enc(efx->symkey_s2k,efx->symkey_dek, - efx->cfx.dek,a); - if(rc) - return rc; - } + if(efx->symkey_s2k && efx->symkey_dek) + { + rc=write_symkey_enc(efx->symkey_s2k,efx->symkey_dek, + efx->cfx.dek,a); + if(rc) + return rc; + } - iobuf_push_filter (a, cipher_filter, &efx->cfx); + iobuf_push_filter (a, cipher_filter, &efx->cfx); - efx->header_okay = 1; - } + efx->header_okay = 1; + } rc = iobuf_write (a, buf, size); } diff --git a/g10/keyring.c b/g10/keyring.c index 7c7b35508..ee079a95f 100644 --- a/g10/keyring.c +++ b/g10/keyring.c @@ -749,8 +749,8 @@ prepare_search (KEYRING_HANDLE hd) if (!hd->current.kr) { if (DBG_LOOKUP) log_debug ("%s: keyring not available!\n", __func__); - hd->current.eof = 1; - return -1; /* keyring not available */ + hd->current.eof = 1; + return -1; /* keyring not available */ } assert (!hd->current.iobuf); } |