diff options
author | Damien Miller <djm@mindrot.org> | 2014-04-20 13:21:22 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2014-04-20 13:21:22 +1000 |
commit | 4f40209aa4060b9c066a2f0d9332ace7b8dfb391 (patch) | |
tree | 3f023418e3afa0ae151339aecae6d72b978014b8 /kex.h | |
parent | 9235a030ad1b16903fb495d81544e0f7c7449523 (diff) |
- 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 'kex.h')
-rw-r--r-- | kex.h | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: kex.h,v 1.62 2014/01/27 18:58:14 markus Exp $ */ | 1 | /* $OpenBSD: kex.h,v 1.63 2014/03/26 04:55:35 djm Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. | 4 | * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. |
@@ -187,12 +187,12 @@ kex_c25519_hash(int, char *, char *, char *, int, | |||
187 | 187 | ||
188 | #define CURVE25519_SIZE 32 | 188 | #define CURVE25519_SIZE 32 |
189 | void kexc25519_keygen(u_char[CURVE25519_SIZE], u_char[CURVE25519_SIZE]) | 189 | void kexc25519_keygen(u_char[CURVE25519_SIZE], u_char[CURVE25519_SIZE]) |
190 | __attribute__((__bounded__(__minbytes__, 1, CURVE25519_SIZE))) | 190 | __bounded((__minbytes__, 1, CURVE25519_SIZE)) |
191 | __attribute__((__bounded__(__minbytes__, 2, CURVE25519_SIZE))); | 191 | __bounded((__minbytes__, 2, CURVE25519_SIZE)); |
192 | void kexc25519_shared_key(const u_char key[CURVE25519_SIZE], | 192 | void kexc25519_shared_key(const u_char key[CURVE25519_SIZE], |
193 | const u_char pub[CURVE25519_SIZE], Buffer *out) | 193 | const u_char pub[CURVE25519_SIZE], Buffer *out) |
194 | __attribute__((__bounded__(__minbytes__, 1, CURVE25519_SIZE))) | 194 | __bounded((__minbytes__, 1, CURVE25519_SIZE)) |
195 | __attribute__((__bounded__(__minbytes__, 2, CURVE25519_SIZE))); | 195 | __bounded((__minbytes__, 2, CURVE25519_SIZE)); |
196 | 196 | ||
197 | void | 197 | void |
198 | derive_ssh1_session_id(BIGNUM *, BIGNUM *, u_int8_t[8], u_int8_t[16]); | 198 | derive_ssh1_session_id(BIGNUM *, BIGNUM *, u_int8_t[8], u_int8_t[16]); |