diff options
| author |   dtucker <dtucker@openbsd.org> | 2019-11-18 09:15:17 +0000 |
|---|---|---|
| committer | dtucker <dtucker@openbsd.org> | 2019-11-18 09:15:17 +0000 |
| commit | 5e3a729fd7e4376388c95bd9a443330f8e3bb849 (patch) | |
| tree | cf1833ef89a14faa17c27bd2ccee65386b6cd9aa | |
| parent | Move the define of TALSZ_MAX to top and add a description for (diff) | |
| download | wireguard-openbsd-5e3a729fd7e4376388c95bd9a443330f8e3bb849.tar.xz wireguard-openbsd-5e3a729fd7e4376388c95bd9a443330f8e3bb849.zip | |
LibreSSL change the format for openssl rsa -text output from
"publicExponent" to "Exponent" so accept either. with djm.
| -rwxr-xr-x | regress/usr.bin/ssh/ssh2putty.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/regress/usr.bin/ssh/ssh2putty.sh b/regress/usr.bin/ssh/ssh2putty.sh index 729862cd42f..e5b3da69d2e 100755 --- a/regress/usr.bin/ssh/ssh2putty.sh +++ b/regress/usr.bin/ssh/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" @@ -17,7 +17,7 @@ if ! grep -q "BEGIN RSA PRIVATE KEY" $KEYFILE ; then 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 |