diff options
| author | Damien Miller <djm@mindrot.org> | 2014-04-20 05:21:22 +0200 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2014-04-20 05:21:22 +0200 |
| commit | 4f40209aa4060b9c066a2f0d9332ace7b8dfb391 (patch) | |
| tree | 3f023418e3afa0ae151339aecae6d72b978014b8 /cipher-chachapoly.h | |
| parent | Three commits in one (since they touch the same heavily-diverged file (diff) | |
| download | openssh-4f40209aa4060b9c066a2f0d9332ace7b8dfb391.tar.xz openssh-4f40209aa4060b9c066a2f0d9332ace7b8dfb391.zip | |
- 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
Diffstat (limited to 'cipher-chachapoly.h')
| -rw-r--r-- | cipher-chachapoly.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cipher-chachapoly.h b/cipher-chachapoly.h index 1628693b2..35326b9a3 100644 --- a/cipher-chachapoly.h +++ b/cipher-chachapoly.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cipher-chachapoly.h,v 1.1 2013/11/21 00:45:44 djm Exp $ */ +/* $OpenBSD: cipher-chachapoly.h,v 1.2 2014/03/26 04:55:35 djm Exp $ */ /* * Copyright (c) Damien Miller 2013 <djm@mindrot.org> @@ -30,12 +30,12 @@ struct chachapoly_ctx { void chachapoly_init(struct chachapoly_ctx *cpctx, const u_char *key, u_int keylen) - __attribute__((__bounded__(__buffer__, 2, 3))); + __bounded((__buffer__, 2, 3)); int chachapoly_crypt(struct chachapoly_ctx *cpctx, u_int seqnr, u_char *dest, const u_char *src, u_int len, u_int aadlen, u_int authlen, int do_encrypt); int chachapoly_get_length(struct chachapoly_ctx *cpctx, u_int *plenp, u_int seqnr, const u_char *cp, u_int len) - __attribute__((__bounded__(__buffer__, 4, 5))); + __bounded((__buffer__, 4, 5)); #endif /* CHACHA_POLY_AEAD_H */ |