Git
/
testssl.sh
mirror of https://github.com/drwetter/testssl.sh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- new naming scheme of copied binaries 

- two GOST ciphers included
- error handling improved
This commit is contained in:
Dirk Wetter 2015-07-20 21:46:04 +02:00
parent 8c858dbe3c
commit 1954f9eaa8
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
openssl-bins/make-openssl.sh
View File

@ -12,8 +12,8 @@ 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 \
enable-seed enable-camellia enable-idea enable-rfc3779 experimental-jpake" enable-seed enable-camellia enable-idea enable-rfc3779 experimental-jpake -DTEMP_GOST_TLS"
clean() { clean() {
case $NOCLEAN in case $NOCLEAN in
@ -26,22 +26,23 @@ clean() {
error() { error() {
tput bold tput bold
echo "ERROR $1" echo "### ERROR $1 ###"
tput sgr0 tput sgr0
exit 2 exit 2
} }
makeall() { makeall() {
make depend && make && make report make depend || error "depend"
if [ $? -ne 0 ]; then make || error "making"
error "making" make report || error "testing/make report"
fi #FIXME: we need another error handler, as of now a failure doesn't mean a return status of 1
# see https://github.com/openssl/openssl/pull/336
return 0 return 0
} }
copyfiles() { copyfiles() {
echo; apps/openssl version -a; echo echo; apps/openssl version -a; echo
cp -p apps/openssl ../openssl$1 cp -p apps/openssl ../openssl.$(uname).$(uname -m).$1
echo echo
return $? return $?
} }
@ -56,7 +57,7 @@ case $(uname -m) in
./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 "32-$name2add" makeall && copyfiles "$name2add"
[ $? -ne 0 ] && error "copying files" [ $? -ne 0 ] && error "copying files"
apps/openssl ciphers -V 'ALL:COMPLEMENTOFALL' | wc -l apps/openssl ciphers -V 'ALL:COMPLEMENTOFALL' | wc -l
echo echo
@ -72,18 +73,18 @@ case $(uname -m) in
./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 "64-$name2add" makeall && copyfiles "$name2add"
[ $? -ne 0 ] && error "copying files" [ $? -ne 0 ] && error "copying files"
apps/openssl ciphers -V 'ALL:COMPLEMENTOFALL' | wc -l apps/openssl ciphers -V 'ALL:COMPLEMENTOFALL' | wc -l
echo echo
echo "------------ all ok ------------" echo "------------ all ok ------------"
echo echo
;; ;;
*) echo " Sorry don't know this architecture $(uname -m)" *) echo " Sorry, don't know this architecture $(uname -m)"
exit 1 exit 1
;; ;;
esac esac
# vim:tw=90:ts=5:sw=5 # vim:tw=90:ts=5:sw=5
# $Id: make-openssl.sh,v 1.11 2015/07/20 10:46:49 dirkw Exp $ # $Id: make-openssl.sh,v 1.14 2015/07/20 19:40:54 dirkw Exp $