diff options
author | djm <> | 2014-05-10 01:38:10 +0000 |
---|---|---|
committer | djm <> | 2014-05-10 01:38:10 +0000 |
commit | 014cf04a7386288b34c6ca4da5a0326883256a1b (patch) | |
tree | d9c1ce0950598327452dfaa2619fc7ead76b52d3 /src | |
parent | 34eb7c54671524ffa317a4eaff096c92ee7b2704 (diff) | |
download | openbsd-014cf04a7386288b34c6ca4da5a0326883256a1b.tar.gz openbsd-014cf04a7386288b34c6ca4da5a0326883256a1b.tar.bz2 openbsd-014cf04a7386288b34c6ca4da5a0326883256a1b.zip |
__bounded => __attribute__((__bounded__
Diffstat (limited to 'src')
-rw-r--r-- | src/lib/libcrypto/chacha/chacha-merged.c | 10 | ||||
-rw-r--r-- | src/lib/libssl/src/crypto/chacha/chacha-merged.c | 10 |
2 files changed, 10 insertions, 10 deletions
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 { | |||
18 | 18 | ||
19 | static inline void chacha_keysetup(struct chacha_ctx *x, const u_char *k, | 19 | static inline void chacha_keysetup(struct chacha_ctx *x, const u_char *k, |
20 | u_int kbits) | 20 | u_int kbits) |
21 | __bounded((__minbytes__, 2, CHACHA_MINKEYLEN)); | 21 | __attribute__((__bounded__(__minbytes__, 2, CHACHA_MINKEYLEN))); |
22 | static inline void chacha_ivsetup(struct chacha_ctx *x, const u_char *iv, | 22 | static inline void chacha_ivsetup(struct chacha_ctx *x, const u_char *iv, |
23 | const u_char *ctr) | 23 | const u_char *ctr) |
24 | __bounded((__minbytes__, 2, CHACHA_NONCELEN)) | 24 | __attribute__((__bounded__(__minbytes__, 2, CHACHA_NONCELEN))) |
25 | __bounded((__minbytes__, 3, CHACHA_CTRLEN)); | 25 | __attribute__((__bounded__(__minbytes__, 3, CHACHA_CTRLEN))); |
26 | static inline void chacha_encrypt_bytes(struct chacha_ctx *x, const u_char *m, | 26 | static inline void chacha_encrypt_bytes(struct chacha_ctx *x, const u_char *m, |
27 | u_char *c, u_int bytes) | 27 | u_char *c, u_int bytes) |
28 | __bounded((__buffer__, 2, 4)) | 28 | __attribute__((__bounded__(__buffer__, 2, 4))) |
29 | __bounded((__buffer__, 3, 4)); | 29 | __attribute__((__bounded__(__buffer__, 3, 4))); |
30 | 30 | ||
31 | typedef unsigned char u8; | 31 | typedef unsigned char u8; |
32 | typedef unsigned int u32; | 32 | 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 { | |||
18 | 18 | ||
19 | static inline void chacha_keysetup(struct chacha_ctx *x, const u_char *k, | 19 | static inline void chacha_keysetup(struct chacha_ctx *x, const u_char *k, |
20 | u_int kbits) | 20 | u_int kbits) |
21 | __bounded((__minbytes__, 2, CHACHA_MINKEYLEN)); | 21 | __attribute__((__bounded__(__minbytes__, 2, CHACHA_MINKEYLEN))); |
22 | static inline void chacha_ivsetup(struct chacha_ctx *x, const u_char *iv, | 22 | static inline void chacha_ivsetup(struct chacha_ctx *x, const u_char *iv, |
23 | const u_char *ctr) | 23 | const u_char *ctr) |
24 | __bounded((__minbytes__, 2, CHACHA_NONCELEN)) | 24 | __attribute__((__bounded__(__minbytes__, 2, CHACHA_NONCELEN))) |
25 | __bounded((__minbytes__, 3, CHACHA_CTRLEN)); | 25 | __attribute__((__bounded__(__minbytes__, 3, CHACHA_CTRLEN))); |
26 | static inline void chacha_encrypt_bytes(struct chacha_ctx *x, const u_char *m, | 26 | static inline void chacha_encrypt_bytes(struct chacha_ctx *x, const u_char *m, |
27 | u_char *c, u_int bytes) | 27 | u_char *c, u_int bytes) |
28 | __bounded((__buffer__, 2, 4)) | 28 | __attribute__((__bounded__(__buffer__, 2, 4))) |
29 | __bounded((__buffer__, 3, 4)); | 29 | __attribute__((__bounded__(__buffer__, 3, 4))); |
30 | 30 | ||
31 | typedef unsigned char u8; | 31 | typedef unsigned char u8; |
32 | typedef unsigned int u32; | 32 | typedef unsigned int u32; |