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 /chacha.h | |
parent | 294c58a007cfb2f3bddc4fc3217e255857ffb9bf (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 'chacha.h')
-rw-r--r-- | chacha.h | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: chacha.h,v 1.2 2014/03/26 04:55:35 djm Exp $ */ | 1 | /* $OpenBSD: chacha.h,v 1.3 2014/05/02 03:27:54 djm Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | chacha-merged.c version 20080118 | 4 | chacha-merged.c version 20080118 |
@@ -22,14 +22,14 @@ struct chacha_ctx { | |||
22 | #define CHACHA_BLOCKLEN 64 | 22 | #define CHACHA_BLOCKLEN 64 |
23 | 23 | ||
24 | void chacha_keysetup(struct chacha_ctx *x, const u_char *k, u_int kbits) | 24 | void chacha_keysetup(struct chacha_ctx *x, const u_char *k, u_int kbits) |
25 | __bounded((__minbytes__, 2, CHACHA_MINKEYLEN)); | 25 | __attribute__((__bounded__(__minbytes__, 2, CHACHA_MINKEYLEN))); |
26 | void chacha_ivsetup(struct chacha_ctx *x, const u_char *iv, const u_char *ctr) | 26 | void chacha_ivsetup(struct chacha_ctx *x, const u_char *iv, const u_char *ctr) |
27 | __bounded((__minbytes__, 2, CHACHA_NONCELEN)) | 27 | __attribute__((__bounded__(__minbytes__, 2, CHACHA_NONCELEN))) |
28 | __bounded((__minbytes__, 3, CHACHA_CTRLEN)); | 28 | __attribute__((__bounded__(__minbytes__, 3, CHACHA_CTRLEN))); |
29 | void chacha_encrypt_bytes(struct chacha_ctx *x, const u_char *m, | 29 | void chacha_encrypt_bytes(struct chacha_ctx *x, const u_char *m, |
30 | u_char *c, u_int bytes) | 30 | u_char *c, u_int bytes) |
31 | __bounded((__buffer__, 2, 4)) | 31 | __attribute__((__bounded__(__buffer__, 2, 4))) |
32 | __bounded((__buffer__, 3, 4)); | 32 | __attribute__((__bounded__(__buffer__, 3, 4))); |
33 | 33 | ||
34 | #endif /* CHACHA_H */ | 34 | #endif /* CHACHA_H */ |
35 | 35 | ||