diff options
author | Damien Miller <djm@mindrot.org> | 2000-11-13 22:57:25 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2000-11-13 22:57:25 +1100 |
commit | 0bc1bd814e3c2b5e92d6f595930051960d17f47f (patch) | |
tree | 176c7dc2844ecc2c1de0f72d221449556ffa5209 /contrib/redhat/sshd.init | |
parent | 559d383037b0872fcde4e6c40188b649c574be74 (diff) |
- (djm) Merge OpenBSD changes:
- markus@cvs.openbsd.org 2000/11/06 16:04:56
[channels.c channels.h clientloop.c nchan.c serverloop.c]
[session.c ssh.c]
agent forwarding and -R for ssh2, based on work from
jhuuskon@messi.uku.fi
- markus@cvs.openbsd.org 2000/11/06 16:13:27
[ssh.c sshconnect.c sshd.c]
do not disabled rhosts(rsa) if server port > 1024; from
pekkas@netcore.fi
- markus@cvs.openbsd.org 2000/11/06 16:16:35
[sshconnect.c]
downgrade client to 1.3 if server is 1.4; help from mdb@juniper.net
- markus@cvs.openbsd.org 2000/11/09 18:04:40
[auth1.c]
typo; from mouring@pconline.com
- markus@cvs.openbsd.org 2000/11/12 12:03:28
[ssh-agent.c]
off-by-one when removing a key from the agent
- markus@cvs.openbsd.org 2000/11/12 12:50:39
[auth-rh-rsa.c auth2.c authfd.c authfd.h]
[authfile.c hostfile.c kex.c kex.h key.c key.h myproposal.h]
[readconf.c readconf.h rsa.c rsa.h servconf.c servconf.h ssh-add.c]
[ssh-agent.c ssh-keygen.1 ssh-keygen.c ssh.1 ssh.c ssh_config]
[sshconnect1.c sshconnect2.c sshd.8 sshd.c sshd_config ssh-dss.c]
[ssh-dss.h ssh-rsa.c ssh-rsa.h dsa.c dsa.h]
add support for RSA to SSH2. please test.
there are now 3 types of keys: RSA1 is used by ssh-1 only,
RSA and DSA are used by SSH2.
you can use 'ssh-keygen -t rsa -f ssh2_rsa_file' to generate RSA
keys for SSH2 and use the RSA keys for hostkeys or for user keys.
SSH2 RSA or DSA keys are added to .ssh/authorised_keys2 as before.
- (djm) Fix up Makefile and Redhat init script to create RSA host keys
- (djm) Change to interim version
Diffstat (limited to 'contrib/redhat/sshd.init')
-rwxr-xr-x | contrib/redhat/sshd.init | 27 |
1 files changed, 21 insertions, 6 deletions
diff --git a/contrib/redhat/sshd.init b/contrib/redhat/sshd.init index 41f98ad88..a4df64276 100755 --- a/contrib/redhat/sshd.init +++ b/contrib/redhat/sshd.init | |||
@@ -19,13 +19,27 @@ RETVAL=0 | |||
19 | 19 | ||
20 | # Some functions to make the below more readable | 20 | # Some functions to make the below more readable |
21 | KEYGEN=/usr/bin/ssh-keygen | 21 | KEYGEN=/usr/bin/ssh-keygen |
22 | RSA_KEY=/etc/ssh/ssh_host_key | 22 | RSA1_KEY=/etc/ssh/ssh_host_key |
23 | RSA_KEY=/etc/ssh/ssh_host_rsa_key | ||
23 | DSA_KEY=/etc/ssh/ssh_host_dsa_key | 24 | DSA_KEY=/etc/ssh/ssh_host_dsa_key |
24 | PID_FILE=/var/run/sshd.pid | 25 | PID_FILE=/var/run/sshd.pid |
26 | do_rsa1_keygen() { | ||
27 | if ! test -f $RSA1_KEY ; then | ||
28 | echo -n "Generating SSH1 RSA host key: " | ||
29 | if $KEYGEN -q -t rsa1 -f $RSA1_KEY -C '' -N '' >&/dev/null; then | ||
30 | success "RSA1 key generation" | ||
31 | echo | ||
32 | else | ||
33 | failure "RSA1 key generation" | ||
34 | echo | ||
35 | exit 1 | ||
36 | fi | ||
37 | fi | ||
38 | } | ||
25 | do_rsa_keygen() { | 39 | do_rsa_keygen() { |
26 | if $KEYGEN -R && ! test -f $RSA_KEY ; then | 40 | if ! test -f $RSA_KEY ; then |
27 | echo -n "Generating SSH RSA host key: " | 41 | echo -n "Generating SSH2 RSA host key: " |
28 | if $KEYGEN -q -b 1024 -f $RSA_KEY -C '' -N '' >&/dev/null; then | 42 | if $KEYGEN -q -t rsa -f $RSA_KEY -C '' -N '' >&/dev/null; then |
29 | success "RSA key generation" | 43 | success "RSA key generation" |
30 | echo | 44 | echo |
31 | else | 45 | else |
@@ -37,8 +51,8 @@ do_rsa_keygen() { | |||
37 | } | 51 | } |
38 | do_dsa_keygen() { | 52 | do_dsa_keygen() { |
39 | if ! test -f $DSA_KEY ; then | 53 | if ! test -f $DSA_KEY ; then |
40 | echo -n "Generating SSH DSA host key: " | 54 | echo -n "Generating SSH2 DSA host key: " |
41 | if $KEYGEN -q -d -b 1024 -f $DSA_KEY -C '' -N '' >&/dev/null; then | 55 | if $KEYGEN -q -t dsa -f $DSA_KEY -C '' -N '' >&/dev/null; then |
42 | success "DSA key generation" | 56 | success "DSA key generation" |
43 | echo | 57 | echo |
44 | else | 58 | else |
@@ -52,6 +66,7 @@ do_dsa_keygen() { | |||
52 | case "$1" in | 66 | case "$1" in |
53 | start) | 67 | start) |
54 | # Create keys if necessary | 68 | # Create keys if necessary |
69 | do_rsa1_keygen; | ||
55 | do_rsa_keygen; | 70 | do_rsa_keygen; |
56 | do_dsa_keygen; | 71 | do_dsa_keygen; |
57 | 72 | ||