From 300ec387e3dd190a9bb11fcc5611d8b93976a698 Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sb@m-labs.hk>
Date: Fri, 3 Dec 2021 18:36:41 +0800
Subject: [PATCH] use ed25519 key for hitl

---
 artiq-fast.nix | 8 ++++----
 artiq-zynq.nix | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/artiq-fast.nix b/artiq-fast.nix
index d0b646b..6efacb1 100644
--- a/artiq-fast.nix
+++ b/artiq-fast.nix
@@ -83,15 +83,15 @@ in
       ''
       export HOME=`mktemp -d`
       mkdir $HOME/.ssh
-      cp /opt/hydra_id_rsa $HOME/.ssh/id_rsa
-      cp /opt/hydra_id_rsa.pub $HOME/.ssh/id_rsa.pub
+      cp /opt/hydra_id_ed25519 $HOME/.ssh/id_ed25519
+      cp /opt/hydra_id_ed25519.pub $HOME/.ssh/id_ed25519.pub
       echo "rpi-1 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPOBQVcsvk6WgRj18v4m0zkFeKrcN9gA+r6sxQxNwFpv" > $HOME/.ssh/known_hosts
-      chmod 600 $HOME/.ssh/id_rsa
+      chmod 600 $HOME/.ssh/id_ed25519
       LOCKCTL=$(mktemp -d)
       mkfifo $LOCKCTL/lockctl
 
       cat $LOCKCTL/lockctl | ${pkgs.openssh}/bin/ssh \
-        -i $HOME/.ssh/id_rsa \
+        -i $HOME/.ssh/id_ed25519 \
         -o UserKnownHostsFile=$HOME/.ssh/known_hosts \
         rpi-1 \
         'mkdir -p /tmp/board_lock && flock /tmp/board_lock/kc705-1 -c "echo Ok; cat"' \
diff --git a/artiq-zynq.nix b/artiq-zynq.nix
index 0dc08e5..c1be00d 100644
--- a/artiq-zynq.nix
+++ b/artiq-zynq.nix
@@ -36,7 +36,7 @@ in
 
       buildPhase =
         ''
-        export NIX_SSHOPTS="-F /dev/null -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o LogLevel=ERROR -i /opt/hydra_id_rsa"
+        export NIX_SSHOPTS="-F /dev/null -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o LogLevel=ERROR -i /opt/hydra_id_ed25519"
         LOCKCTL=$(mktemp -d)
         mkfifo $LOCKCTL/lockctl