arne
/
cryptopp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge 'master' into 'ecies'

pull/263/head
Jeffrey Walton 2016-09-09 15:08:22 -04:00
parent 525077e88d 800b27857a
commit 04b0d93cd7
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
cryptest.sh
View File

@ -174,10 +174,10 @@ do
elif [[ ($("$EGREP" -ix "farm" <<< "$ARG") || $("$EGREP" -ix "nice" <<< "$ARG")) ]]; then elif [[ ($("$EGREP" -ix "farm" <<< "$ARG") || $("$EGREP" -ix "nice" <<< "$ARG")) ]]; then
WANT_NICE=1 WANT_NICE=1
elif [[ ($("$EGREP" -ix "orig" <<< "$ARG") || $("$EGREP" -ix "original" <<< "$ARG") || $("$EGREP" -ix "config.h" <<< "$ARG")) ]]; then elif [[ ($("$EGREP" -ix "orig" <<< "$ARG") || $("$EGREP" -ix "original" <<< "$ARG") || $("$EGREP" -ix "config.h" <<< "$ARG")) ]]; then
git checkout config.h &>/dev/null git checkout config.h > /dev/null 2>&1
WANTED_CONFIG=1 WANTED_CONFIG=1
elif [[ ($("$EGREP" -ix "rec" <<< "$ARG") || $("$EGREP" -ix "recommend" <<< "$ARG") || $("$EGREP" -ix "config.recommend" <<< "$ARG")) ]]; then elif [[ ($("$EGREP" -ix "rec" <<< "$ARG") || $("$EGREP" -ix "recommend" <<< "$ARG") || $("$EGREP" -ix "config.recommend" <<< "$ARG")) ]]; then
git checkout config.recommend &>/dev/null git checkout config.recommend > /dev/null 2>&1
cp config.recommend config.h cp config.recommend config.h
WANTED_CONFIG=1 WANTED_CONFIG=1
else else
@ -473,9 +473,9 @@ fi
rm -f "$TMP/adhoc.exe" > /dev/null 2>&1 rm -f "$TMP/adhoc.exe" > /dev/null 2>&1
if [[ (-z "$HAVE_UBSAN") ]]; then if [[ (-z "$HAVE_UBSAN") ]]; then
HAVE_UBSAN=0 HAVE_UBSAN=0
"$CXX" -DCRYPTOPP_ADHOC_MAIN -fsanitize=undefined adhoc.cpp -o "$TMP/adhoc.exe" &>/dev/null "$CXX" -DCRYPTOPP_ADHOC_MAIN -fsanitize=undefined adhoc.cpp -o "$TMP/adhoc.exe" > /dev/null 2>&1
if [[ ("$?" -eq "0") ]]; then if [[ ("$?" -eq "0") ]]; then
"$TMP/adhoc.exe" &>/dev/null "$TMP/adhoc.exe" > /dev/null 2>&1
if [[ ("$?" -eq "0") ]]; then if [[ ("$?" -eq "0") ]]; then
HAVE_UBSAN=1 HAVE_UBSAN=1
fi fi
@ -486,9 +486,9 @@ fi
rm -f "$TMP/adhoc.exe" > /dev/null 2>&1 rm -f "$TMP/adhoc.exe" > /dev/null 2>&1
if [[ (-z "$HAVE_ASAN") ]]; then if [[ (-z "$HAVE_ASAN") ]]; then
HAVE_ASAN=0 HAVE_ASAN=0
"$CXX" -DCRYPTOPP_ADHOC_MAIN -fsanitize=address adhoc.cpp -o "$TMP/adhoc.exe" &>/dev/null "$CXX" -DCRYPTOPP_ADHOC_MAIN -fsanitize=address adhoc.cpp -o "$TMP/adhoc.exe" > /dev/null 2>&1
if [[ ("$?" -eq "0") ]]; then if [[ ("$?" -eq "0") ]]; then
"$TMP/adhoc.exe" &>/dev/null "$TMP/adhoc.exe" > /dev/null 2>&1
if [[ ("$?" -eq "0") ]]; then if [[ ("$?" -eq "0") ]]; then
HAVE_ASAN=1 HAVE_ASAN=1
fi fi
@ -499,9 +499,9 @@ fi
rm -f "$TMP/adhoc.exe" > /dev/null 2>&1 rm -f "$TMP/adhoc.exe" > /dev/null 2>&1
if [[ (-z "$HAVE_BOUNDS_SAN") ]]; then if [[ (-z "$HAVE_BOUNDS_SAN") ]]; then
HAVE_BOUNDS_SAN=0 HAVE_BOUNDS_SAN=0
"$CXX" -DCRYPTOPP_ADHOC_MAIN -fsanitize=bounds-strict adhoc.cpp -o "$TMP/adhoc.exe" &>/dev/null "$CXX" -DCRYPTOPP_ADHOC_MAIN -fsanitize=bounds-strict adhoc.cpp -o "$TMP/adhoc.exe" > /dev/null 2>&1
if [[ ("$?" -eq "0") ]]; then if [[ ("$?" -eq "0") ]]; then
"$TMP/adhoc.exe" &>/dev/null "$TMP/adhoc.exe" > /dev/null 2>&1
if [[ ("$?" -eq "0") ]]; then if [[ ("$?" -eq "0") ]]; then
HAVE_BOUNDS_SAN=1 HAVE_BOUNDS_SAN=1
fi fi
@ -635,11 +635,11 @@ if [[ (-z "$HAVE_ZIP") ]]; then
UNZIP_PROG=$(which unzip 2>&1 | "$GREP" -v "no unzip" | head -1) UNZIP_PROG=$(which unzip 2>&1 | "$GREP" -v "no unzip" | head -1)
if [[ (! -z "$ZIP_PROG" && ! -z "$UNZIP_PROG") ]]; then if [[ (! -z "$ZIP_PROG" && ! -z "$UNZIP_PROG") ]]; then
HAVE_ZIP=1 HAVE_ZIP=1
zip -v &>/dev/null zip -v > /dev/null 2>&1
if [[ "$?" -ne "0" ]]; then if [[ "$?" -ne "0" ]]; then
HAVE_ZIP=0 HAVE_ZIP=0
fi fi
unzip -v &>/dev/null unzip -v > /dev/null 2>&1
if [[ "$?" -ne "0" ]]; then if [[ "$?" -ne "0" ]]; then
HAVE_ZIP=0 HAVE_ZIP=0
fi fi
@ -5298,10 +5298,10 @@ fi
if [[ ("$HAVE_ZIP" -ne "0") ]]; then if [[ ("$HAVE_ZIP" -ne "0") ]]; then
OLD_DIR=$(pwd) OLD_DIR=$(pwd)
"$MAKE" zip "$MAKE" zip > /dev/null 2>&1
RESULT=$(unzip -aoq cryptopp563.zip -d "$TMP/cryptopp563-zip/") unzip -aoq cryptopp563.zip -d "$TMP/cryptopp563-zip/" > /dev/null 2>&1
if [[ "$RESULT" -eq "0" ]]; then if [[ "$?" -eq "0" ]]; then
cd "$TMP/cryptopp563-zip/" cd "$TMP/cryptopp563-zip/"
############################################ ############################################

BIN
vs2010.zip
View File

Binary file not shown.