upstream commit

remove SSHv1 support from unit tests

Upstream-Regress-ID: 395ca2aa48f1f7d23eefff6cb849ea733ca8bbfe

1 files changed, 4 insertions, 12 deletions

diff --git a/regress/unittests/hostkeys/mktestdata.sh b/regress/unittests/hostkeys/mktestdata.sh
index 36890ba11..5a46de990 100644
--- a/regress/unittests/hostkeys/mktestdata.sh
+++ b/regress/unittests/hostkeys/mktestdata.sh
@@ -1,11 +1,11 @@
 #!/bin/sh
-# $OpenBSD: mktestdata.sh,v 1.1 2015/02/16 22:18:34 djm Exp $
+# $OpenBSD: mktestdata.sh,v 1.2 2017/04/30 23:33:48 djm Exp $
 
 set -ex
 
 cd testdata
 
-rm -f rsa1* rsa* dsa* ecdsa* ed25519*
+rm -f rsa* dsa* ecdsa* ed25519*
 rm -f known_hosts*
 
 gen_all() {
@@ -13,13 +13,12 @@ gen_all() {
         _ecdsa_bits=256
         test "x$_n" = "x1" && _ecdsa_bits=384
         test "x$_n" = "x2" && _ecdsa_bits=521
-        ssh-keygen -qt rsa1 -b 1024 -C "RSA1 #$_n" -N "" -f rsa1_$_n
         ssh-keygen -qt rsa -b 1024 -C "RSA #$_n" -N "" -f rsa_$_n
         ssh-keygen -qt dsa -b 1024 -C "DSA #$_n" -N "" -f dsa_$_n
         ssh-keygen -qt ecdsa -b $_ecdsa_bits -C "ECDSA #$_n" -N "" -f ecdsa_$_n
         ssh-keygen -qt ed25519 -C "ED25519 #$_n" -N "" -f ed25519_$_n
         # Don't need private keys
-        rm -f rsa1_$_n  rsa_$_n dsa_$_n ecdsa_$_n ed25519_$_n
+        rm -f rsa_$_n dsa_$_n ecdsa_$_n ed25519_$_n
 }
 
 hentries() {
@@ -64,7 +63,6 @@ rm -f known_hosts_hash_frag.old
         echo
 
         echo "# Revoked and CA keys"
-        printf "@revoked sisyphus.example.com " ; cat rsa1_4.pub
         printf "@revoked sisyphus.example.com " ; cat ed25519_4.pub
         printf "@cert-authority prometheus.example.com " ; cat ecdsa_4.pub
         printf "@cert-authority *.example.com " ; cat dsa_4.pub
@@ -72,19 +70,13 @@ rm -f known_hosts_hash_frag.old
         printf "\n"
         echo "# Some invalid lines"
         # Invalid marker
-        printf "@what sisyphus.example.com " ; cat rsa1_1.pub
+        printf "@what sisyphus.example.com " ; cat dsa_1.pub
         # Key missing
         echo "sisyphus.example.com      "
         # Key blob missing
         echo "prometheus.example.com ssh-ed25519 "
         # Key blob truncated
         echo "sisyphus.example.com ssh-dsa AAAATgAAAAdz"
-        # RSA1 key truncated after key bits
-        echo "prometheus.example.com 1024   "
-        # RSA1 key truncated after exponent
-        echo "sisyphus.example.com 1024 65535   "
-        # RSA1 key incorrect key bits
-        printf "prometheus.example.com 1025 " ; cut -d' ' -f2- < rsa1_1.pub
         # Invalid type
         echo "sisyphus.example.com ssh-XXX AAAATgAAAAdzc2gtWFhYAAAAP0ZVQ0tPRkZGVUNLT0ZGRlVDS09GRkZVQ0tPRkZGVUNLT0ZGRlVDS09GRkZVQ0tPRkZGVUNLT0ZGRlVDS09GRg=="
         # Type mismatch with blob