diff options
author | Damien Miller <djm@mindrot.org> | 2000-03-26 13:04:51 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2000-03-26 13:04:51 +1000 |
commit | 450a7a1ff40fe7c2d84c93b83cf2df53445d807d (patch) | |
tree | db6d08bdea65edd34ba2e323a31e2b1ca5e5fbd4 /ssh.h | |
parent | 2c9279fa667827384fceb243f890cba1dbe480de (diff) |
- OpenBSD CVS update
- [auth-krb4.c]
-Wall
- [auth-rh-rsa.c auth-rsa.c hostfile.c hostfile.h key.c key.h match.c]
[match.h ssh.c ssh.h sshconnect.c sshd.c]
initial support for DSA keys. ok deraadt@, niels@
- [cipher.c cipher.h]
remove unused cipher_attack_detected code
- [scp.1 ssh-add.1 ssh-agent.1 ssh-keygen.1 ssh.1 sshd.8]
Fix some formatting problems I missed before.
- [ssh.1 sshd.8]
fix spelling errors, From: FreeBSD
- [ssh.c]
switch to raw mode only if he _get_ a pty (not if we _want_ a pty).
Diffstat (limited to 'ssh.h')
-rw-r--r-- | ssh.h | 36 |
1 files changed, 3 insertions, 33 deletions
@@ -13,7 +13,7 @@ | |||
13 | * | 13 | * |
14 | */ | 14 | */ |
15 | 15 | ||
16 | /* RCSID("$Id: ssh.h,v 1.27 2000/03/09 10:27:52 damien Exp $"); */ | 16 | /* RCSID("$Id: ssh.h,v 1.28 2000/03/26 03:04:54 damien Exp $"); */ |
17 | 17 | ||
18 | #ifndef SSH_H | 18 | #ifndef SSH_H |
19 | #define SSH_H | 19 | #define SSH_H |
@@ -338,8 +338,7 @@ int auth_rhosts(struct passwd * pw, const char *client_user); | |||
338 | * its host key. Returns true if authentication succeeds. | 338 | * its host key. Returns true if authentication succeeds. |
339 | */ | 339 | */ |
340 | int | 340 | int |
341 | auth_rhosts_rsa(struct passwd * pw, const char *client_user, | 341 | auth_rhosts_rsa(struct passwd * pw, const char *client_user, RSA* client_host_key); |
342 | BIGNUM * client_host_key_e, BIGNUM * client_host_key_n); | ||
343 | 342 | ||
344 | /* | 343 | /* |
345 | * Tries to authenticate the user using password. Returns true if | 344 | * Tries to authenticate the user using password. Returns true if |
@@ -388,40 +387,11 @@ int get_local_port(void); | |||
388 | 387 | ||
389 | 388 | ||
390 | /* | 389 | /* |
391 | * Tries to match the host name (which must be in all lowercase) against the | ||
392 | * comma-separated sequence of subpatterns (each possibly preceded by ! to | ||
393 | * indicate negation). Returns true if there is a positive match; zero | ||
394 | * otherwise. | ||
395 | */ | ||
396 | int match_hostname(const char *host, const char *pattern, unsigned int len); | ||
397 | |||
398 | /* | ||
399 | * Checks whether the given host is already in the list of our known hosts. | ||
400 | * Returns HOST_OK if the host is known and has the specified key, HOST_NEW | ||
401 | * if the host is not known, and HOST_CHANGED if the host is known but used | ||
402 | * to have a different host key. The host must be in all lowercase. | ||
403 | */ | ||
404 | typedef enum { | ||
405 | HOST_OK, HOST_NEW, HOST_CHANGED | ||
406 | } HostStatus; | ||
407 | HostStatus | ||
408 | check_host_in_hostfile(const char *filename, const char *host, | ||
409 | BIGNUM * e, BIGNUM * n, BIGNUM * ke, BIGNUM * kn); | ||
410 | |||
411 | /* | ||
412 | * Appends an entry to the host file. Returns false if the entry could not | ||
413 | * be appended. | ||
414 | */ | ||
415 | int | ||
416 | add_host_to_hostfile(const char *filename, const char *host, | ||
417 | BIGNUM * e, BIGNUM * n); | ||
418 | |||
419 | /* | ||
420 | * Performs the RSA authentication challenge-response dialog with the client, | 390 | * Performs the RSA authentication challenge-response dialog with the client, |
421 | * and returns true (non-zero) if the client gave the correct answer to our | 391 | * and returns true (non-zero) if the client gave the correct answer to our |
422 | * challenge; returns zero if the client gives a wrong answer. | 392 | * challenge; returns zero if the client gives a wrong answer. |
423 | */ | 393 | */ |
424 | int auth_rsa_challenge_dialog(BIGNUM * e, BIGNUM * n); | 394 | int auth_rsa_challenge_dialog(RSA *pk); |
425 | 395 | ||
426 | /* | 396 | /* |
427 | * Reads a passphrase from /dev/tty with echo turned off. Returns the | 397 | * Reads a passphrase from /dev/tty with echo turned off. Returns the |