diff options
Diffstat (limited to 'ssh-gss.h')
-rw-r--r-- | ssh-gss.h | 19 |
1 files changed, 14 insertions, 5 deletions
@@ -70,7 +70,15 @@ | |||
70 | #define SSH2_MSG_KEXGSS_GROUP 41 | 70 | #define SSH2_MSG_KEXGSS_GROUP 41 |
71 | #define KEX_GSS_GRP1_SHA1_ID "gss-group1-sha1-" | 71 | #define KEX_GSS_GRP1_SHA1_ID "gss-group1-sha1-" |
72 | #define KEX_GSS_GRP14_SHA1_ID "gss-group14-sha1-" | 72 | #define KEX_GSS_GRP14_SHA1_ID "gss-group14-sha1-" |
73 | #define KEX_GSS_GRP14_SHA256_ID "gss-group14-sha256-" | ||
74 | #define KEX_GSS_GRP16_SHA512_ID "gss-group16-sha512-" | ||
73 | #define KEX_GSS_GEX_SHA1_ID "gss-gex-sha1-" | 75 | #define KEX_GSS_GEX_SHA1_ID "gss-gex-sha1-" |
76 | #define KEX_GSS_NISTP256_SHA256_ID "gss-nistp256-sha256-" | ||
77 | #define KEX_GSS_C25519_SHA256_ID "gss-curve25519-sha256-" | ||
78 | |||
79 | #define GSS_KEX_DEFAULT_KEX \ | ||
80 | KEX_GSS_GEX_SHA1_ID "," \ | ||
81 | KEX_GSS_GRP14_SHA1_ID | ||
74 | 82 | ||
75 | typedef struct { | 83 | typedef struct { |
76 | char *filename; | 84 | char *filename; |
@@ -126,6 +134,7 @@ OM_uint32 ssh_gssapi_test_oid_supported(OM_uint32 *, gss_OID, int *); | |||
126 | 134 | ||
127 | struct sshbuf; | 135 | struct sshbuf; |
128 | int ssh_gssapi_get_buffer_desc(struct sshbuf *, gss_buffer_desc *); | 136 | int ssh_gssapi_get_buffer_desc(struct sshbuf *, gss_buffer_desc *); |
137 | int ssh_gssapi_sshpkt_get_buffer_desc(struct ssh *, gss_buffer_desc *); | ||
129 | 138 | ||
130 | OM_uint32 ssh_gssapi_import_name(Gssctxt *, const char *); | 139 | OM_uint32 ssh_gssapi_import_name(Gssctxt *, const char *); |
131 | OM_uint32 ssh_gssapi_init_ctx(Gssctxt *, int, | 140 | OM_uint32 ssh_gssapi_init_ctx(Gssctxt *, int, |
@@ -145,16 +154,16 @@ OM_uint32 ssh_gssapi_client_identity(Gssctxt *, const char *); | |||
145 | int ssh_gssapi_credentials_updated(Gssctxt *); | 154 | int ssh_gssapi_credentials_updated(Gssctxt *); |
146 | 155 | ||
147 | /* In the server */ | 156 | /* In the server */ |
148 | typedef int ssh_gssapi_check_fn(Gssctxt **, gss_OID, const char *, | 157 | typedef int ssh_gssapi_check_fn(Gssctxt **, gss_OID, const char *, |
149 | const char *); | 158 | const char *); |
150 | char *ssh_gssapi_client_mechanisms(const char *, const char *); | 159 | char *ssh_gssapi_client_mechanisms(const char *, const char *, const char *); |
151 | char *ssh_gssapi_kex_mechs(gss_OID_set, ssh_gssapi_check_fn *, const char *, | 160 | char *ssh_gssapi_kex_mechs(gss_OID_set, ssh_gssapi_check_fn *, const char *, |
152 | const char *); | 161 | const char *, const char *); |
153 | gss_OID ssh_gssapi_id_kex(Gssctxt *, char *, int); | 162 | gss_OID ssh_gssapi_id_kex(Gssctxt *, char *, int); |
154 | int ssh_gssapi_server_check_mech(Gssctxt **,gss_OID, const char *, | 163 | int ssh_gssapi_server_check_mech(Gssctxt **,gss_OID, const char *, |
155 | const char *); | 164 | const char *); |
156 | OM_uint32 ssh_gssapi_server_ctx(Gssctxt **, gss_OID); | 165 | OM_uint32 ssh_gssapi_server_ctx(Gssctxt **, gss_OID); |
157 | int ssh_gssapi_userok(char *name, struct passwd *); | 166 | int ssh_gssapi_userok(char *name, struct passwd *, int kex); |
158 | OM_uint32 ssh_gssapi_checkmic(Gssctxt *, gss_buffer_t, gss_buffer_t); | 167 | OM_uint32 ssh_gssapi_checkmic(Gssctxt *, gss_buffer_t, gss_buffer_t); |
159 | void ssh_gssapi_do_child(char ***, u_int *); | 168 | void ssh_gssapi_do_child(char ***, u_int *); |
160 | void ssh_gssapi_cleanup_creds(void); | 169 | void ssh_gssapi_cleanup_creds(void); |