From 014cf04a7386288b34c6ca4da5a0326883256a1b Mon Sep 17 00:00:00 2001 From: djm <> Date: Sat, 10 May 2014 01:38:10 +0000 Subject: __bounded => __attribute__((__bounded__ --- src/lib/libcrypto/chacha/chacha-merged.c | 10 +++++----- src/lib/libssl/src/crypto/chacha/chacha-merged.c | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) (limited to 'src') diff --git a/src/lib/libcrypto/chacha/chacha-merged.c b/src/lib/libcrypto/chacha/chacha-merged.c index a31d8a8301..5ba813147a 100644 --- a/src/lib/libcrypto/chacha/chacha-merged.c +++ b/src/lib/libcrypto/chacha/chacha-merged.c @@ -18,15 +18,15 @@ struct chacha_ctx { static inline void chacha_keysetup(struct chacha_ctx *x, const u_char *k, u_int kbits) - __bounded((__minbytes__, 2, CHACHA_MINKEYLEN)); + __attribute__((__bounded__(__minbytes__, 2, CHACHA_MINKEYLEN))); static inline void chacha_ivsetup(struct chacha_ctx *x, const u_char *iv, const u_char *ctr) - __bounded((__minbytes__, 2, CHACHA_NONCELEN)) - __bounded((__minbytes__, 3, CHACHA_CTRLEN)); + __attribute__((__bounded__(__minbytes__, 2, CHACHA_NONCELEN))) + __attribute__((__bounded__(__minbytes__, 3, CHACHA_CTRLEN))); static inline void chacha_encrypt_bytes(struct chacha_ctx *x, const u_char *m, u_char *c, u_int bytes) - __bounded((__buffer__, 2, 4)) - __bounded((__buffer__, 3, 4)); + __attribute__((__bounded__(__buffer__, 2, 4))) + __attribute__((__bounded__(__buffer__, 3, 4))); typedef unsigned char u8; typedef unsigned int u32; diff --git a/src/lib/libssl/src/crypto/chacha/chacha-merged.c b/src/lib/libssl/src/crypto/chacha/chacha-merged.c index a31d8a8301..5ba813147a 100644 --- a/src/lib/libssl/src/crypto/chacha/chacha-merged.c +++ b/src/lib/libssl/src/crypto/chacha/chacha-merged.c @@ -18,15 +18,15 @@ struct chacha_ctx { static inline void chacha_keysetup(struct chacha_ctx *x, const u_char *k, u_int kbits) - __bounded((__minbytes__, 2, CHACHA_MINKEYLEN)); + __attribute__((__bounded__(__minbytes__, 2, CHACHA_MINKEYLEN))); static inline void chacha_ivsetup(struct chacha_ctx *x, const u_char *iv, const u_char *ctr) - __bounded((__minbytes__, 2, CHACHA_NONCELEN)) - __bounded((__minbytes__, 3, CHACHA_CTRLEN)); + __attribute__((__bounded__(__minbytes__, 2, CHACHA_NONCELEN))) + __attribute__((__bounded__(__minbytes__, 3, CHACHA_CTRLEN))); static inline void chacha_encrypt_bytes(struct chacha_ctx *x, const u_char *m, u_char *c, u_int bytes) - __bounded((__buffer__, 2, 4)) - __bounded((__buffer__, 3, 4)); + __attribute__((__bounded__(__buffer__, 2, 4))) + __attribute__((__bounded__(__buffer__, 3, 4))); typedef unsigned char u8; typedef unsigned int u32; -- cgit v1.2.3-55-g6feb