diff options
| author | Damien Miller <djm@mindrot.org> | 2014-05-15 14:37:03 +1000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2014-05-15 14:37:03 +1000 |
| commit | 686c7d9ee6f44b2be4128d7860b6b37adaeba733 (patch) | |
| tree | 7f6a31d5d100a462e51a122189d3fc1ab2117d12 /cipher-chachapoly.h | |
| parent | 294c58a007cfb2f3bddc4fc3217e255857ffb9bf (diff) | |
| download | openssh-git-686c7d9ee6f44b2be4128d7860b6b37adaeba733.tar.gz | |
- 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 '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 35326b9a..7948dcdc 100644 --- a/cipher-chachapoly.h +++ b/cipher-chachapoly.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cipher-chachapoly.h,v 1.2 2014/03/26 04:55:35 djm Exp $ */ +/* $OpenBSD: cipher-chachapoly.h,v 1.3 2014/05/02 03:27:54 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) - __bounded((__buffer__, 2, 3)); + __attribute__((__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) - __bounded((__buffer__, 4, 5)); + __attribute__((__bounded__(__buffer__, 4, 5))); #endif /* CHACHA_POLY_AEAD_H */ |