summaryrefslogtreecommitdiff
path: root/chacha.h
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2014-04-20 13:21:22 +1000
committerDamien Miller <djm@mindrot.org>2014-04-20 13:21:22 +1000
commit4f40209aa4060b9c066a2f0d9332ace7b8dfb391 (patch)
tree3f023418e3afa0ae151339aecae6d72b978014b8 /chacha.h
parent9235a030ad1b16903fb495d81544e0f7c7449523 (diff)
- djm@cvs.openbsd.org 2014/03/26 04:55:35
[chacha.h cipher-chachapoly.h digest.h hmac.h kex.h kexc25519.c [misc.h poly1305.h ssh-pkcs11.c] use __bounded(...) attribute recently added to sys/cdefs.h instead of longform __attribute__(__bounded(...)); for brevity and a warning free compilation with llvm/clang
Diffstat (limited to 'chacha.h')
-rw-r--r--chacha.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/chacha.h b/chacha.h
index 4ef42cc70..ea57fe179 100644
--- a/chacha.h
+++ b/chacha.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: chacha.h,v 1.1 2013/11/21 00:45:44 djm Exp $ */ 1/* $OpenBSD: chacha.h,v 1.2 2014/03/26 04:55:35 djm Exp $ */
2 2
3/* 3/*
4chacha-merged.c version 20080118 4chacha-merged.c version 20080118
@@ -22,14 +22,14 @@ struct chacha_ctx {
22#define CHACHA_BLOCKLEN 64 22#define CHACHA_BLOCKLEN 64
23 23
24void chacha_keysetup(struct chacha_ctx *x, const u_char *k, u_int kbits) 24void chacha_keysetup(struct chacha_ctx *x, const u_char *k, u_int kbits)
25 __attribute__((__bounded__(__minbytes__, 2, CHACHA_MINKEYLEN))); 25 __bounded((__minbytes__, 2, CHACHA_MINKEYLEN));
26void chacha_ivsetup(struct chacha_ctx *x, const u_char *iv, const u_char *ctr) 26void chacha_ivsetup(struct chacha_ctx *x, const u_char *iv, const u_char *ctr)
27 __attribute__((__bounded__(__minbytes__, 2, CHACHA_NONCELEN))) 27 __bounded((__minbytes__, 2, CHACHA_NONCELEN))
28 __attribute__((__bounded__(__minbytes__, 3, CHACHA_CTRLEN))); 28 __bounded((__minbytes__, 3, CHACHA_CTRLEN));
29void chacha_encrypt_bytes(struct chacha_ctx *x, const u_char *m, 29void chacha_encrypt_bytes(struct chacha_ctx *x, const u_char *m,
30 u_char *c, u_int bytes) 30 u_char *c, u_int bytes)
31 __attribute__((__bounded__(__buffer__, 2, 4))) 31 __bounded((__buffer__, 2, 4))
32 __attribute__((__bounded__(__buffer__, 3, 4))); 32 __bounded((__buffer__, 3, 4));
33 33
34#endif /* CHACHA_H */ 34#endif /* CHACHA_H */
35 35