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 /kex.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 'kex.h')
| -rw-r--r-- | kex.h | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: kex.h,v 1.63 2014/03/26 04:55:35 djm Exp $ */ +/* $OpenBSD: kex.h,v 1.64 2014/05/02 03:27:54 djm Exp $ */ /* * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. @@ -187,12 +187,12 @@ kex_c25519_hash(int, char *, char *, char *, int, #define CURVE25519_SIZE 32 void kexc25519_keygen(u_char[CURVE25519_SIZE], u_char[CURVE25519_SIZE]) - __bounded((__minbytes__, 1, CURVE25519_SIZE)) - __bounded((__minbytes__, 2, CURVE25519_SIZE)); + __attribute__((__bounded__(__minbytes__, 1, CURVE25519_SIZE))) + __attribute__((__bounded__(__minbytes__, 2, CURVE25519_SIZE))); void kexc25519_shared_key(const u_char key[CURVE25519_SIZE], const u_char pub[CURVE25519_SIZE], Buffer *out) - __bounded((__minbytes__, 1, CURVE25519_SIZE)) - __bounded((__minbytes__, 2, CURVE25519_SIZE)); + __attribute__((__bounded__(__minbytes__, 1, CURVE25519_SIZE))) + __attribute__((__bounded__(__minbytes__, 2, CURVE25519_SIZE))); void derive_ssh1_session_id(BIGNUM *, BIGNUM *, u_int8_t[8], u_int8_t[16]); |