diff options
author | djm@openbsd.org <djm@openbsd.org> | 2017-06-28 01:09:22 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2017-06-28 11:13:19 +1000 |
commit | a98339edbc1fc21342a390f345179a9c3031bef7 (patch) | |
tree | 574e103d0a458f96213e808118eb75d39bc3387f /sshkey.h | |
parent | c9cdef35524bd59007e17d5bd2502dade69e2dfb (diff) |
upstream commit
Allow ssh-keygen to use a key held in ssh-agent as a CA when
signing certificates. bz#2377 ok markus
Upstream-ID: fb42e920b592edcbb5b50465739a867c09329c8f
Diffstat (limited to 'sshkey.h')
-rw-r--r-- | sshkey.h | 10 |
1 files changed, 8 insertions, 2 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshkey.h,v 1.19 2017/06/13 11:22:15 djm Exp $ */ | 1 | /* $OpenBSD: sshkey.h,v 1.20 2017/06/28 01:09:22 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. |
@@ -137,13 +137,19 @@ int sshkey_type_is_cert(int); | |||
137 | int sshkey_type_plain(int); | 137 | int sshkey_type_plain(int); |
138 | int sshkey_to_certified(struct sshkey *); | 138 | int sshkey_to_certified(struct sshkey *); |
139 | int sshkey_drop_cert(struct sshkey *); | 139 | int sshkey_drop_cert(struct sshkey *); |
140 | int sshkey_certify(struct sshkey *, struct sshkey *, const char *); | ||
141 | int sshkey_cert_copy(const struct sshkey *, struct sshkey *); | 140 | int sshkey_cert_copy(const struct sshkey *, struct sshkey *); |
142 | int sshkey_cert_check_authority(const struct sshkey *, int, int, | 141 | int sshkey_cert_check_authority(const struct sshkey *, int, int, |
143 | const char *, const char **); | 142 | const char *, const char **); |
144 | size_t sshkey_format_cert_validity(const struct sshkey_cert *, | 143 | size_t sshkey_format_cert_validity(const struct sshkey_cert *, |
145 | char *, size_t) __attribute__((__bounded__(__string__, 2, 3))); | 144 | char *, size_t) __attribute__((__bounded__(__string__, 2, 3))); |
146 | 145 | ||
146 | int sshkey_certify(struct sshkey *, struct sshkey *, const char *); | ||
147 | /* Variant allowing use of a custom signature function (e.g. for ssh-agent) */ | ||
148 | typedef int sshkey_certify_signer(const struct sshkey *, u_char **, size_t *, | ||
149 | const u_char *, size_t, const char *, u_int, void *); | ||
150 | int sshkey_certify_custom(struct sshkey *, struct sshkey *, const char *, | ||
151 | sshkey_certify_signer *, void *); | ||
152 | |||
147 | int sshkey_ecdsa_nid_from_name(const char *); | 153 | int sshkey_ecdsa_nid_from_name(const char *); |
148 | int sshkey_curve_name_to_nid(const char *); | 154 | int sshkey_curve_name_to_nid(const char *); |
149 | const char * sshkey_curve_nid_to_name(int); | 155 | const char * sshkey_curve_nid_to_name(int); |