summaryrefslogtreecommitdiff
path: root/regress/unittests
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2020-05-01 04:00:29 +0000
committerDamien Miller <djm@mindrot.org>2020-05-04 18:42:13 +1000
commit15bfafc1db4c8792265ada9623a96f387990f732 (patch)
tree96a8fec1b85f7eaf3db64e17468cf79c2f5e4bfc /regress/unittests
parent7882d2eda6ad3eb82220a85294de545d20ef82db (diff)
upstream: make mktestdata.sh generate old/new format keys that we
expect. This script was written before OpenSSH switched to new-format private keys by default and was never updated to the change (until now) From Michael Forney OpenBSD-Regress-ID: 38cf354715c96852e5b71c2393fb6e7ad28b7ca7
Diffstat (limited to 'regress/unittests')
-rwxr-xr-xregress/unittests/sshkey/mktestdata.sh26
1 files changed, 13 insertions, 13 deletions
diff --git a/regress/unittests/sshkey/mktestdata.sh b/regress/unittests/sshkey/mktestdata.sh
index 20c359568..c2fc5fa2e 100755
--- a/regress/unittests/sshkey/mktestdata.sh
+++ b/regress/unittests/sshkey/mktestdata.sh
@@ -1,5 +1,5 @@
1#!/bin/sh 1#!/bin/sh
2# $OpenBSD: mktestdata.sh,v 1.8 2020/05/01 03:58:02 djm Exp $ 2# $OpenBSD: mktestdata.sh,v 1.9 2020/05/01 04:00:29 djm Exp $
3 3
4PW=mekmitasdigoat 4PW=mekmitasdigoat
5 5
@@ -77,14 +77,14 @@ rm -f rsa_1_pw dsa_1_pw ecdsa_1_pw ed25519_1_pw
77rm -f rsa_n_pw dsa_n_pw ecdsa_n_pw 77rm -f rsa_n_pw dsa_n_pw ecdsa_n_pw
78rm -f pw *.pub *.bn.* *.param.* *.fp *.fp.bb 78rm -f pw *.pub *.bn.* *.param.* *.fp *.fp.bb
79 79
80ssh-keygen -t rsa -b 1024 -C "RSA test key #1" -N "" -f rsa_1 80ssh-keygen -t rsa -b 1024 -C "RSA test key #1" -N "" -f rsa_1 -m PEM
81ssh-keygen -t dsa -b 1024 -C "DSA test key #1" -N "" -f dsa_1 81ssh-keygen -t dsa -b 1024 -C "DSA test key #1" -N "" -f dsa_1 -m PEM
82ssh-keygen -t ecdsa -b 256 -C "ECDSA test key #1" -N "" -f ecdsa_1 82ssh-keygen -t ecdsa -b 256 -C "ECDSA test key #1" -N "" -f ecdsa_1 -m PEM
83ssh-keygen -t ed25519 -C "ED25519 test key #1" -N "" -f ed25519_1 83ssh-keygen -t ed25519 -C "ED25519 test key #1" -N "" -f ed25519_1
84 84
85ssh-keygen -t rsa -b 2048 -C "RSA test key #2" -N "" -f rsa_2 85ssh-keygen -t rsa -b 2048 -C "RSA test key #2" -N "" -f rsa_2 -m PEM
86ssh-keygen -t dsa -b 1024 -C "DSA test key #2" -N "" -f dsa_2 86ssh-keygen -t dsa -b 1024 -C "DSA test key #2" -N "" -f dsa_2 -m PEM
87ssh-keygen -t ecdsa -b 521 -C "ECDSA test key #2" -N "" -f ecdsa_2 87ssh-keygen -t ecdsa -b 521 -C "ECDSA test key #2" -N "" -f ecdsa_2 -m PEM
88ssh-keygen -t ed25519 -C "ED25519 test key #1" -N "" -f ed25519_2 88ssh-keygen -t ed25519 -C "ED25519 test key #1" -N "" -f ed25519_2
89 89
90cp rsa_1 rsa_n 90cp rsa_1 rsa_n
@@ -99,13 +99,13 @@ cp rsa_1 rsa_n_pw
99cp dsa_1 dsa_n_pw 99cp dsa_1 dsa_n_pw
100cp ecdsa_1 ecdsa_n_pw 100cp ecdsa_1 ecdsa_n_pw
101 101
102ssh-keygen -pf rsa_1_pw -N "$PW" 102ssh-keygen -pf rsa_1_pw -m PEM -N "$PW"
103ssh-keygen -pf dsa_1_pw -N "$PW" 103ssh-keygen -pf dsa_1_pw -m PEM -N "$PW"
104ssh-keygen -pf ecdsa_1_pw -N "$PW" 104ssh-keygen -pf ecdsa_1_pw -m PEM -N "$PW"
105ssh-keygen -pf ed25519_1_pw -N "$PW" 105ssh-keygen -pf ed25519_1_pw -N "$PW"
106ssh-keygen -opf rsa_n_pw -N "$PW" 106ssh-keygen -pf rsa_n_pw -N "$PW"
107ssh-keygen -opf dsa_n_pw -N "$PW" 107ssh-keygen -pf dsa_n_pw -N "$PW"
108ssh-keygen -opf ecdsa_n_pw -N "$PW" 108ssh-keygen -pf ecdsa_n_pw -N "$PW"
109 109
110rsa_params rsa_1 rsa_1.param 110rsa_params rsa_1 rsa_1.param
111rsa_params rsa_2 rsa_2.param 111rsa_params rsa_2 rsa_2.param