summaryrefslogtreecommitdiff
path: root/sshkey.h
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2016-02-29 12:15:15 +0000
committerColin Watson <cjwatson@debian.org>2016-02-29 12:15:15 +0000
commitc52a95cc4754e6630c96fe65ae0c65eb41d2c590 (patch)
tree793395934013923b7b2426382c0676edcd4be3d4 /sshkey.h
parenteeff4de96f5d7365750dc56912c2c62b5c28db6b (diff)
parent72b061d4ba0f909501c595d709ea76e06b01e5c9 (diff)
Import openssh_7.2p1.orig.tar.gz
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 c8d3cddca..a20a14f9e 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.
@@ -141,6 +141,8 @@ int sshkey_certify(struct sshkey *, struct sshkey *);
141int sshkey_cert_copy(const struct sshkey *, struct sshkey *); 141int sshkey_cert_copy(const struct sshkey *, struct sshkey *);
142int sshkey_cert_check_authority(const struct sshkey *, int, int, 142int sshkey_cert_check_authority(const struct sshkey *, int, int,
143 const char *, const char **); 143 const char *, const char **);
144size_t sshkey_format_cert_validity(const struct sshkey_cert *,
145 char *, size_t) __attribute__((__bounded__(__string__, 2, 3)));
144 146
145int sshkey_ecdsa_nid_from_name(const char *); 147int sshkey_ecdsa_nid_from_name(const char *);
146int sshkey_curve_name_to_nid(const char *); 148int sshkey_curve_name_to_nid(const char *);
@@ -167,7 +169,7 @@ int sshkey_plain_to_blob(const struct sshkey *, u_char **, size_t *);
167int sshkey_putb_plain(const struct sshkey *, struct sshbuf *); 169int sshkey_putb_plain(const struct sshkey *, struct sshbuf *);
168 170
169int sshkey_sign(const struct sshkey *, u_char **, size_t *, 171int sshkey_sign(const struct sshkey *, u_char **, size_t *,
170 const u_char *, size_t, u_int); 172 const u_char *, size_t, const char *, u_int);
171int sshkey_verify(const struct sshkey *, const u_char *, size_t, 173int sshkey_verify(const struct sshkey *, const u_char *, size_t,
172 const u_char *, size_t, u_int); 174 const u_char *, size_t, u_int);
173 175
@@ -186,17 +188,16 @@ int sshkey_private_to_fileblob(struct sshkey *key, struct sshbuf *blob,
186int sshkey_parse_public_rsa1_fileblob(struct sshbuf *blob, 188int sshkey_parse_public_rsa1_fileblob(struct sshbuf *blob,
187 struct sshkey **keyp, char **commentp); 189 struct sshkey **keyp, char **commentp);
188int sshkey_parse_private_fileblob(struct sshbuf *buffer, 190int sshkey_parse_private_fileblob(struct sshbuf *buffer,
189 const char *passphrase, const char *filename, struct sshkey **keyp, 191 const char *passphrase, struct sshkey **keyp, char **commentp);
190 char **commentp);
191int sshkey_parse_private_fileblob_type(struct sshbuf *blob, int type, 192int sshkey_parse_private_fileblob_type(struct sshbuf *blob, int type,
192 const char *passphrase, struct sshkey **keyp, char **commentp); 193 const char *passphrase, struct sshkey **keyp, char **commentp);
193 194
194#ifdef SSHKEY_INTERNAL 195#ifdef SSHKEY_INTERNAL
195int ssh_rsa_sign(const struct sshkey *key, u_char **sigp, size_t *lenp, 196int ssh_rsa_sign(const struct sshkey *key,
196 const u_char *data, size_t datalen, u_int compat); 197 u_char **sigp, size_t *lenp, const u_char *data, size_t datalen,
198 const char *ident);
197int ssh_rsa_verify(const struct sshkey *key, 199int ssh_rsa_verify(const struct sshkey *key,
198 const u_char *signature, size_t signaturelen, 200 const u_char *sig, size_t siglen, const u_char *data, size_t datalen);
199 const u_char *data, size_t datalen, u_int compat);
200int ssh_dss_sign(const struct sshkey *key, u_char **sigp, size_t *lenp, 201int ssh_dss_sign(const struct sshkey *key, u_char **sigp, size_t *lenp,
201 const u_char *data, size_t datalen, u_int compat); 202 const u_char *data, size_t datalen, u_int compat);
202int ssh_dss_verify(const struct sshkey *key, 203int ssh_dss_verify(const struct sshkey *key,