summaryrefslogtreecommitdiff
path: root/sshkey.h
diff options
context:
space:
mode:
Diffstat (limited to 'sshkey.h')
-rw-r--r--sshkey.h17
1 files changed, 9 insertions, 8 deletions
diff --git a/sshkey.h b/sshkey.h
index 5cf4e5d8f..2259cbb62 100644
--- a/sshkey.h
+++ b/sshkey.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: sshkey.h,v 1.9 2015/08/04 05:23:06 djm Exp $ */ 1/* $OpenBSD: sshkey.h,v 1.12 2015/12/04 16:41:28 markus 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.
@@ -142,6 +142,8 @@ int sshkey_certify(struct sshkey *, struct sshkey *);
142int sshkey_cert_copy(const struct sshkey *, struct sshkey *); 142int sshkey_cert_copy(const struct sshkey *, struct sshkey *);
143int sshkey_cert_check_authority(const struct sshkey *, int, int, 143int sshkey_cert_check_authority(const struct sshkey *, int, int,
144 const char *, const char **); 144 const char *, const char **);
145size_t sshkey_format_cert_validity(const struct sshkey_cert *,
146 char *, size_t) __attribute__((__bounded__(__string__, 2, 3)));
145 147
146int sshkey_ecdsa_nid_from_name(const char *); 148int sshkey_ecdsa_nid_from_name(const char *);
147int sshkey_curve_name_to_nid(const char *); 149int sshkey_curve_name_to_nid(const char *);
@@ -168,7 +170,7 @@ int sshkey_plain_to_blob(const struct sshkey *, u_char **, size_t *);
168int sshkey_putb_plain(const struct sshkey *, struct sshbuf *); 170int sshkey_putb_plain(const struct sshkey *, struct sshbuf *);
169 171
170int sshkey_sign(const struct sshkey *, u_char **, size_t *, 172int sshkey_sign(const struct sshkey *, u_char **, size_t *,
171 const u_char *, size_t, u_int); 173 const u_char *, size_t, const char *, u_int);
172int sshkey_verify(const struct sshkey *, const u_char *, size_t, 174int sshkey_verify(const struct sshkey *, const u_char *, size_t,
173 const u_char *, size_t, u_int); 175 const u_char *, size_t, u_int);
174 176
@@ -187,17 +189,16 @@ int sshkey_private_to_fileblob(struct sshkey *key, struct sshbuf *blob,
187int sshkey_parse_public_rsa1_fileblob(struct sshbuf *blob, 189int sshkey_parse_public_rsa1_fileblob(struct sshbuf *blob,
188 struct sshkey **keyp, char **commentp); 190 struct sshkey **keyp, char **commentp);
189int sshkey_parse_private_fileblob(struct sshbuf *buffer, 191int sshkey_parse_private_fileblob(struct sshbuf *buffer,
190 const char *passphrase, const char *filename, struct sshkey **keyp, 192 const char *passphrase, struct sshkey **keyp, char **commentp);
191 char **commentp);
192int sshkey_parse_private_fileblob_type(struct sshbuf *blob, int type, 193int sshkey_parse_private_fileblob_type(struct sshbuf *blob, int type,
193 const char *passphrase, struct sshkey **keyp, char **commentp); 194 const char *passphrase, struct sshkey **keyp, char **commentp);
194 195
195#ifdef SSHKEY_INTERNAL 196#ifdef SSHKEY_INTERNAL
196int ssh_rsa_sign(const struct sshkey *key, u_char **sigp, size_t *lenp, 197int ssh_rsa_sign(const struct sshkey *key,
197 const u_char *data, size_t datalen, u_int compat); 198 u_char **sigp, size_t *lenp, const u_char *data, size_t datalen,
199 const char *ident);
198int ssh_rsa_verify(const struct sshkey *key, 200int ssh_rsa_verify(const struct sshkey *key,
199 const u_char *signature, size_t signaturelen, 201 const u_char *sig, size_t siglen, const u_char *data, size_t datalen);
200 const u_char *data, size_t datalen, u_int compat);
201int ssh_dss_sign(const struct sshkey *key, u_char **sigp, size_t *lenp, 202int ssh_dss_sign(const struct sshkey *key, u_char **sigp, size_t *lenp,
202 const u_char *data, size_t datalen, u_int compat); 203 const u_char *data, size_t datalen, u_int compat);
203int ssh_dss_verify(const struct sshkey *key, 204int ssh_dss_verify(const struct sshkey *key,