- 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@

1 files changed, 6 insertions, 6 deletions

diff --git a/chacha.h b/chacha.h
index ea57fe179..40eaf2d90 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 */