From: Steven Barth <steven@midlink.org>
Date: Wed, 4 Mar 2009 18:30:56 +0000 (+0000)
Subject: nixio: Fix generation of private key for axtls
X-Git-Tag: 0.9.0~634
X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=commitdiff_plain;h=f1b667fc6fd9e9d8eab8a90f5f8f2f4346364597;hp=fc45514531d686dbea23c963c65f1bd627be9d24

nixio: Fix generation of private key for axtls
---

diff --git a/libs/nixio/axtls-root/usr/sbin/nixio-axtls-checkkey b/libs/nixio/axtls-root/usr/sbin/nixio-axtls-checkkey
index 994f24e7b..4bfee88b0 100755
--- a/libs/nixio/axtls-root/usr/sbin/nixio-axtls-checkkey
+++ b/libs/nixio/axtls-root/usr/sbin/nixio-axtls-checkkey
@@ -6,11 +6,11 @@ if not defkey or io.open(defkey) then
 	os.exit(0)
 end
 
-if os.execute("which openssl") then
+if os.execute("which openssl >/dev/null") == 0 then
 	io.stderr:write("Warning: OpenSSL detected "..
 	"but it looks like nixio was linked against axtls\n")
 	os.execute("umask 0077;openssl genrsa -out '" .. defkey .. "' 2048")
-elseif os.execute("which dropbearkey && which dropbearconvert") then
+elseif os.execute("which dropbearkey >/dev/null && which dropbearconvert >/dev/null") == 0 then
 	os.execute("dropbearkey -t rsa -s 2048 -f /tmp/dbkey.rsa")
 	os.execute("umask 0077;dropbearconvert dropbear openssh /tmp/dbkey.rsa '"..defkey.."'")
 	os.remove("/tmp/dbkey.rsa")