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 /kexc25519.c | |
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 'kexc25519.c')
-rw-r--r-- | kexc25519.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kexc25519.c b/kexc25519.c index 4dc842c44..e3afa0055 100644 --- a/kexc25519.c +++ b/kexc25519.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: kexc25519.c,v 1.6 2014/03/26 04:55:35 djm Exp $ */ | 1 | /* $OpenBSD: kexc25519.c,v 1.7 2014/05/02 03:27:54 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2001, 2013 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2001, 2013 Markus Friedl. All rights reserved. |
4 | * Copyright (c) 2010 Damien Miller. All rights reserved. | 4 | * Copyright (c) 2010 Damien Miller. All rights reserved. |
@@ -45,9 +45,9 @@ | |||
45 | 45 | ||
46 | extern int crypto_scalarmult_curve25519(u_char a[CURVE25519_SIZE], | 46 | extern int crypto_scalarmult_curve25519(u_char a[CURVE25519_SIZE], |
47 | const u_char b[CURVE25519_SIZE], const u_char c[CURVE25519_SIZE]) | 47 | const u_char b[CURVE25519_SIZE], const u_char c[CURVE25519_SIZE]) |
48 | __bounded((__minbytes__, 1, CURVE25519_SIZE)) | 48 | __attribute__((__bounded__(__minbytes__, 1, CURVE25519_SIZE))) |
49 | __bounded((__minbytes__, 2, CURVE25519_SIZE)) | 49 | __attribute__((__bounded__(__minbytes__, 2, CURVE25519_SIZE))) |
50 | __bounded((__minbytes__, 3, CURVE25519_SIZE)); | 50 | __attribute__((__bounded__(__minbytes__, 3, CURVE25519_SIZE))); |
51 | 51 | ||
52 | void | 52 | void |
53 | kexc25519_keygen(u_char key[CURVE25519_SIZE], u_char pub[CURVE25519_SIZE]) | 53 | kexc25519_keygen(u_char key[CURVE25519_SIZE], u_char pub[CURVE25519_SIZE]) |