mirror of
git://git.gnupg.org/gnupg.git
synced 2024-12-22 10:19:57 +01:00
gpg: Rename a function.
* g10/cipher.c (cipher_filter): Rename to cipher_file_cfb.
This commit is contained in:
parent
5b24c41ba7
commit
15cf36f6a8
@ -119,7 +119,8 @@ write_header (cipher_filter_context_t *cfx, iobuf_t a)
|
||||
* This filter is used to en/de-cipher data with a symmetric algorithm
|
||||
*/
|
||||
int
|
||||
cipher_filter (void *opaque, int control, iobuf_t a, byte *buf, size_t *ret_len)
|
||||
cipher_filter_cfb (void *opaque, int control,
|
||||
iobuf_t a, byte *buf, size_t *ret_len)
|
||||
{
|
||||
cipher_filter_context_t *cfx = opaque;
|
||||
size_t size = *ret_len;
|
||||
@ -179,7 +180,7 @@ cipher_filter (void *opaque, int control, iobuf_t a, byte *buf, size_t *ret_len)
|
||||
}
|
||||
else if (control == IOBUFCTRL_DESC)
|
||||
{
|
||||
mem2str (buf, "cipher_filter", *ret_len);
|
||||
mem2str (buf, "cipher_filter_cfb", *ret_len);
|
||||
}
|
||||
|
||||
return rc;
|
||||
|
@ -321,7 +321,7 @@ encrypt_simple (const char *filename, int mode, int use_seskey)
|
||||
|
||||
/* Register the cipher filter. */
|
||||
if (mode)
|
||||
iobuf_push_filter ( out, cipher_filter, &cfx );
|
||||
iobuf_push_filter ( out, cipher_filter_cfb, &cfx );
|
||||
|
||||
/* Register the compress filter. */
|
||||
if ( do_compress )
|
||||
@ -741,7 +741,7 @@ encrypt_crypt (ctrl_t ctrl, int filefd, const char *filename,
|
||||
cfx.datalen = filesize && !do_compress ? filesize : 0;
|
||||
|
||||
/* Register the cipher filter. */
|
||||
iobuf_push_filter (out, cipher_filter, &cfx);
|
||||
iobuf_push_filter (out, cipher_filter_cfb, &cfx);
|
||||
|
||||
/* Register the compress filter. */
|
||||
if (do_compress)
|
||||
@ -897,7 +897,7 @@ encrypt_filter (void *opaque, int control,
|
||||
return rc;
|
||||
}
|
||||
|
||||
iobuf_push_filter (a, cipher_filter, &efx->cfx);
|
||||
iobuf_push_filter (a, cipher_filter_cfb, &efx->cfx);
|
||||
|
||||
efx->header_okay = 1;
|
||||
}
|
||||
|
@ -146,8 +146,8 @@ gpg_error_t push_compress_filter2 (iobuf_t out,compress_filter_context_t *zfx,
|
||||
int algo, int rel);
|
||||
|
||||
/*-- cipher.c --*/
|
||||
int cipher_filter( void *opaque, int control,
|
||||
iobuf_t chain, byte *buf, size_t *ret_len);
|
||||
int cipher_filter_cfb (void *opaque, int control,
|
||||
iobuf_t chain, byte *buf, size_t *ret_len);
|
||||
|
||||
/*-- textfilter.c --*/
|
||||
int text_filter( void *opaque, int control,
|
||||
|
@ -2576,7 +2576,7 @@ encrypted (const char *option, int argc, char *argv[], void *cookie)
|
||||
|
||||
cfx->datalen = 0;
|
||||
|
||||
filter_push (out, cipher_filter, cfx, PKT_ENCRYPTED, cfx->datalen == 0);
|
||||
filter_push (out, cipher_filter_cfb, cfx, PKT_ENCRYPTED, cfx->datalen == 0);
|
||||
|
||||
debug ("Wrote encrypted packet:\n");
|
||||
|
||||
|
@ -1510,7 +1510,7 @@ sign_symencrypt_file (ctrl_t ctrl, const char *fname, strlist_t locusr)
|
||||
}
|
||||
|
||||
/* Push the encryption filter */
|
||||
iobuf_push_filter( out, cipher_filter, &cfx );
|
||||
iobuf_push_filter (out, cipher_filter_cfb, &cfx );
|
||||
|
||||
/* Push the compress filter */
|
||||
if (default_compress_algo())
|
||||
|
Loading…
x
Reference in New Issue
Block a user