[openssh-commits] [openssh] 01/01: upstream: LibreSSL change the format for openssl rsa -text output from

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

dtucker pushed a commit to branch master
in repository openssh.

commit 64f56f1d1af3947a71a4c391f2c08747d19ee591
Author: dtucker at openbsd.org <dtucker at openbsd.org>
Date:   Mon Nov 18 09:15:17 2019 +0000

    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 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

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.