From 64f56f1d1af3947a71a4c391f2c08747d19ee591 Mon Sep 17 00:00:00 2001 From: "dtucker@openbsd.org" Date: Mon, 18 Nov 2019 09:15:17 +0000 Subject: upstream: LibreSSL change the format for openssl rsa -text output from "publicExponent" to "Exponent" so accept either. with djm. OpenBSD-Regress-ID: b7e6c4bf700029a31c98be14600d4472fe0467e6 --- regress/ssh2putty.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/regress/ssh2putty.sh b/regress/ssh2putty.sh index bcf83afe9..d973506b5 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 -- cgit v1.2.3