summaryrefslogtreecommitdiff
path: root/sshkey.h
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@dtucker.net>2018-02-27 08:41:25 +1100
committerDarren Tucker <dtucker@dtucker.net>2018-02-27 08:51:56 +1100
commit1323f120d06a26074c4d154fcbe7f49bcad3d741 (patch)
treef54c849c6f1372cda95c5493358cbb87473aa5b6 /sshkey.h
parentf0b245b0439e600fab782d19e97980e9f2c2533c (diff)
Check for attributes on prototype args.
Some compilers (gcc 2.9.53, 3.0 and probably others, see gcc bug #3481) do not accept __attribute__ on function pointer prototype args. Check for this and hide them if they're not accepted.
Diffstat (limited to 'sshkey.h')
-rw-r--r--sshkey.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/sshkey.h b/sshkey.h
index c795815fa..155cd45ae 100644
--- a/sshkey.h
+++ b/sshkey.h
@@ -220,7 +220,11 @@ int sshkey_parse_private_fileblob_type(struct sshbuf *blob, int type,
220int ssh_rsa_generate_additional_parameters(struct sshkey *); 220int ssh_rsa_generate_additional_parameters(struct sshkey *);
221 221
222/* stateful keys (e.g. XMSS) */ 222/* stateful keys (e.g. XMSS) */
223#ifdef NO_ATTRIBUTE_ON_PROTOTYPE_ARGS
224typedef void sshkey_printfn(const char *, ...);
225#else
223typedef void sshkey_printfn(const char *, ...) __attribute__((format(printf, 1, 2))); 226typedef void sshkey_printfn(const char *, ...) __attribute__((format(printf, 1, 2)));
227#endif
224int sshkey_set_filename(struct sshkey *, const char *); 228int sshkey_set_filename(struct sshkey *, const char *);
225int sshkey_enable_maxsign(struct sshkey *, u_int32_t); 229int sshkey_enable_maxsign(struct sshkey *, u_int32_t);
226u_int32_t sshkey_signatures_left(const struct sshkey *); 230u_int32_t sshkey_signatures_left(const struct sshkey *);