summaryrefslogtreecommitdiff
path: root/authfd.h
diff options
context:
space:
mode:
authormarkus@openbsd.org <markus@openbsd.org>2015-12-04 16:41:28 +0000
committerDamien Miller <djm@mindrot.org>2015-12-07 12:38:58 +1100
commit76c9fbbe35aabc1db977fb78e827644345e9442e (patch)
treee7c85e7e1471f1bd00b3a50a58e315c055f40b86 /authfd.h
parent6064a8b8295cb5a17b5ebcfade53053377714f40 (diff)
upstream commit
implement SHA2-{256,512} for RSASSA-PKCS1-v1_5 signatures (user and host auth) based on draft-rsa-dsa-sha2-256-03.txt and draft-ssh-ext-info-04.txt; with & ok djm@ Upstream-ID: cf82ce532b2733e5c4b34bb7b7c94835632db309
Diffstat (limited to 'authfd.h')
-rw-r--r--authfd.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/authfd.h b/authfd.h
index bea20c26b..4b417e3f4 100644
--- a/authfd.h
+++ b/authfd.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: authfd.h,v 1.38 2015/01/14 20:05:27 djm Exp $ */ 1/* $OpenBSD: authfd.h,v 1.39 2015/12/04 16:41:28 markus Exp $ */
2 2
3/* 3/*
4 * Author: Tatu Ylonen <ylo@cs.hut.fi> 4 * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -41,7 +41,7 @@ int ssh_decrypt_challenge(int sock, struct sshkey* key, BIGNUM *challenge,
41 u_char session_id[16], u_char response[16]); 41 u_char session_id[16], u_char response[16]);
42int ssh_agent_sign(int sock, struct sshkey *key, 42int ssh_agent_sign(int sock, struct sshkey *key,
43 u_char **sigp, size_t *lenp, 43 u_char **sigp, size_t *lenp,
44 const u_char *data, size_t datalen, u_int compat); 44 const u_char *data, size_t datalen, const char *alg, u_int compat);
45 45
46/* Messages for the authentication agent connection. */ 46/* Messages for the authentication agent connection. */
47#define SSH_AGENTC_REQUEST_RSA_IDENTITIES 1 47#define SSH_AGENTC_REQUEST_RSA_IDENTITIES 1
@@ -86,5 +86,7 @@ int ssh_agent_sign(int sock, struct sshkey *key,
86#define SSH_COM_AGENT2_FAILURE 102 86#define SSH_COM_AGENT2_FAILURE 102
87 87
88#define SSH_AGENT_OLD_SIGNATURE 0x01 88#define SSH_AGENT_OLD_SIGNATURE 0x01
89#define SSH_AGENT_RSA_SHA2_256 0x02
90#define SSH_AGENT_RSA_SHA2_512 0x04
89 91
90#endif /* AUTHFD_H */ 92#endif /* AUTHFD_H */