diff options
author | tb@openbsd.org <tb@openbsd.org> | 2019-11-21 05:18:47 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2019-11-25 21:34:20 +1100 |
commit | e65e25c81e22ea622e89a142a303726a3882384f (patch) | |
tree | e30a07e7fd1ea4504deecfef5829f8f0fc3eb8b7 | |
parent | 21377ec2a9378579ba4b44a681af7bbca77581f4 (diff) |
upstream: Remove workaround for broken 'openssl rsa -text' output
that was fixed in libcrypto/rsa/rsa_ameth.c r1.24.
ok dtucker inoguchi
OpenBSD-Regress-ID: c260edfac177daa8fcce90141587cf04a95c4f5f
-rwxr-xr-x | regress/ssh2putty.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/regress/ssh2putty.sh b/regress/ssh2putty.sh index d973506b5..dcb975d95 100755 --- a/regress/ssh2putty.sh +++ b/regress/ssh2putty.sh | |||
@@ -1,5 +1,5 @@ | |||
1 | #!/bin/sh | 1 | #!/bin/sh |
2 | # $OpenBSD: ssh2putty.sh,v 1.4 2019/11/18 09:15:17 dtucker Exp $ | 2 | # $OpenBSD: ssh2putty.sh,v 1.5 2019/11/21 05:18:47 tb Exp $ |
3 | 3 | ||
4 | if test "x$1" = "x" -o "x$2" = "x" -o "x$3" = "x" ; then | 4 | if test "x$1" = "x" -o "x$2" = "x" -o "x$3" = "x" ; then |
5 | echo "Usage: ssh2putty hostname port ssh-private-key" | 5 | echo "Usage: ssh2putty hostname port ssh-private-key" |
@@ -19,7 +19,7 @@ else | |||
19 | fi | 19 | fi |
20 | 20 | ||
21 | public_exponent=` | 21 | public_exponent=` |
22 | openssl rsa -noout -text -in $KEYFILE | egrep '^(public)?Exponent' | | 22 | openssl rsa -noout -text -in $KEYFILE | grep ^publicExponent | |
23 | sed 's/.*(//;s/).*//' | 23 | sed 's/.*(//;s/).*//' |
24 | ` | 24 | ` |
25 | test $? -ne 0 && exit 1 | 25 | test $? -ne 0 && exit 1 |