don't do double work, reordering stuff
This commit is contained in:
parent
f70bc4e08f
commit
2aa68827b9
|
@ -5,14 +5,6 @@
|
||||||
# instructions @ https://github.com/drwetter/testssl.sh/tree/2.9dev/bin
|
# instructions @ https://github.com/drwetter/testssl.sh/tree/2.9dev/bin
|
||||||
|
|
||||||
|
|
||||||
echo
|
|
||||||
echo "###################################################################"
|
|
||||||
echo "####### Build script for Peter Mosmans openssl #######"
|
|
||||||
echo "####### which contains all broken and all advanced features #######"
|
|
||||||
echo "###################################################################"
|
|
||||||
echo
|
|
||||||
sleep 3
|
|
||||||
|
|
||||||
STDOPTIONS="--prefix=/usr/ --openssldir=/etc/ssl -DOPENSSL_USE_BUILD_DATE enable-zlib \
|
STDOPTIONS="--prefix=/usr/ --openssldir=/etc/ssl -DOPENSSL_USE_BUILD_DATE enable-zlib \
|
||||||
enable-ssl2 enable-ssl3 enable-ssl-trace enable-rc5 enable-rc2 \
|
enable-ssl2 enable-ssl3 enable-ssl-trace enable-rc5 enable-rc2 \
|
||||||
enable-gost enable-cms enable-md2 enable-mdc2 enable-ec enable-ec2m enable-ecdh enable-ecdsa \
|
enable-gost enable-cms enable-md2 enable-mdc2 enable-ec enable-ec2m enable-ecdh enable-ecdsa \
|
||||||
|
@ -81,42 +73,45 @@ testv6_patch() {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
echo
|
||||||
|
echo "###################################################################"
|
||||||
|
echo "####### Build script for Peter Mosmans openssl fork #######"
|
||||||
|
echo "####### which contains all broken and all advanced features #######"
|
||||||
|
echo "###################################################################"
|
||||||
|
echo
|
||||||
|
|
||||||
testv6_patch
|
testv6_patch
|
||||||
|
|
||||||
|
if [ "$1" = krb ]; then
|
||||||
|
name2add=krb
|
||||||
|
else
|
||||||
|
name2add=static
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "doing a build for $(uname).$(uname -m)".$name2add
|
||||||
|
echo
|
||||||
|
sleep 3
|
||||||
|
|
||||||
|
|
||||||
case $(uname) in
|
case $(uname) in
|
||||||
Linux|FreeBSD)
|
Linux|FreeBSD)
|
||||||
case $(uname -m) in
|
case $(uname -m) in
|
||||||
i686|armv7l) clean
|
i686|armv7l) clean
|
||||||
if [ "$1" == krb ]; then
|
if [ "$1" = krb ]; then
|
||||||
name2add=krb
|
|
||||||
./config $STDOPTIONS no-ec_nistp_64_gcc_128 --with-krb5-flavor=MIT
|
./config $STDOPTIONS no-ec_nistp_64_gcc_128 --with-krb5-flavor=MIT
|
||||||
else
|
else
|
||||||
name2add=static
|
|
||||||
./config $STDOPTIONS no-ec_nistp_64_gcc_128 -static
|
./config $STDOPTIONS no-ec_nistp_64_gcc_128 -static
|
||||||
fi
|
fi
|
||||||
[ $? -ne 0 ] && error "configuring"
|
[ $? -ne 0 ] && error "configuring"
|
||||||
makeall && copyfiles "$name2add"
|
|
||||||
[ $? -ne 0 ] && error "copying files"
|
|
||||||
echo "\n(w/o 4 GOST ciphers): $(apps/openssl ciphers -V 'ALL:COMPLEMENTOFALL' | wc -l)"
|
|
||||||
echo
|
|
||||||
echo "------------ all ok ------------"
|
|
||||||
echo
|
|
||||||
;;
|
;;
|
||||||
x86_64|amd64) clean
|
x86_64|amd64) clean
|
||||||
if [ "$1" = krb ]; then
|
if [ "$1" = krb ]; then
|
||||||
name2add=krb
|
|
||||||
./config $STDOPTIONS enable-ec_nistp_64_gcc_128 --with-krb5-flavor=MIT
|
./config $STDOPTIONS enable-ec_nistp_64_gcc_128 --with-krb5-flavor=MIT
|
||||||
else
|
else
|
||||||
name2add=static
|
|
||||||
./config $STDOPTIONS enable-ec_nistp_64_gcc_128 -static
|
./config $STDOPTIONS enable-ec_nistp_64_gcc_128 -static
|
||||||
fi
|
fi
|
||||||
[ $? -ne 0 ] && error "configuring"
|
[ $? -ne 0 ] && error "configuring"
|
||||||
makeall && copyfiles "$name2add"
|
|
||||||
[ $? -ne 0 ] && error "copying files"
|
|
||||||
echo "\n(w/o 4 GOST ciphers): $(apps/openssl ciphers -V 'ALL:COMPLEMENTOFALL' | wc -l)"
|
|
||||||
echo
|
|
||||||
echo "------------ all ok ------------"
|
|
||||||
echo
|
|
||||||
;;
|
;;
|
||||||
*) echo " Sorry, don't know this architecture $(uname -m)"
|
*) echo " Sorry, don't know this architecture $(uname -m)"
|
||||||
exit 1
|
exit 1
|
||||||
|
@ -138,6 +133,15 @@ case $(uname) in
|
||||||
esac
|
esac
|
||||||
|
|
||||||
|
|
||||||
# vim:ts=5:sw=5
|
makeall && copyfiles "$name2add"
|
||||||
# $Id: make-openssl.sh,v 1.18 2017/05/12 15:03:00 dirkw Exp $
|
[ $? -ne 0 ] && error "copying files"
|
||||||
|
echo
|
||||||
|
echo "(w/o 4 GOST ciphers): $(apps/openssl ciphers -V 'ALL:COMPLEMENTOFALL' | wc -l)"
|
||||||
|
echo
|
||||||
|
echo "------------ all ok ------------"
|
||||||
|
echo
|
||||||
|
|
||||||
|
|
||||||
|
# vim:ts=5:sw=5
|
||||||
|
# $Id: make-openssl.sh,v 1.19 2017/05/12 15:56:24 dirkw Exp $
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue