summaryrefslogtreecommitdiff
path: root/misc.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 /misc.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 'misc.h')
-rw-r--r--misc.h18
1 files changed, 9 insertions, 9 deletions
diff --git a/misc.h b/misc.h
index 309d4ec1..7b0c503a 100644
--- a/misc.h
+++ b/misc.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: misc.h,v 1.52 2014/04/20 02:30:25 djm Exp $ */
+/* $OpenBSD: misc.h,v 1.53 2014/05/02 03:27:54 djm Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -70,23 +70,23 @@ int tun_open(int, int);
/* Functions to extract or store big-endian words of various sizes */
u_int64_t get_u64(const void *)
- __bounded(( __minbytes__, 1, 8));
+ __attribute__((__bounded__( __minbytes__, 1, 8)));
u_int32_t get_u32(const void *)
- __bounded(( __minbytes__, 1, 4));
+ __attribute__((__bounded__( __minbytes__, 1, 4)));
u_int16_t get_u16(const void *)
- __bounded(( __minbytes__, 1, 2));
+ __attribute__((__bounded__( __minbytes__, 1, 2)));
void put_u64(void *, u_int64_t)
- __bounded(( __minbytes__, 1, 8));
+ __attribute__((__bounded__( __minbytes__, 1, 8)));
void put_u32(void *, u_int32_t)
- __bounded(( __minbytes__, 1, 4));
+ __attribute__((__bounded__( __minbytes__, 1, 4)));
void put_u16(void *, u_int16_t)
- __bounded(( __minbytes__, 1, 2));
+ __attribute__((__bounded__( __minbytes__, 1, 2)));
/* Little-endian store/load, used by umac.c */
u_int32_t get_u32_le(const void *)
- __bounded(( __minbytes__, 1, 4));
+ __attribute__((__bounded__(__minbytes__, 1, 4)));
void put_u32_le(void *, u_int32_t)
- __bounded(( __minbytes__, 1, 4));
+ __attribute__((__bounded__(__minbytes__, 1, 4)));
struct bwlimit {
size_t buflen;