summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2013-12-07 21:43:46 +1100
committerDamien Miller <djm@mindrot.org>2013-12-07 21:43:46 +1100
commitda3ca351b49d52ae85db2e3998265dc3c6617068 (patch)
treeae4b0ee275fb8ee5ffbfe50e0cc44be300a0330c
parenteb401585bb8336cbf81fe4fc58eb9f7cac3ab874 (diff)
- (djm) [Makefile.in] PATHSUBS and keygen bits for Ed25519; from
Loganaden Velvindron @ AfriNIC in bz#2179
-rw-r--r--ChangeLog2
-rw-r--r--Makefile.in9
2 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 317dd2c46..68ee8538d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -49,6 +49,8 @@
49 [openbsd-compat/bcrypt_pbkdf.c] Make ed25519/new key format compile on 49 [openbsd-compat/bcrypt_pbkdf.c] Make ed25519/new key format compile on
50 Linux 50 Linux
51 - (djm) [regress/cert-hostkey.sh] Fix merge botch 51 - (djm) [regress/cert-hostkey.sh] Fix merge botch
52 - (djm) [Makefile.in] PATHSUBS and keygen bits for Ed25519; from
53 Loganaden Velvindron @ AfriNIC in bz#2179
52 54
5320131205 5520131205
54 - (djm) OpenBSD CVS Sync 56 - (djm) OpenBSD CVS Sync
diff --git a/Makefile.in b/Makefile.in
index 2c263af7e..f45c88098 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
1# $Id: Makefile.in,v 1.346 2013/12/07 00:35:37 djm Exp $ 1# $Id: Makefile.in,v 1.347 2013/12/07 10:43:47 djm Exp $
2 2
3# uncomment if you run a non bourne compatable shell. Ie. csh 3# uncomment if you run a non bourne compatable shell. Ie. csh
4#SHELL = @SH@ 4#SHELL = @SH@
@@ -115,6 +115,7 @@ PATHSUBS = \
115 -e 's|/etc/ssh/ssh_host_ecdsa_key|$(sysconfdir)/ssh_host_ecdsa_key|g' \ 115 -e 's|/etc/ssh/ssh_host_ecdsa_key|$(sysconfdir)/ssh_host_ecdsa_key|g' \
116 -e 's|/etc/ssh/ssh_host_dsa_key|$(sysconfdir)/ssh_host_dsa_key|g' \ 116 -e 's|/etc/ssh/ssh_host_dsa_key|$(sysconfdir)/ssh_host_dsa_key|g' \
117 -e 's|/etc/ssh/ssh_host_rsa_key|$(sysconfdir)/ssh_host_rsa_key|g' \ 117 -e 's|/etc/ssh/ssh_host_rsa_key|$(sysconfdir)/ssh_host_rsa_key|g' \
118 -e 's|/etc/ssh/ssh_host_ed25519_key|$(sysconfdir)/ssh_host_ed25519_key|g' \
118 -e 's|/var/run/sshd.pid|$(piddir)/sshd.pid|g' \ 119 -e 's|/var/run/sshd.pid|$(piddir)/sshd.pid|g' \
119 -e 's|/etc/moduli|$(sysconfdir)/moduli|g' \ 120 -e 's|/etc/moduli|$(sysconfdir)/moduli|g' \
120 -e 's|/etc/ssh/moduli|$(sysconfdir)/moduli|g' \ 121 -e 's|/etc/ssh/moduli|$(sysconfdir)/moduli|g' \
@@ -335,6 +336,11 @@ host-key: ssh-keygen$(EXEEXT)
335 else \ 336 else \
336 ./ssh-keygen -t rsa -f $(sysconfdir)/ssh_host_rsa_key -N "" ; \ 337 ./ssh-keygen -t rsa -f $(sysconfdir)/ssh_host_rsa_key -N "" ; \
337 fi ; \ 338 fi ; \
339 if [ -f $(sysconfdir)/ssh_host_ed25519_key ] ; then \
340 echo "$(sysconfdir)/ssh_host_ed25519_key already exists, skipping." ; \
341 else \
342 ./ssh-keygen -t ed25519 -f $(sysconfdir)/ssh_host_ed25519_key -N "" ; \
343 fi ; \
338 if [ -z "@COMMENT_OUT_ECC@" ] ; then \ 344 if [ -z "@COMMENT_OUT_ECC@" ] ; then \
339 if [ -f $(sysconfdir)/ssh_host_ecdsa_key ] ; then \ 345 if [ -f $(sysconfdir)/ssh_host_ecdsa_key ] ; then \
340 echo "$(sysconfdir)/ssh_host_ecdsa_key already exists, skipping." ; \ 346 echo "$(sysconfdir)/ssh_host_ecdsa_key already exists, skipping." ; \
@@ -348,6 +354,7 @@ host-key-force: ssh-keygen$(EXEEXT)
348 ./ssh-keygen -t rsa1 -f $(DESTDIR)$(sysconfdir)/ssh_host_key -N "" 354 ./ssh-keygen -t rsa1 -f $(DESTDIR)$(sysconfdir)/ssh_host_key -N ""
349 ./ssh-keygen -t dsa -f $(DESTDIR)$(sysconfdir)/ssh_host_dsa_key -N "" 355 ./ssh-keygen -t dsa -f $(DESTDIR)$(sysconfdir)/ssh_host_dsa_key -N ""
350 ./ssh-keygen -t rsa -f $(DESTDIR)$(sysconfdir)/ssh_host_rsa_key -N "" 356 ./ssh-keygen -t rsa -f $(DESTDIR)$(sysconfdir)/ssh_host_rsa_key -N ""
357 ./ssh-keygen -t ed25519 -f $(DESTDIR)$(sysconfdir)/ssh_host_ed25519_key -N ""
351 test -z "@COMMENT_OUT_ECC@" && ./ssh-keygen -t ecdsa -f $(DESTDIR)$(sysconfdir)/ssh_host_ecdsa_key -N "" 358 test -z "@COMMENT_OUT_ECC@" && ./ssh-keygen -t ecdsa -f $(DESTDIR)$(sysconfdir)/ssh_host_ecdsa_key -N ""
352 359
353uninstallall: uninstall 360uninstallall: uninstall