diff options
author | Damien Miller <djm@mindrot.org> | 2000-10-14 16:23:11 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2000-10-14 16:23:11 +1100 |
commit | 874d77bb134a21a5cf625956b60173376a993ba8 (patch) | |
tree | 93dd73b2ff1fbf0ad5f3978a2c4e0d8438a0bf7c /ssh.h | |
parent | 89d9796fbedef4eed6956a2c095c7cc25330c28d (diff) |
- (djm) Big OpenBSD sync:
- markus@cvs.openbsd.org 2000/09/30 10:27:44
[log.c]
allow loglevel debug
- markus@cvs.openbsd.org 2000/10/03 11:59:57
[packet.c]
hmac->mac
- markus@cvs.openbsd.org 2000/10/03 12:03:03
[auth-krb4.c auth-passwd.c auth-rh-rsa.c auth-rhosts.c auth-rsa.c auth1.c]
move fake-auth from auth1.c to individual auth methods, disables s/key in
debug-msg
- markus@cvs.openbsd.org 2000/10/03 12:16:48
ssh.c
do not resolve canonname, i have no idea why this was added oin ossh
- markus@cvs.openbsd.org 2000/10/09 15:30:44
ssh-keygen.1 ssh-keygen.c
-X now reads private ssh.com DSA keys, too.
- markus@cvs.openbsd.org 2000/10/09 15:32:34
auth-options.c
clear options on every call.
- markus@cvs.openbsd.org 2000/10/09 15:51:00
authfd.c authfd.h
interop with ssh-agent2, from <res@shore.net>
- markus@cvs.openbsd.org 2000/10/10 14:20:45
compat.c
use rexexp for version string matching
- provos@cvs.openbsd.org 2000/10/10 22:02:18
[kex.c kex.h myproposal.h ssh.h ssh2.h sshconnect2.c sshd.c dh.c dh.h]
First rough implementation of the diffie-hellman group exchange. The
client can ask the server for bigger groups to perform the diffie-hellman
in, thus increasing the attack complexity when using ciphers with longer
keys. University of Windsor provided network, T the company.
- markus@cvs.openbsd.org 2000/10/11 13:59:52
[auth-rsa.c auth2.c]
clear auth options unless auth sucessfull
- markus@cvs.openbsd.org 2000/10/11 14:00:27
[auth-options.h]
clear auth options unless auth sucessfull
- markus@cvs.openbsd.org 2000/10/11 14:03:27
[scp.1 scp.c]
support 'scp -o' with help from mouring@pconline.com
- markus@cvs.openbsd.org 2000/10/11 14:11:35
[dh.c]
Wall
- markus@cvs.openbsd.org 2000/10/11 14:14:40
[auth.h auth2.c readconf.c readconf.h readpass.c servconf.c servconf.h]
[ssh.h sshconnect2.c sshd_config auth2-skey.c cli.c cli.h]
add support for s/key (kbd-interactive) to ssh2, based on work by
mkiernan@avantgo.com and me
- markus@cvs.openbsd.org 2000/10/11 14:27:24
[auth.c auth1.c auth2.c authfile.c cipher.c cipher.h kex.c kex.h]
[myproposal.h packet.c readconf.c session.c ssh.c ssh.h sshconnect1.c]
[sshconnect2.c sshd.c]
new cipher framework
- markus@cvs.openbsd.org 2000/10/11 14:45:21
[cipher.c]
remove DES
- markus@cvs.openbsd.org 2000/10/12 03:59:20
[cipher.c cipher.h sshconnect1.c sshconnect2.c sshd.c]
enable DES in SSH-1 clients only
- markus@cvs.openbsd.org 2000/10/12 08:21:13
[kex.h packet.c]
remove unused
- markus@cvs.openbsd.org 2000/10/13 12:34:46
[sshd.c]
Kludge for F-Secure Macintosh < 1.0.2; appro@fy.chalmers.se
- markus@cvs.openbsd.org 2000/10/13 12:59:15
[cipher.c cipher.h myproposal.h rijndael.c rijndael.h]
rijndael/aes support
- markus@cvs.openbsd.org 2000/10/13 13:10:54
[sshd.8]
more info about -V
- markus@cvs.openbsd.org 2000/10/13 13:12:02
[myproposal.h]
prefer no compression
Diffstat (limited to 'ssh.h')
-rw-r--r-- | ssh.h | 13 |
1 files changed, 3 insertions, 10 deletions
@@ -12,7 +12,7 @@ | |||
12 | * called by a name other than "ssh" or "Secure Shell". | 12 | * called by a name other than "ssh" or "Secure Shell". |
13 | */ | 13 | */ |
14 | 14 | ||
15 | /* RCSID("$OpenBSD: ssh.h,v 1.51 2000/09/12 20:53:10 markus Exp $"); */ | 15 | /* RCSID("$OpenBSD: ssh.h,v 1.54 2000/10/11 20:27:24 markus Exp $"); */ |
16 | 16 | ||
17 | #ifndef SSH_H | 17 | #ifndef SSH_H |
18 | #define SSH_H | 18 | #define SSH_H |
@@ -28,14 +28,6 @@ | |||
28 | #include "rsa.h" | 28 | #include "rsa.h" |
29 | #include "cipher.h" | 29 | #include "cipher.h" |
30 | 30 | ||
31 | /* | ||
32 | * XXX | ||
33 | * The default cipher used if IDEA is not supported by the remote host. It is | ||
34 | * recommended that this be one of the mandatory ciphers (DES, 3DES), though | ||
35 | * that is not required. | ||
36 | */ | ||
37 | #define SSH_FALLBACK_CIPHER SSH_CIPHER_3DES | ||
38 | |||
39 | /* Cipher used for encrypting authentication files. */ | 31 | /* Cipher used for encrypting authentication files. */ |
40 | #define SSH_AUTHFILE_CIPHER SSH_CIPHER_3DES | 32 | #define SSH_AUTHFILE_CIPHER SSH_CIPHER_3DES |
41 | 33 | ||
@@ -98,6 +90,7 @@ | |||
98 | #define SERVER_CONFIG_FILE ETCDIR "/sshd_config" | 90 | #define SERVER_CONFIG_FILE ETCDIR "/sshd_config" |
99 | #define HOST_CONFIG_FILE ETCDIR "/ssh_config" | 91 | #define HOST_CONFIG_FILE ETCDIR "/ssh_config" |
100 | #define HOST_DSA_KEY_FILE ETCDIR "/ssh_host_dsa_key" | 92 | #define HOST_DSA_KEY_FILE ETCDIR "/ssh_host_dsa_key" |
93 | #define DH_PRIMES ETCDIR "/primes" | ||
101 | 94 | ||
102 | #ifndef SSH_PROGRAM | 95 | #ifndef SSH_PROGRAM |
103 | #define SSH_PROGRAM "/usr/bin/ssh" | 96 | #define SSH_PROGRAM "/usr/bin/ssh" |
@@ -423,7 +416,7 @@ int auth_rsa_challenge_dialog(RSA *pk); | |||
423 | * passphrase (allocated with xmalloc). Exits if EOF is encountered. If | 416 | * passphrase (allocated with xmalloc). Exits if EOF is encountered. If |
424 | * from_stdin is true, the passphrase will be read from stdin instead. | 417 | * from_stdin is true, the passphrase will be read from stdin instead. |
425 | */ | 418 | */ |
426 | char *read_passphrase(const char *prompt, int from_stdin); | 419 | char *read_passphrase(char *prompt, int from_stdin); |
427 | 420 | ||
428 | 421 | ||
429 | /*------------ Definitions for logging. -----------------------*/ | 422 | /*------------ Definitions for logging. -----------------------*/ |