summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.in40
1 files changed, 9 insertions, 31 deletions
diff --git a/Makefile.in b/Makefile.in
index 40cc7aae1..0901f4225 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -359,41 +359,19 @@ install-sysconf:
359 359
360host-key: ssh-keygen$(EXEEXT) 360host-key: ssh-keygen$(EXEEXT)
361 @if [ -z "$(DESTDIR)" ] ; then \ 361 @if [ -z "$(DESTDIR)" ] ; then \
362 if [ -f "$(sysconfdir)/ssh_host_key" ] ; then \ 362 ./ssh-keygen -A; \
363 echo "$(sysconfdir)/ssh_host_key already exists, skipping." ; \ 363 fi
364 else \
365 ./ssh-keygen -t rsa1 -f $(sysconfdir)/ssh_host_key -N "" ; \
366 fi ; \
367 if [ -f $(sysconfdir)/ssh_host_dsa_key ] ; then \
368 echo "$(sysconfdir)/ssh_host_dsa_key already exists, skipping." ; \
369 else \
370 ./ssh-keygen -t dsa -f $(sysconfdir)/ssh_host_dsa_key -N "" ; \
371 fi ; \
372 if [ -f $(sysconfdir)/ssh_host_rsa_key ] ; then \
373 echo "$(sysconfdir)/ssh_host_rsa_key already exists, skipping." ; \
374 else \
375 ./ssh-keygen -t rsa -f $(sysconfdir)/ssh_host_rsa_key -N "" ; \
376 fi ; \
377 if [ -f $(sysconfdir)/ssh_host_ed25519_key ] ; then \
378 echo "$(sysconfdir)/ssh_host_ed25519_key already exists, skipping." ; \
379 else \
380 ./ssh-keygen -t ed25519 -f $(sysconfdir)/ssh_host_ed25519_key -N "" ; \
381 fi ; \
382 if [ -z "@COMMENT_OUT_ECC@" ] ; then \
383 if [ -f $(sysconfdir)/ssh_host_ecdsa_key ] ; then \
384 echo "$(sysconfdir)/ssh_host_ecdsa_key already exists, skipping." ; \
385 else \
386 ./ssh-keygen -t ecdsa -f $(sysconfdir)/ssh_host_ecdsa_key -N "" ; \
387 fi ; \
388 fi ; \
389 fi ;
390 364
391host-key-force: ssh-keygen$(EXEEXT) 365host-key-force: ssh-keygen$(EXEEXT) ssh$(EXEEXT)
392 ./ssh-keygen -t rsa1 -f $(DESTDIR)$(sysconfdir)/ssh_host_key -N "" 366 if ./ssh -Q protocol-version | grep '^1$$' >/dev/null; then \
367 ./ssh-keygen -t rsa1 -f $(DESTDIR)$(sysconfdir)/ssh_host_key -N ""; \
368 fi
393 ./ssh-keygen -t dsa -f $(DESTDIR)$(sysconfdir)/ssh_host_dsa_key -N "" 369 ./ssh-keygen -t dsa -f $(DESTDIR)$(sysconfdir)/ssh_host_dsa_key -N ""
394 ./ssh-keygen -t rsa -f $(DESTDIR)$(sysconfdir)/ssh_host_rsa_key -N "" 370 ./ssh-keygen -t rsa -f $(DESTDIR)$(sysconfdir)/ssh_host_rsa_key -N ""
395 ./ssh-keygen -t ed25519 -f $(DESTDIR)$(sysconfdir)/ssh_host_ed25519_key -N "" 371 ./ssh-keygen -t ed25519 -f $(DESTDIR)$(sysconfdir)/ssh_host_ed25519_key -N ""
396 test -z "@COMMENT_OUT_ECC@" && ./ssh-keygen -t ecdsa -f $(DESTDIR)$(sysconfdir)/ssh_host_ecdsa_key -N "" 372 if ./ssh -Q key | grep ecdsa >/dev/null ; then \
373 ./ssh-keygen -t ecdsa -f $(DESTDIR)$(sysconfdir)/ssh_host_ecdsa_key -N ""; \
374 fi
397 375
398uninstallall: uninstall 376uninstallall: uninstall
399 -rm -f $(DESTDIR)$(sysconfdir)/ssh_config 377 -rm -f $(DESTDIR)$(sysconfdir)/ssh_config