[openssh-commits] [openssh] 02/04: upstream: Remove workaround for broken 'openssl rsa -text' output

[git+noreply at mindrot.org]

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

djm pushed a commit to branch master
in repository openssh.

commit e65e25c81e22ea622e89a142a303726a3882384f
Author: tb at openbsd.org <tb at openbsd.org>
Date:   Thu Nov 21 05:18:47 2019 +0000

    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
---
 regress/ssh2putty.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/regress/ssh2putty.sh b/regress/ssh2putty.sh
index d973506b..dcb975d9 100755
--- a/regress/ssh2putty.sh
+++ b/regress/ssh2putty.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-#	$OpenBSD: ssh2putty.sh,v 1.4 2019/11/18 09:15:17 dtucker Exp $
+#	$OpenBSD: ssh2putty.sh,v 1.5 2019/11/21 05:18:47 tb 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 | egrep '^(public)?Exponent' |
+	openssl rsa -noout -text -in $KEYFILE | grep ^publicExponent |
 	sed 's/.*(//;s/).*//'
 `
 test $? -ne 0 && exit 1

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