summaryrefslogtreecommitdiff
path: root/sshkey.h
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2018-09-12 01:32:54 +0000
committerDamien Miller <djm@mindrot.org>2018-09-12 16:49:21 +1000
commitba9e788315b1f6a350f910cb2a9e95b2ce584e89 (patch)
tree2bc5013faf5d1c4daf26d6db1547aa7602e59306 /sshkey.h
parenta70fd4ad7bd9f2ed223ff635a3d41e483057f23b (diff)
upstream: add sshkey_check_cert_sigtype() that checks a
cert->signature_type against a supplied whitelist; ok markus OpenBSD-Commit-ID: caadb8073292ed7a9535e5adc067d11d356d9302
Diffstat (limited to 'sshkey.h')
-rw-r--r--sshkey.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/sshkey.h b/sshkey.h
index b8f279a60..5a22a66f5 100644
--- a/sshkey.h
+++ b/sshkey.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: sshkey.h,v 1.27 2018/09/12 01:31:30 djm Exp $ */ 1/* $OpenBSD: sshkey.h,v 1.28 2018/09/12 01:32:54 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.
@@ -158,6 +158,7 @@ int sshkey_cert_check_authority(const struct sshkey *, int, int,
158 const char *, const char **); 158 const char *, const char **);
159size_t sshkey_format_cert_validity(const struct sshkey_cert *, 159size_t sshkey_format_cert_validity(const struct sshkey_cert *,
160 char *, size_t) __attribute__((__bounded__(__string__, 2, 3))); 160 char *, size_t) __attribute__((__bounded__(__string__, 2, 3)));
161int sshkey_check_cert_sigtype(const struct sshkey *, const char *);
161 162
162int sshkey_certify(struct sshkey *, struct sshkey *, const char *); 163int sshkey_certify(struct sshkey *, struct sshkey *, const char *);
163/* Variant allowing use of a custom signature function (e.g. for ssh-agent) */ 164/* Variant allowing use of a custom signature function (e.g. for ssh-agent) */