Commit 114d607c authored by Niels Möller's avatar Niels Möller
Browse files

(nettle_crypt_func): Moved typedef to nettle-types.h.

(CBC_ENCRYPT, CBC_DECRYPT): Deleted older #if:ed out versions.

Rev: src/nettle/cbc.h:1.8
parent be135091
...@@ -32,15 +32,6 @@ ...@@ -32,15 +32,6 @@
#define cbc_encrypt nettle_cbc_encrypt #define cbc_encrypt nettle_cbc_encrypt
#define cbc_decrypt nettle_cbc_decrypt #define cbc_decrypt nettle_cbc_decrypt
/* Uses a void * for cipher contexts.
For block ciphers it would make sense with a const void * for the
context, but we use the same typedef for stream ciphers where the
internal state changes during the encryption. */
typedef void (*nettle_crypt_func)(void *ctx,
unsigned length, uint8_t *dst,
const uint8_t *src);
void void
cbc_encrypt(void *ctx, nettle_crypt_func f, cbc_encrypt(void *ctx, nettle_crypt_func f,
unsigned block_size, uint8_t *iv, unsigned block_size, uint8_t *iv,
...@@ -59,38 +50,18 @@ cbc_decrypt(void *ctx, nettle_crypt_func f, ...@@ -59,38 +50,18 @@ cbc_decrypt(void *ctx, nettle_crypt_func f,
#define CBC_SET_IV(ctx, data) \ #define CBC_SET_IV(ctx, data) \
memcpy((ctx)->iv, (data), sizeof((ctx)->iv)) memcpy((ctx)->iv, (data), sizeof((ctx)->iv))
#if 0 #define CBC_ENCRYPT(self, f, length, dst, src) \
#define CBC_ENCRYPT(self, f, length, dst, src) \ (0 ? ((f)(&(self)->ctx, 0, NULL, NULL)) \
do { if (0) (f)(&(self)->ctx, 0, NULL, NULL); \ : cbc_encrypt((void *) &(self)->ctx, \
cbc_encrypt((void *) &(self)->ctx, \ (nettle_crypt_func) (f), \
(void (*)(void *, unsigned, uint8_t *, const uint8_t *)) (f), \ sizeof((self)->iv), (self)->iv, \
sizeof((self)->iv), (self)->iv, \
(length), (dst), (src)); \
} while (0)
#endif
#define CBC_ENCRYPT(self, f, length, dst, src) \
(0 ? ((f)(&(self)->ctx, 0, NULL, NULL)) \
: cbc_encrypt((void *) &(self)->ctx, \
(void (*)(void *, unsigned, uint8_t *, const uint8_t *)) (f), \
sizeof((self)->iv), (self)->iv, \
(length), (dst), (src))) (length), (dst), (src)))
#define CBC_DECRYPT(self, f, length, dst, src) \ #define CBC_DECRYPT(self, f, length, dst, src) \
(0 ? ((f)(&(self)->ctx, 0, NULL, NULL)) \ (0 ? ((f)(&(self)->ctx, 0, NULL, NULL)) \
: cbc_decrypt((void *) &(self)->ctx, \ : cbc_decrypt((void *) &(self)->ctx, \
(void (*)(void *, unsigned, uint8_t *, const uint8_t *)) (f), \ (nettle_crypt_func) (f), \
sizeof((self)->iv), (self)->iv, \ sizeof((self)->iv), (self)->iv, \
(length), (dst), (src))) (length), (dst), (src)))
#if 0
/* Type safer variants */
#define CBC_ENCRYPT2(ctx, f, b, iv, l, dst, src) \
(0 ? ((f)((ctx),0,NULL,NULL)) \
: cbc_encrypt((void *)(ctx), \
(void (*)(void *, unsigned, uint8_t *, const uint8_t *)) (f), \
(b), (iv), (l), (dst), (src)))
#endif
#endif /* NETTLE_CBC_H_INCLUDED */ #endif /* NETTLE_CBC_H_INCLUDED */
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment