diff options
author | Damien Miller <djm@mindrot.org> | 2000-05-07 12:03:14 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2000-05-07 12:03:14 +1000 |
commit | e247cc402bc391650f014316363dbce78ad85dc7 (patch) | |
tree | 65d72c3d3514c6119f47017f14b71ed153485a5d /ssh.h | |
parent | 0437b33e54fd72060d17908d6abf96bfabaacad2 (diff) |
- Remove references to SSLeay.
- Big OpenBSD CVS update
- markus@cvs.openbsd.org
[clientloop.c]
- typo
[session.c]
- update proctitle on pty alloc/dealloc, e.g. w/ windows client
[session.c]
- update proctitle for proto 1, too
[channels.h nchan.c serverloop.c session.c sshd.c]
- use c-style comments
- deraadt@cvs.openbsd.org
[scp.c]
- more atomicio
- markus@cvs.openbsd.org
[channels.c]
- set O_NONBLOCK
[ssh.1]
- update AUTHOR
[readconf.c ssh-keygen.c ssh.h]
- default DSA key file ~/.ssh/id_dsa
[clientloop.c]
- typo, rm verbose debug
- deraadt@cvs.openbsd.org
[ssh-keygen.1]
- document DSA use of ssh-keygen
[sshd.8]
- a start at describing what i understand of the DSA side
[ssh-keygen.1]
- document -X and -x
[ssh-keygen.c]
- simplify usage
- markus@cvs.openbsd.org
[sshd.8]
- there is no rhosts_dsa
[ssh-keygen.1]
- document -y, update -X,-x
[nchan.c]
- fix close for non-open ssh1 channels
[servconf.c servconf.h ssh.h sshd.8 sshd.c ]
- s/DsaKey/HostDSAKey/, document option
[sshconnect2.c]
- respect number_of_password_prompts
[channels.c channels.h servconf.c servconf.h session.c sshd.8]
- GatewayPorts for sshd, ok deraadt@
[ssh-add.1 ssh-agent.1 ssh.1]
- more doc on: DSA, id_dsa, known_hosts2, authorized_keys2
[ssh.1]
- more info on proto 2
[sshd.8]
- sync AUTHOR w/ ssh.1
[key.c key.h sshconnect.c]
- print key type when talking about host keys
[packet.c]
- clear padding in ssh2
[dsa.c key.c radix.c ssh.h sshconnect1.c uuencode.c uuencode.h]
- replace broken uuencode w/ libc b64_ntop
[auth2.c]
- log failure before sending the reply
[key.c radix.c uuencode.c]
- remote trailing comments before calling __b64_pton
[auth2.c readconf.c readconf.h servconf.c servconf.h ssh.1]
[sshconnect2.c sshd.8]
- add DSAAuthetication option to ssh/sshd, document SSH2 in sshd.8
- Bring in b64_ntop and b64_pton from OpenBSD libc (bsd-base64.[ch])
Diffstat (limited to 'ssh.h')
-rw-r--r-- | ssh.h | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -13,7 +13,7 @@ | |||
13 | * | 13 | * |
14 | */ | 14 | */ |
15 | 15 | ||
16 | /* RCSID("$Id: ssh.h,v 1.37 2000/05/01 23:56:42 damien Exp $"); */ | 16 | /* RCSID("$Id: ssh.h,v 1.38 2000/05/07 02:03:19 damien Exp $"); */ |
17 | 17 | ||
18 | #ifndef SSH_H | 18 | #ifndef SSH_H |
19 | #define SSH_H | 19 | #define SSH_H |
@@ -97,7 +97,7 @@ | |||
97 | #define HOST_KEY_FILE ETCDIR "/ssh_host_key" | 97 | #define HOST_KEY_FILE ETCDIR "/ssh_host_key" |
98 | #define SERVER_CONFIG_FILE ETCDIR "/sshd_config" | 98 | #define SERVER_CONFIG_FILE ETCDIR "/sshd_config" |
99 | #define HOST_CONFIG_FILE ETCDIR "/ssh_config" | 99 | #define HOST_CONFIG_FILE ETCDIR "/ssh_config" |
100 | #define DSA_KEY_FILE ETCDIR "/ssh_host_dsa_key" | 100 | #define HOST_DSA_KEY_FILE ETCDIR "/ssh_host_dsa_key" |
101 | 101 | ||
102 | #ifndef SSH_PROGRAM | 102 | #ifndef SSH_PROGRAM |
103 | #define SSH_PROGRAM "/usr/bin/ssh" | 103 | #define SSH_PROGRAM "/usr/bin/ssh" |
@@ -146,6 +146,7 @@ | |||
146 | * file should only be readable by the user him/herself. | 146 | * file should only be readable by the user him/herself. |
147 | */ | 147 | */ |
148 | #define SSH_CLIENT_IDENTITY ".ssh/identity" | 148 | #define SSH_CLIENT_IDENTITY ".ssh/identity" |
149 | #define SSH_CLIENT_ID_DSA ".ssh/id_dsa" | ||
149 | 150 | ||
150 | /* | 151 | /* |
151 | * Configuration file in user\'s home directory. This file need not be | 152 | * Configuration file in user\'s home directory. This file need not be |
@@ -527,7 +528,7 @@ int auth_krb4_password(struct passwd * pw, const char *password); | |||
527 | int auth_kerberos_tgt(struct passwd * pw, const char *string); | 528 | int auth_kerberos_tgt(struct passwd * pw, const char *string); |
528 | int auth_afs_token(struct passwd * pw, const char *token_string); | 529 | int auth_afs_token(struct passwd * pw, const char *token_string); |
529 | 530 | ||
530 | int creds_to_radix(CREDENTIALS * creds, unsigned char *buf); | 531 | int creds_to_radix(CREDENTIALS * creds, unsigned char *buf, size_t buflen); |
531 | int radix_to_creds(const char *buf, CREDENTIALS * creds); | 532 | int radix_to_creds(const char *buf, CREDENTIALS * creds); |
532 | #endif /* AFS */ | 533 | #endif /* AFS */ |
533 | 534 | ||