===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/chacha.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- src/usr.bin/ssh/chacha.h	2013/11/21 00:45:44	1.1
+++ src/usr.bin/ssh/chacha.h	2014/03/26 04:55:35	1.2
@@ -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 @@
 #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 */