diff options
author | Damien Miller <djm@mindrot.org> | 2000-05-08 00:05:31 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2000-05-08 00:05:31 +1000 |
commit | 58e579bcd987397aeeb5f0a7935ffdfa67125f37 (patch) | |
tree | 6b09dedeab72d587eafd53f91a49fcfe27c6ef12 | |
parent | a3f2a02bc35c5163d435523e764060e92431d6cf (diff) |
- Generate DSA host keys during "make key" or RPM installs
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | Makefile.in | 1 | ||||
-rw-r--r-- | contrib/redhat/openssh.spec | 3 | ||||
-rw-r--r-- | contrib/suse/openssh.spec | 4 |
4 files changed, 12 insertions, 0 deletions
@@ -1,3 +1,7 @@ | |||
1 | 20000508 | ||
2 | - Makefile and RPM spec fixes | ||
3 | - Generate DSA host keys during "make key" or RPM installs | ||
4 | |||
1 | 20000507 | 5 | 20000507 |
2 | - Remove references to SSLeay. | 6 | - Remove references to SSLeay. |
3 | - Big OpenBSD CVS update | 7 | - Big OpenBSD CVS update |
diff --git a/Makefile.in b/Makefile.in index de2fbd269..8d2c71b95 100644 --- a/Makefile.in +++ b/Makefile.in | |||
@@ -133,6 +133,7 @@ install: manpages $(TARGETS) | |||
133 | 133 | ||
134 | host-key: ssh-keygen | 134 | host-key: ssh-keygen |
135 | ./ssh-keygen -b 1024 -f $(sysconfdir)/ssh_host_key -N '' | 135 | ./ssh-keygen -b 1024 -f $(sysconfdir)/ssh_host_key -N '' |
136 | ./ssh-keygen -d -f $(sysconfdir)/ssh_host_dsa_key -N '' | ||
136 | 137 | ||
137 | uninstallall: uninstall | 138 | uninstallall: uninstall |
138 | -rm -f $(DESTDIR)$(sysconfdir)/ssh_config | 139 | -rm -f $(DESTDIR)$(sysconfdir)/ssh_config |
diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec index be76c9650..96e972cf1 100644 --- a/contrib/redhat/openssh.spec +++ b/contrib/redhat/openssh.spec | |||
@@ -190,6 +190,9 @@ rm -rf $RPM_BUILD_ROOT | |||
190 | if [ ! -f /etc/ssh/ssh_host_key -o ! -s /etc/ssh/ssh_host_key ]; then | 190 | if [ ! -f /etc/ssh/ssh_host_key -o ! -s /etc/ssh/ssh_host_key ]; then |
191 | /usr/bin/ssh-keygen -b 1024 -f /etc/ssh/ssh_host_key -N '' >&2 | 191 | /usr/bin/ssh-keygen -b 1024 -f /etc/ssh/ssh_host_key -N '' >&2 |
192 | fi | 192 | fi |
193 | if [ ! -f /etc/ssh/ssh_host_dsa_key -o ! -s /etc/ssh/ssh_host_dsa_key ]; then | ||
194 | /usr/bin/ssh-keygen -d -f /etc/ssh/ssh_host_dsa_key -N '' >&2 | ||
195 | fi | ||
193 | if test -r /var/run/sshd.pid | 196 | if test -r /var/run/sshd.pid |
194 | then | 197 | then |
195 | /etc/rc.d/init.d/sshd restart >&2 | 198 | /etc/rc.d/init.d/sshd restart >&2 |
diff --git a/contrib/suse/openssh.spec b/contrib/suse/openssh.spec index 7d5d087a8..0f63ef658 100644 --- a/contrib/suse/openssh.spec +++ b/contrib/suse/openssh.spec | |||
@@ -197,6 +197,10 @@ if [ ! -f /etc/ssh/ssh_host_key -o ! -s /etc/ssh/ssh_host_key ]; then | |||
197 | echo "Generating SSH host key..." | 197 | echo "Generating SSH host key..." |
198 | /usr/bin/ssh-keygen -b 1024 -f /etc/ssh/ssh_host_key -N '' >&2 | 198 | /usr/bin/ssh-keygen -b 1024 -f /etc/ssh/ssh_host_key -N '' >&2 |
199 | fi | 199 | fi |
200 | if [ ! -f /etc/ssh/ssh_host_dsa_key -o ! -s /etc/ssh/ssh_host_dsa_key ]; then | ||
201 | echo "Generating SSH DSA host key..." | ||
202 | /usr/bin/ssh-keygen -d -f /etc/ssh/ssh_host_dsa_key -N '' >&2 | ||
203 | fi | ||
200 | if test -r /var/run/sshd.pid | 204 | if test -r /var/run/sshd.pid |
201 | then | 205 | then |
202 | echo "Restarting the running SSH daemon..." | 206 | echo "Restarting the running SSH daemon..." |