From 250c4c17021014f9baea92d357d75a063eb3ff66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20M=C3=B6ller?= <nisse@lysator.liu.se>
Date: Sun, 9 Sep 2001 00:28:18 +0200
Subject: [PATCH] * cbc.h (CBC_CTX): New macro. (CBC_ENCRYPT): New macro.
(CBC_DECRYPT): New macro.
Rev: src/nettle/cbc.h:1.3
---
cbc.h | 37 +++++++++++++++++++++++++++++++++++--
1 file changed, 35 insertions(+), 2 deletions(-)
diff --git a/cbc.h b/cbc.h
index 2bf72e7c..dba52fdd 100644
--- a/cbc.h
+++ b/cbc.h
@@ -46,11 +46,44 @@ cbc_decrypt(void *ctx, void (*f)(void *ctx,
unsigned length, uint8_t *dst,
const uint8_t *src);
+#define CBC_CTX(type, size) \
+{ type ctx; uint8_t iv[size]; }
+
+#define CBC_SET_IV(ctx, data) \
+memcpy((ctx)->iv, (data), sizeof((ctx)->iv))
+
+#if 0
+#define CBC_ENCRYPT(self, f, length, dst, src) \
+do { if (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)); \
+} 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)))
+
+#define CBC_DECRYPT(self, f, length, dst, src) \
+(0 ? ((f)(&(self)->ctx, 0, NULL, NULL)) \
+ : cbc_decrypt((void *) &(self)->ctx, \
+ (void (*)(void *, unsigned, uint8_t *, const uint8_t *)) (f), \
+ sizeof((self)->iv), (self)->iv, \
+ (length), (dst), (src)))
+
+#if 0
/* Type safer variants */
-#define CBC_ENCRYPT(ctx, f, b, iv, l, dst, src) \
+#define CBC_ENCRYPT2(ctx, f, b, iv, l, dst, src) \
(0 ? ((f)((ctx),0,NULL,NULL)) \
: cbc_encrypt((void *)(ctx), \
- ((*)(void *, unsigned, uint8_t *, const uint8_t *)) (f), \
+ (void (*)(void *, unsigned, uint8_t *, const uint8_t *)) (f), \
(b), (iv), (l), (dst), (src)))
+#endif
+
#endif /* NETTLE_CBC_H_INCLUDED */
--
GitLab