summaryrefslogtreecommitdiff
path: root/chacha.h
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2014-05-15 14:37:03 +1000
committerDamien Miller <djm@mindrot.org>2014-05-15 14:37:03 +1000
commit686c7d9ee6f44b2be4128d7860b6b37adaeba733 (patch)
tree7f6a31d5d100a462e51a122189d3fc1ab2117d12 /chacha.h
parent294c58a007cfb2f3bddc4fc3217e255857ffb9bf (diff)
- djm@cvs.openbsd.org 2014/05/02 03:27:54
[chacha.h cipher-chachapoly.h digest.h hmac.h kex.h kexc25519.c] [misc.h poly1305.h ssh-pkcs11.c defines.h] revert __bounded change; it causes way more problems for portable than it solves; pointed out by dtucker@
Diffstat (limited to 'chacha.h')
-rw-r--r--chacha.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/chacha.h b/chacha.h
index ea57fe17..40eaf2d9 100644
--- a/chacha.h
+++ b/chacha.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: chacha.h,v 1.2 2014/03/26 04:55:35 djm Exp $ */
+/* $OpenBSD: chacha.h,v 1.3 2014/05/02 03:27:54 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)
- __bounded((__minbytes__, 2, CHACHA_MINKEYLEN));
+ __attribute__((__bounded__(__minbytes__, 2, CHACHA_MINKEYLEN)));
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)));
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)));
#endif /* CHACHA_H */