mirror of
https://github.com/mozilla/cipherscan.git
synced 2024-11-25 15:33:41 +01:00
Merge pull request #22 from simondeziel/sdeziel
Use Debian's system-wide trust anchors when possible
This commit is contained in:
commit
ded65c40df
10
cipherscan
10
cipherscan
@ -8,7 +8,14 @@
|
|||||||
DOBENCHMARK=0
|
DOBENCHMARK=0
|
||||||
BENCHMARKITER=30
|
BENCHMARKITER=30
|
||||||
OPENSSLBIN="$(dirname $0)/openssl"
|
OPENSSLBIN="$(dirname $0)/openssl"
|
||||||
CACERTS=${CACERTS:-/etc/pki/tls/certs/ca-bundle.crt}
|
if [ -z "$CACERTS" ]; then
|
||||||
|
for f in /etc/pki/tls/certs/ca-bundle.crt /etc/ssl/certs/ca-certificates.crt; do
|
||||||
|
if [ -e "$f" ]; then
|
||||||
|
CACERTS="$f"
|
||||||
|
break
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
fi
|
||||||
if [ ! -e "$CACERTS" ]; then
|
if [ ! -e "$CACERTS" ]; then
|
||||||
CACERTS="/etc/ssl/certs/ca-certificates.crt"
|
CACERTS="/etc/ssl/certs/ca-certificates.crt"
|
||||||
fi
|
fi
|
||||||
@ -358,6 +365,7 @@ do
|
|||||||
done
|
done
|
||||||
|
|
||||||
if [ $VERBOSE != 0 ] ; then
|
if [ $VERBOSE != 0 ] ; then
|
||||||
|
[ -n "$CACERTS" ] && echo "Using trust anchors from $CACERTS"
|
||||||
echo "Loading $($OPENSSLBIN ciphers -v $CIPHERSUITE 2>/dev/null|grep Kx|wc -l) ciphersuites from $(echo -n $($OPENSSLBIN version 2>/dev/null))"
|
echo "Loading $($OPENSSLBIN ciphers -v $CIPHERSUITE 2>/dev/null|grep Kx|wc -l) ciphersuites from $(echo -n $($OPENSSLBIN version 2>/dev/null))"
|
||||||
$OPENSSLBIN ciphers ALL 2>/dev/null
|
$OPENSSLBIN ciphers ALL 2>/dev/null
|
||||||
fi
|
fi
|
||||||
|
Loading…
Reference in New Issue
Block a user