diff options
| author | Damien Miller <djm@cvs.openbsd.org> | 2014-03-26 04:55:36 +0000 |
|---|---|---|
| committer | Damien Miller <djm@cvs.openbsd.org> | 2014-03-26 04:55:36 +0000 |
| commit | 1f4c43d1c5586ca7c846ee63806f9da459facbed (patch) | |
| tree | ba4723d0ea583d0b812ff71a22f3b640ad0db8d4 /usr.bin/ssh/chacha.h | |
| parent | 549f71fe5940795fd61e5e3e9b9558ae4f96ac9d (diff) | |
use __bounded(...) attribute recently added to sys/cdefs.h instead of
longform __attribute__(__bounded(...));
for brevity and a warning free compilation with llvm/clan
Diffstat (limited to 'usr.bin/ssh/chacha.h')
| -rw-r--r-- | usr.bin/ssh/chacha.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/usr.bin/ssh/chacha.h b/usr.bin/ssh/chacha.h index 4ef42cc70cf..ea57fe17946 100644 --- a/usr.bin/ssh/chacha.h +++ b/usr.bin/ssh/chacha.h @@ -1,4 +1,4 @@ -/* $OpenBSD: chacha.h,v 1.1 2013/11/21 00:45:44 djm Exp $ */ +/* $OpenBSD: chacha.h,v 1.2 2014/03/26 04:55:35 djm Exp $ */ /* chacha-merged.c version 20080118 @@ -22,14 +22,14 @@ struct chacha_ctx { #define CHACHA_BLOCKLEN 64 void chacha_keysetup(struct chacha_ctx *x, const u_char *k, u_int kbits) - __attribute__((__bounded__(__minbytes__, 2, CHACHA_MINKEYLEN))); + __bounded((__minbytes__, 2, CHACHA_MINKEYLEN)); void chacha_ivsetup(struct chacha_ctx *x, const u_char *iv, const u_char *ctr) - __attribute__((__bounded__(__minbytes__, 2, CHACHA_NONCELEN))) - __attribute__((__bounded__(__minbytes__, 3, CHACHA_CTRLEN))); + __bounded((__minbytes__, 2, CHACHA_NONCELEN)) + __bounded((__minbytes__, 3, CHACHA_CTRLEN)); void chacha_encrypt_bytes(struct chacha_ctx *x, const u_char *m, u_char *c, u_int bytes) - __attribute__((__bounded__(__buffer__, 2, 4))) - __attribute__((__bounded__(__buffer__, 3, 4))); + __bounded((__buffer__, 2, 4)) + __bounded((__buffer__, 3, 4)); #endif /* CHACHA_H */ |