diff options
| author | dtucker@openbsd.org <dtucker@openbsd.org> | 2019-11-18 09:15:17 +0000 |
|---|---|---|
| committer | Darren Tucker <dtucker@dtucker.net> | 2019-11-18 20:54:05 +1100 |
| commit | 64f56f1d1af3947a71a4c391f2c08747d19ee591 (patch) | |
| tree | 58b21fc02faa49e698410832f61ac1318c8df09f /regress/ssh2putty.sh | |
| parent | 4bfc0503ad94a2a7190686a89649567c20b8534f (diff) | |
| download | openssh-git-64f56f1d1af3947a71a4c391f2c08747d19ee591.tar.gz | |
upstream: LibreSSL change the format for openssl rsa -text output from
"publicExponent" to "Exponent" so accept either. with djm.
OpenBSD-Regress-ID: b7e6c4bf700029a31c98be14600d4472fe0467e6
Diffstat (limited to 'regress/ssh2putty.sh')
| -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 bcf83afe..d973506b 100755 --- a/regress/ssh2putty.sh +++ b/regress/ssh2putty.sh @@ -1,5 +1,5 @@ #!/bin/sh -# $OpenBSD: ssh2putty.sh,v 1.3 2015/05/08 07:26:13 djm Exp $ +# $OpenBSD: ssh2putty.sh,v 1.4 2019/11/18 09:15:17 dtucker Exp $ if test "x$1" = "x" -o "x$2" = "x" -o "x$3" = "x" ; then echo "Usage: ssh2putty hostname port ssh-private-key" @@ -19,7 +19,7 @@ else fi public_exponent=` - openssl rsa -noout -text -in $KEYFILE | grep ^publicExponent | + openssl rsa -noout -text -in $KEYFILE | egrep '^(public)?Exponent' | sed 's/.*(//;s/).*//' ` test $? -ne 0 && exit 1 |