diff options
author | Damien Miller <djm@mindrot.org> | 1999-11-16 13:37:16 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 1999-11-16 13:37:16 +1100 |
commit | 7e8e820153a620ab1dcd81857a7de0969c41d043 (patch) | |
tree | 226cc4185feae97f4069ad60b4c18d259aa5df2f /ssh.h | |
parent | 4874c79a3a05fc18678d7a85d7091f5139630fac (diff) |
- Merged OpenBSD CVS changes:
- [auth-rh-rsa.c auth-rsa.c authfd.c authfd.h hostfile.c mpaux.c]
[mpaux.h ssh-add.c ssh-agent.c ssh.h ssh.c sshd.c]
the keysize of rsa-parameter 'n' is passed implizit,
a few more checks and warnings about 'pretended' keysizes.
- [cipher.c cipher.h packet.c packet.h sshd.c]
remove support for cipher RC4
- [ssh.c]
a note for legay systems about secuity issues with permanently_set_uid(),
the private hostkey and ptrace()
- [sshconnect.c]
more detailed messages about adding and checking hostkeys
Diffstat (limited to 'ssh.h')
-rw-r--r-- | ssh.h | 15 |
1 files changed, 6 insertions, 9 deletions
@@ -13,7 +13,7 @@ Generic header file for ssh. | |||
13 | 13 | ||
14 | */ | 14 | */ |
15 | 15 | ||
16 | /* RCSID("$Id: ssh.h,v 1.12 1999/11/12 04:19:27 damien Exp $"); */ | 16 | /* RCSID("$Id: ssh.h,v 1.13 1999/11/16 02:37:17 damien Exp $"); */ |
17 | 17 | ||
18 | #ifndef SSH_H | 18 | #ifndef SSH_H |
19 | #define SSH_H | 19 | #define SSH_H |
@@ -273,8 +273,7 @@ int auth_rhosts(struct passwd *pw, const char *client_user); | |||
273 | /* Tries to authenticate the user using the .rhosts file and the host using | 273 | /* Tries to authenticate the user using the .rhosts file and the host using |
274 | its host key. Returns true if authentication succeeds. */ | 274 | its host key. Returns true if authentication succeeds. */ |
275 | int auth_rhosts_rsa(struct passwd *pw, const char *client_user, | 275 | int auth_rhosts_rsa(struct passwd *pw, const char *client_user, |
276 | unsigned int bits, BIGNUM *client_host_key_e, | 276 | BIGNUM *client_host_key_e, BIGNUM *client_host_key_n); |
277 | BIGNUM *client_host_key_n); | ||
278 | 277 | ||
279 | /* Tries to authenticate the user using password. Returns true if | 278 | /* Tries to authenticate the user using password. Returns true if |
280 | authentication succeeds. */ | 279 | authentication succeeds. */ |
@@ -319,20 +318,18 @@ int match_hostname(const char *host, const char *pattern, unsigned int len); | |||
319 | HOST_NEW if the host is not known, and HOST_CHANGED if the host is known | 318 | HOST_NEW if the host is not known, and HOST_CHANGED if the host is known |
320 | but used to have a different host key. The host must be in all lowercase. */ | 319 | but used to have a different host key. The host must be in all lowercase. */ |
321 | typedef enum { HOST_OK, HOST_NEW, HOST_CHANGED } HostStatus; | 320 | typedef enum { HOST_OK, HOST_NEW, HOST_CHANGED } HostStatus; |
322 | HostStatus check_host_in_hostfile(const char *filename, | 321 | HostStatus check_host_in_hostfile(const char *filename, const char *host, |
323 | const char *host, unsigned int bits, | 322 | BIGNUM *e, BIGNUM *n, BIGNUM *ke, BIGNUM *kn); |
324 | BIGNUM *e, BIGNUM *n, | ||
325 | BIGNUM *ke, BIGNUM *kn); | ||
326 | 323 | ||
327 | /* Appends an entry to the host file. Returns false if the entry | 324 | /* Appends an entry to the host file. Returns false if the entry |
328 | could not be appended. */ | 325 | could not be appended. */ |
329 | int add_host_to_hostfile(const char *filename, const char *host, | 326 | int add_host_to_hostfile(const char *filename, const char *host, |
330 | unsigned int bits, BIGNUM *e, BIGNUM *n); | 327 | BIGNUM *e, BIGNUM *n); |
331 | 328 | ||
332 | /* Performs the RSA authentication challenge-response dialog with the client, | 329 | /* Performs the RSA authentication challenge-response dialog with the client, |
333 | and returns true (non-zero) if the client gave the correct answer to | 330 | and returns true (non-zero) if the client gave the correct answer to |
334 | our challenge; returns zero if the client gives a wrong answer. */ | 331 | our challenge; returns zero if the client gives a wrong answer. */ |
335 | int auth_rsa_challenge_dialog(unsigned int bits, BIGNUM *e, BIGNUM *n); | 332 | int auth_rsa_challenge_dialog(BIGNUM *e, BIGNUM *n); |
336 | 333 | ||
337 | /* Reads a passphrase from /dev/tty with echo turned off. Returns the | 334 | /* Reads a passphrase from /dev/tty with echo turned off. Returns the |
338 | passphrase (allocated with xmalloc). Exits if EOF is encountered. | 335 | passphrase (allocated with xmalloc). Exits if EOF is encountered. |