From 4f40209aa4060b9c066a2f0d9332ace7b8dfb391 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Sun, 20 Apr 2014 13:21:22 +1000 Subject: - 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 --- kex.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'kex.h') diff --git a/kex.h b/kex.h index c85680eea..2229ae3d5 100644 --- a/kex.h +++ b/kex.h @@ -1,4 +1,4 @@ -/* $OpenBSD: kex.h,v 1.62 2014/01/27 18:58:14 markus Exp $ */ +/* $OpenBSD: kex.h,v 1.63 2014/03/26 04:55:35 djm Exp $ */ /* * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. @@ -187,12 +187,12 @@ kex_c25519_hash(int, char *, char *, char *, int, #define CURVE25519_SIZE 32 void kexc25519_keygen(u_char[CURVE25519_SIZE], u_char[CURVE25519_SIZE]) - __attribute__((__bounded__(__minbytes__, 1, CURVE25519_SIZE))) - __attribute__((__bounded__(__minbytes__, 2, CURVE25519_SIZE))); + __bounded((__minbytes__, 1, CURVE25519_SIZE)) + __bounded((__minbytes__, 2, CURVE25519_SIZE)); void kexc25519_shared_key(const u_char key[CURVE25519_SIZE], const u_char pub[CURVE25519_SIZE], Buffer *out) - __attribute__((__bounded__(__minbytes__, 1, CURVE25519_SIZE))) - __attribute__((__bounded__(__minbytes__, 2, CURVE25519_SIZE))); + __bounded((__minbytes__, 1, CURVE25519_SIZE)) + __bounded((__minbytes__, 2, CURVE25519_SIZE)); void derive_ssh1_session_id(BIGNUM *, BIGNUM *, u_int8_t[8], u_int8_t[16]); -- cgit v1.2.3