From 81306bff1235ff9ed50bbf3e5b80897da4babd7e Mon Sep 17 00:00:00 2001 From: djm Date: Sat, 10 May 2014 01:38:10 +0000 Subject: [PATCH] __bounded => __attribute__((__bounded__ --- lib/libcrypto/chacha/chacha-merged.c | 10 +++++----- lib/libssl/src/crypto/chacha/chacha-merged.c | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/lib/libcrypto/chacha/chacha-merged.c b/lib/libcrypto/chacha/chacha-merged.c index a31d8a8301a..5ba813147a5 100644 --- a/lib/libcrypto/chacha/chacha-merged.c +++ b/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/lib/libssl/src/crypto/chacha/chacha-merged.c b/lib/libssl/src/crypto/chacha/chacha-merged.c index a31d8a8301a..5ba813147a5 100644 --- a/lib/libssl/src/crypto/chacha/chacha-merged.c +++ b/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; -- 2.20.1