cipher-proto: remove forward typedef of cipher_bulk_ops_t
* cipher/cipher-proto (cipher_bulk_ops_t): Remove typedef, leave forward declaration of 'struct cipher_bulk_ops'. (gcry_cipher_setkey_t): Change 'bulk_ops' to 'struct cipher_bulk_ops *'. * cipher/arcfour.c: Include 'cipher-internal.h'. * cipher/gost28147.c: Ditto. * cipher/idea.c: Ditto. * cipher/rfc2268.c: Ditto. * cipher/salsa20.c: Ditto. * cipher/seed.c: Ditto. * cipher/mac-internal.h (CTX_MAGIC_NORMAL): Rename to... (CTX_MAC_MAGIC_NORMAL): ... this. (CTX_MAGIC_SECURE): Rename to... (CTX_MAC_MAGIC_SECURE): ... this. * cipher/mac-cmac.c (cmac_open): Use CTX_MAC_MAGIC_SECURE. * cipher/mac-gmac.c (gmac_open): Ditto. * cipher/mac-hmac.c (hmac_open): Ditto. * cipher/mac-poly1305.c (poly1305mac_open): Ditto. * cipher/mac.c (mac_open): Use CTX_MAC_MAGIC_SECURE and CTX_MAC_MAGIC_NORMAL.
CTX_MAC_MAGIC_* change is needed since gost28147.c now includes
both 'cipher-internal.h' and 'mac-internal.h' which both defined
CTX_MAC_MAGIC_* with different values.
- GnuPG-bug-id: T5264
- Signed-off-by: Jussi Kivilinna <jussi.kivilinna@iki.fi>