diff options
| author | Damien Miller <djm@mindrot.org> | 2014-04-20 13:21:22 +1000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2014-04-20 13:21:22 +1000 |
| commit | 4f40209aa4060b9c066a2f0d9332ace7b8dfb391 (patch) | |
| tree | 3f023418e3afa0ae151339aecae6d72b978014b8 /chacha.h | |
| parent | 9235a030ad1b16903fb495d81544e0f7c7449523 (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.h | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -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 */ |