aboutsummaryrefslogtreecommitdiffstats
path: root/g10/cipher.c
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2006-04-19 13:24:36 +0000
committerWerner Koch <[email protected]>2006-04-19 13:24:36 +0000
commitd0907e64f473b743ec7a6888583e19502b804ca2 (patch)
tree455edb5bd2b75ce96b967fc398160f3adb989a66 /g10/cipher.c
parentMerged with gpg 1.4.3 code. (diff)
downloadgnupg-d0907e64f473b743ec7a6888583e19502b804ca2.tar.gz
gnupg-d0907e64f473b743ec7a6888583e19502b804ca2.zip
Continued with merging.
Still does not build.
Diffstat (limited to 'g10/cipher.c')
-rw-r--r--g10/cipher.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/g10/cipher.c b/g10/cipher.c
index ff1080495..b33deb28b 100644
--- a/g10/cipher.c
+++ b/g10/cipher.c
@@ -51,7 +51,7 @@ write_header( cipher_filter_context_t *cfx, IOBUF a )
unsigned int blocksize;
unsigned int nprefix;
- blocksize = gcry_cipher_algo_blklen (cfx->dek->algo);
+ blocksize = gcry_cipher_get_algo_blklen (cfx->dek->algo);
if ( blocksize < 8 || blocksize > 16 )
log_fatal("unsupported blocksize %u\n", blocksize );
@@ -88,8 +88,8 @@ write_header( cipher_filter_context_t *cfx, IOBUF a )
GCRY_CIPHER_MODE_CFB,
(GCRY_CIPHER_SECURE
| ((cfx->dek->use_mdc || cfx->dek->algo >= 100)?
- 0 : GCRY_CIPHER_ENABLE_SYNC));
- if (rc) {
+ 0 : GCRY_CIPHER_ENABLE_SYNC)));
+ if (err) {
/* We should never get an error here cause we already checked,
* that the algorithm is available. */
BUG();