- djm@cvs.openbsd.org 2014/03/26 04:55:35

     [chacha.h cipher-chachapoly.h digest.h hmac.h kex.h kexc25519.c
     [misc.h poly1305.h ssh-pkcs11.c]
     use __bounded(...) attribute recently added to sys/cdefs.h instead of
     longform __attribute__(__bounded(...));

     for brevity and a warning free compilation with llvm/clang

1 files changed, 4 insertions, 4 deletions

diff --git a/kexc25519.c b/kexc25519.c
index ee79b4327..4dc842c44 100644
--- a/kexc25519.c
+++ b/kexc25519.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kexc25519.c,v 1.5 2014/01/31 16:39:19 tedu Exp $ */
+/* $OpenBSD: kexc25519.c,v 1.6 2014/03/26 04:55:35 djm Exp $ */
 /*
  * Copyright (c) 2001, 2013 Markus Friedl.  All rights reserved.
  * Copyright (c) 2010 Damien Miller.  All rights reserved.
@@ -45,9 +45,9 @@
 
 extern int crypto_scalarmult_curve25519(u_char a[CURVE25519_SIZE],
     const u_char b[CURVE25519_SIZE], const u_char c[CURVE25519_SIZE])
-        __attribute__((__bounded__(__minbytes__, 1, CURVE25519_SIZE)))
-        __attribute__((__bounded__(__minbytes__, 2, CURVE25519_SIZE)))
-        __attribute__((__bounded__(__minbytes__, 3, CURVE25519_SIZE)));
+        __bounded((__minbytes__, 1, CURVE25519_SIZE))
+        __bounded((__minbytes__, 2, CURVE25519_SIZE))
+        __bounded((__minbytes__, 3, CURVE25519_SIZE));
 
 void
 kexc25519_keygen(u_char key[CURVE25519_SIZE], u_char pub[CURVE25519_SIZE])