summaryrefslogtreecommitdiff
path: root/ssh-pkcs11.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2014-04-20 13:21:22 +1000
committerDamien Miller <djm@mindrot.org>2014-04-20 13:21:22 +1000
commit4f40209aa4060b9c066a2f0d9332ace7b8dfb391 (patch)
tree3f023418e3afa0ae151339aecae6d72b978014b8 /ssh-pkcs11.c
parent9235a030ad1b16903fb495d81544e0f7c7449523 (diff)
downloadopenssh-git-4f40209aa4060b9c066a2f0d9332ace7b8dfb391.tar.gz
- 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 'ssh-pkcs11.c')
-rw-r--r--ssh-pkcs11.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ssh-pkcs11.c b/ssh-pkcs11.c
index c49cbf42..ed5268c1 100644
--- a/ssh-pkcs11.c
+++ b/ssh-pkcs11.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-pkcs11.c,v 1.11 2013/11/13 13:48:20 markus Exp $ */
+/* $OpenBSD: ssh-pkcs11.c,v 1.12 2014/03/26 04:55:35 djm Exp $ */
/*
* Copyright (c) 2010 Markus Friedl. All rights reserved.
*
@@ -386,7 +386,7 @@ pkcs11_open_session(struct pkcs11_provider *p, CK_ULONG slotidx, char *pin)
*/
static int pkcs11_fetch_keys_filter(struct pkcs11_provider *, CK_ULONG,
CK_ATTRIBUTE [], CK_ATTRIBUTE [3], Key ***, int *)
- __attribute__((__bounded__(__minbytes__,4, 3 * sizeof(CK_ATTRIBUTE))));
+ __bounded((__minbytes__,4, 3 * sizeof(CK_ATTRIBUTE)));
static int
pkcs11_fetch_keys(struct pkcs11_provider *p, CK_ULONG slotidx,