Remove utils that we don't use
authorafresh1 <afresh1@openbsd.org>
Thu, 17 Apr 2014 19:22:31 +0000 (19:22 +0000)
committerafresh1 <afresh1@openbsd.org>
Thu, 17 Apr 2014 19:22:31 +0000 (19:22 +0000)
opensslwrap.sh and shlib_wrap.sh are used by tests that are getting replaced,
x86asm.sh is obsoleted by our Makefile machinery

ok miod

lib/libcrypto/util/opensslwrap.sh [deleted file]
lib/libcrypto/util/shlib_wrap.sh [deleted file]
lib/libcrypto/util/x86asm.sh [deleted file]
lib/libssl/src/util/opensslwrap.sh [deleted file]
lib/libssl/src/util/shlib_wrap.sh [deleted file]
lib/libssl/src/util/x86asm.sh [deleted file]

diff --git a/lib/libcrypto/util/opensslwrap.sh b/lib/libcrypto/util/opensslwrap.sh
deleted file mode 100755 (executable)
index b27cbb8..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-
-HERE="`echo $0 | sed -e 's|[^/]*$||'`"
-OPENSSL="${HERE}../apps/openssl"
-
-if [ -d "${HERE}../engines" -a "x$OPENSSL_ENGINES" = "x" ]; then
-       OPENSSL_ENGINES="${HERE}../engines"; export OPENSSL_ENGINES
-fi
-
-if [ -x "${OPENSSL}.exe" ]; then
-       # The original reason for this script existence is to work around
-       # certain caveats in run-time linker behaviour. On Windows platforms
-       # adjusting $PATH used to be sufficient, but with introduction of
-       # SafeDllSearchMode in XP/2003 the only way to get it right in
-       # *all* possible situations is to copy newly built .DLLs to apps/
-       # and test/, which is now done elsewhere... The $PATH is adjusted
-       # for backward compatibility (and nostagical reasons:-).
-       if [ "$OSTYPE" != msdosdjgpp ]; then
-               PATH="${HERE}..:$PATH"; export PATH
-       fi
-       exec "${OPENSSL}.exe" "$@"
-elif [ -x "${OPENSSL}" -a -x "${HERE}shlib_wrap.sh" ]; then
-       exec "${HERE}shlib_wrap.sh" "${OPENSSL}" "$@"
-else
-       exec "${OPENSSL}" "$@"  # hope for the best...
-fi
diff --git a/lib/libcrypto/util/shlib_wrap.sh b/lib/libcrypto/util/shlib_wrap.sh
deleted file mode 100755 (executable)
index 8775cb5..0000000
+++ /dev/null
@@ -1,97 +0,0 @@
-#!/bin/sh
-
-[ $# -ne 0 ] || set -x         # debug mode without arguments:-)
-
-THERE="`echo $0 | sed -e 's|[^/]*$||' 2>/dev/null`.."
-[ -d "${THERE}" ] || exec "$@" # should never happen...
-
-# Alternative to this is to parse ${THERE}/Makefile...
-LIBCRYPTOSO="${THERE}/libcrypto.so"
-if [ -f "$LIBCRYPTOSO" ]; then
-    while [ -h "$LIBCRYPTOSO" ]; do
-       LIBCRYPTOSO="${THERE}/`ls -l "$LIBCRYPTOSO" | sed -e 's|.*\-> ||'`"
-    done
-    SOSUFFIX=`echo ${LIBCRYPTOSO} | sed -e 's|.*\.so||' 2>/dev/null`
-    LIBSSLSO="${THERE}/libssl.so${SOSUFFIX}"
-fi
-
-SYSNAME=`(uname -s) 2>/dev/null`;
-case "$SYSNAME" in
-SunOS|IRIX*)
-       # SunOS and IRIX run-time linkers evaluate alternative
-       # variables depending on target ABI...
-       rld_var=LD_LIBRARY_PATH
-       case "`(/usr/bin/file "$LIBCRYPTOSO") 2>/dev/null`" in
-       *ELF\ 64*SPARC*|*ELF\ 64*AMD64*)
-               [ -n "$LD_LIBRARY_PATH_64" ] && rld_var=LD_LIBRARY_PATH_64
-               LD_PRELOAD_64="$LIBCRYPTOSO $LIBSSLSO"; export LD_PRELOAD_64
-               preload_var=LD_PRELOAD_64
-               ;;
-       # Why are newly built .so's preloaded anyway? Because run-time
-       # .so lookup path embedded into application takes precedence
-       # over LD_LIBRARY_PATH and as result application ends up linking
-       # to previously installed .so's. On IRIX instead of preloading
-       # newly built .so's we trick run-time linker to fail to find
-       # the installed .so by setting _RLD_ROOT variable.
-       *ELF\ 32*MIPS*)
-               #_RLD_LIST="$LIBCRYPTOSO:$LIBSSLSO:DEFAULT"; export _RLD_LIST
-               _RLD_ROOT=/no/such/dir; export _RLD_ROOT
-               eval $rld_var=\"/usr/lib'${'$rld_var':+:$'$rld_var'}'\"
-               preload_var=_RLD_LIST
-               ;;
-       *ELF\ N32*MIPS*)
-               [ -n "$LD_LIBRARYN32_PATH" ] && rld_var=LD_LIBRARYN32_PATH
-               #_RLDN32_LIST="$LIBCRYPTOSO:$LIBSSLSO:DEFAULT"; export _RLDN32_LIST
-               _RLDN32_ROOT=/no/such/dir; export _RLDN32_ROOT
-               eval $rld_var=\"/usr/lib32'${'$rld_var':+:$'$rld_var'}'\"
-               preload_var=_RLDN32_LIST
-               ;;
-       *ELF\ 64*MIPS*)
-               [ -n "$LD_LIBRARY64_PATH"  ] && rld_var=LD_LIBRARY64_PATH
-               #_RLD64_LIST="$LIBCRYPTOSO:$LIBSSLSO:DEFAULT"; export _RLD64_LIST
-               _RLD64_ROOT=/no/such/dir; export _RLD64_ROOT
-               eval $rld_var=\"/usr/lib64'${'$rld_var':+:$'$rld_var'}'\"
-               preload_var=_RLD64_LIST
-               ;;
-       esac
-       eval $rld_var=\"${THERE}'${'$rld_var':+:$'$rld_var'}'\"; export $rld_var
-       unset rld_var
-       ;;
-*)     LD_LIBRARY_PATH="${THERE}:$LD_LIBRARY_PATH"     # Linux, ELF HP-UX
-       DYLD_LIBRARY_PATH="${THERE}:$DYLD_LIBRARY_PATH" # MacOS X
-       SHLIB_PATH="${THERE}:$SHLIB_PATH"               # legacy HP-UX
-       LIBPATH="${THERE}:$LIBPATH"                     # AIX, OS/2
-       export LD_LIBRARY_PATH DYLD_LIBRARY_PATH SHLIB_PATH LIBPATH
-       # Even though $PATH is adjusted [for Windows sake], it doesn't
-       # necessarily does the trick. Trouble is that with introduction
-       # of SafeDllSearchMode in XP/2003 it's more appropriate to copy
-       # .DLLs in vicinity of executable, which is done elsewhere...
-       if [ "$OSTYPE" != msdosdjgpp ]; then
-               PATH="${THERE}:$PATH"; export PATH
-       fi
-       ;;
-esac
-
-if [ -f "$LIBCRYPTOSO" -a -z "$preload_var" ]; then
-       # Following three lines are major excuse for isolating them into
-       # this wrapper script. Original reason for setting LD_PRELOAD
-       # was to make it possible to pass 'make test' when user linked
-       # with -rpath pointing to previous version installation. Wrapping
-       # it into a script makes it possible to do so on multi-ABI
-       # platforms.
-       case "$SYSNAME" in
-       *BSD|QNX)       LD_PRELOAD="$LIBCRYPTOSO:$LIBSSLSO" ;;  # *BSD, QNX
-       *)      LD_PRELOAD="$LIBCRYPTOSO $LIBSSLSO" ;;  # SunOS, Linux, ELF HP-UX
-       esac
-       _RLD_LIST="$LIBCRYPTOSO:$LIBSSLSO:DEFAULT"      # Tru64, o32 IRIX
-       DYLD_INSERT_LIBRARIES="$LIBCRYPTOSO:$LIBSSLSO"  # MacOS X
-       export LD_PRELOAD _RLD_LIST DYLD_INSERT_LIBRARIES
-fi
-
-cmd="$1${EXE_EXT}"
-shift
-if [ $# -eq 0 ]; then
-       exec "$cmd"     # old sh, such as Tru64 4.x, fails to expand empty "$@"
-else
-       exec "$cmd" "$@"
-fi
diff --git a/lib/libcrypto/util/x86asm.sh b/lib/libcrypto/util/x86asm.sh
deleted file mode 100644 (file)
index d2090a9..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/sh
-
-echo Generating x86 assember
-echo Bignum
-(cd crypto/bn/asm; perl x86.pl cpp > bn86unix.cpp)
-(cd crypto/bn/asm; perl x86.pl win32 > bn-win32.asm)
-
-echo DES
-(cd crypto/des/asm; perl des-586.pl cpp > dx86unix.cpp)
-(cd crypto/des/asm; perl des-586.pl win32 > d-win32.asm)
-
-echo "crypt(3)"
-(cd crypto/des/asm; perl crypt586.pl cpp > yx86unix.cpp)
-(cd crypto/des/asm; perl crypt586.pl win32 > y-win32.asm)
-
-echo Blowfish
-(cd crypto/bf/asm; perl bf-586.pl cpp > bx86unix.cpp)
-(cd crypto/bf/asm; perl bf-586.pl win32 > b-win32.asm)
-
-echo CAST5
-(cd crypto/cast/asm; perl cast-586.pl cpp > cx86unix.cpp)
-(cd crypto/cast/asm; perl cast-586.pl win32 > c-win32.asm)
-
-echo RC4
-(cd crypto/rc4/asm; perl rc4-586.pl cpp > rx86unix.cpp)
-(cd crypto/rc4/asm; perl rc4-586.pl win32 > r4-win32.asm)
-
-echo MD5
-(cd crypto/md5/asm; perl md5-586.pl cpp > mx86unix.cpp)
-(cd crypto/md5/asm; perl md5-586.pl win32 > m5-win32.asm)
-
-echo SHA1
-(cd crypto/sha/asm; perl sha1-586.pl cpp > sx86unix.cpp)
-(cd crypto/sha/asm; perl sha1-586.pl win32 > s1-win32.asm)
-
-echo RIPEMD160
-(cd crypto/ripemd/asm; perl rmd-586.pl cpp > rm86unix.cpp)
-(cd crypto/ripemd/asm; perl rmd-586.pl win32 > rm-win32.asm)
-
-echo RC5/32
-(cd crypto/rc5/asm; perl rc5-586.pl cpp > r586unix.cpp)
-(cd crypto/rc5/asm; perl rc5-586.pl win32 > r5-win32.asm)
diff --git a/lib/libssl/src/util/opensslwrap.sh b/lib/libssl/src/util/opensslwrap.sh
deleted file mode 100755 (executable)
index b27cbb8..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-
-HERE="`echo $0 | sed -e 's|[^/]*$||'`"
-OPENSSL="${HERE}../apps/openssl"
-
-if [ -d "${HERE}../engines" -a "x$OPENSSL_ENGINES" = "x" ]; then
-       OPENSSL_ENGINES="${HERE}../engines"; export OPENSSL_ENGINES
-fi
-
-if [ -x "${OPENSSL}.exe" ]; then
-       # The original reason for this script existence is to work around
-       # certain caveats in run-time linker behaviour. On Windows platforms
-       # adjusting $PATH used to be sufficient, but with introduction of
-       # SafeDllSearchMode in XP/2003 the only way to get it right in
-       # *all* possible situations is to copy newly built .DLLs to apps/
-       # and test/, which is now done elsewhere... The $PATH is adjusted
-       # for backward compatibility (and nostagical reasons:-).
-       if [ "$OSTYPE" != msdosdjgpp ]; then
-               PATH="${HERE}..:$PATH"; export PATH
-       fi
-       exec "${OPENSSL}.exe" "$@"
-elif [ -x "${OPENSSL}" -a -x "${HERE}shlib_wrap.sh" ]; then
-       exec "${HERE}shlib_wrap.sh" "${OPENSSL}" "$@"
-else
-       exec "${OPENSSL}" "$@"  # hope for the best...
-fi
diff --git a/lib/libssl/src/util/shlib_wrap.sh b/lib/libssl/src/util/shlib_wrap.sh
deleted file mode 100755 (executable)
index 8775cb5..0000000
+++ /dev/null
@@ -1,97 +0,0 @@
-#!/bin/sh
-
-[ $# -ne 0 ] || set -x         # debug mode without arguments:-)
-
-THERE="`echo $0 | sed -e 's|[^/]*$||' 2>/dev/null`.."
-[ -d "${THERE}" ] || exec "$@" # should never happen...
-
-# Alternative to this is to parse ${THERE}/Makefile...
-LIBCRYPTOSO="${THERE}/libcrypto.so"
-if [ -f "$LIBCRYPTOSO" ]; then
-    while [ -h "$LIBCRYPTOSO" ]; do
-       LIBCRYPTOSO="${THERE}/`ls -l "$LIBCRYPTOSO" | sed -e 's|.*\-> ||'`"
-    done
-    SOSUFFIX=`echo ${LIBCRYPTOSO} | sed -e 's|.*\.so||' 2>/dev/null`
-    LIBSSLSO="${THERE}/libssl.so${SOSUFFIX}"
-fi
-
-SYSNAME=`(uname -s) 2>/dev/null`;
-case "$SYSNAME" in
-SunOS|IRIX*)
-       # SunOS and IRIX run-time linkers evaluate alternative
-       # variables depending on target ABI...
-       rld_var=LD_LIBRARY_PATH
-       case "`(/usr/bin/file "$LIBCRYPTOSO") 2>/dev/null`" in
-       *ELF\ 64*SPARC*|*ELF\ 64*AMD64*)
-               [ -n "$LD_LIBRARY_PATH_64" ] && rld_var=LD_LIBRARY_PATH_64
-               LD_PRELOAD_64="$LIBCRYPTOSO $LIBSSLSO"; export LD_PRELOAD_64
-               preload_var=LD_PRELOAD_64
-               ;;
-       # Why are newly built .so's preloaded anyway? Because run-time
-       # .so lookup path embedded into application takes precedence
-       # over LD_LIBRARY_PATH and as result application ends up linking
-       # to previously installed .so's. On IRIX instead of preloading
-       # newly built .so's we trick run-time linker to fail to find
-       # the installed .so by setting _RLD_ROOT variable.
-       *ELF\ 32*MIPS*)
-               #_RLD_LIST="$LIBCRYPTOSO:$LIBSSLSO:DEFAULT"; export _RLD_LIST
-               _RLD_ROOT=/no/such/dir; export _RLD_ROOT
-               eval $rld_var=\"/usr/lib'${'$rld_var':+:$'$rld_var'}'\"
-               preload_var=_RLD_LIST
-               ;;
-       *ELF\ N32*MIPS*)
-               [ -n "$LD_LIBRARYN32_PATH" ] && rld_var=LD_LIBRARYN32_PATH
-               #_RLDN32_LIST="$LIBCRYPTOSO:$LIBSSLSO:DEFAULT"; export _RLDN32_LIST
-               _RLDN32_ROOT=/no/such/dir; export _RLDN32_ROOT
-               eval $rld_var=\"/usr/lib32'${'$rld_var':+:$'$rld_var'}'\"
-               preload_var=_RLDN32_LIST
-               ;;
-       *ELF\ 64*MIPS*)
-               [ -n "$LD_LIBRARY64_PATH"  ] && rld_var=LD_LIBRARY64_PATH
-               #_RLD64_LIST="$LIBCRYPTOSO:$LIBSSLSO:DEFAULT"; export _RLD64_LIST
-               _RLD64_ROOT=/no/such/dir; export _RLD64_ROOT
-               eval $rld_var=\"/usr/lib64'${'$rld_var':+:$'$rld_var'}'\"
-               preload_var=_RLD64_LIST
-               ;;
-       esac
-       eval $rld_var=\"${THERE}'${'$rld_var':+:$'$rld_var'}'\"; export $rld_var
-       unset rld_var
-       ;;
-*)     LD_LIBRARY_PATH="${THERE}:$LD_LIBRARY_PATH"     # Linux, ELF HP-UX
-       DYLD_LIBRARY_PATH="${THERE}:$DYLD_LIBRARY_PATH" # MacOS X
-       SHLIB_PATH="${THERE}:$SHLIB_PATH"               # legacy HP-UX
-       LIBPATH="${THERE}:$LIBPATH"                     # AIX, OS/2
-       export LD_LIBRARY_PATH DYLD_LIBRARY_PATH SHLIB_PATH LIBPATH
-       # Even though $PATH is adjusted [for Windows sake], it doesn't
-       # necessarily does the trick. Trouble is that with introduction
-       # of SafeDllSearchMode in XP/2003 it's more appropriate to copy
-       # .DLLs in vicinity of executable, which is done elsewhere...
-       if [ "$OSTYPE" != msdosdjgpp ]; then
-               PATH="${THERE}:$PATH"; export PATH
-       fi
-       ;;
-esac
-
-if [ -f "$LIBCRYPTOSO" -a -z "$preload_var" ]; then
-       # Following three lines are major excuse for isolating them into
-       # this wrapper script. Original reason for setting LD_PRELOAD
-       # was to make it possible to pass 'make test' when user linked
-       # with -rpath pointing to previous version installation. Wrapping
-       # it into a script makes it possible to do so on multi-ABI
-       # platforms.
-       case "$SYSNAME" in
-       *BSD|QNX)       LD_PRELOAD="$LIBCRYPTOSO:$LIBSSLSO" ;;  # *BSD, QNX
-       *)      LD_PRELOAD="$LIBCRYPTOSO $LIBSSLSO" ;;  # SunOS, Linux, ELF HP-UX
-       esac
-       _RLD_LIST="$LIBCRYPTOSO:$LIBSSLSO:DEFAULT"      # Tru64, o32 IRIX
-       DYLD_INSERT_LIBRARIES="$LIBCRYPTOSO:$LIBSSLSO"  # MacOS X
-       export LD_PRELOAD _RLD_LIST DYLD_INSERT_LIBRARIES
-fi
-
-cmd="$1${EXE_EXT}"
-shift
-if [ $# -eq 0 ]; then
-       exec "$cmd"     # old sh, such as Tru64 4.x, fails to expand empty "$@"
-else
-       exec "$cmd" "$@"
-fi
diff --git a/lib/libssl/src/util/x86asm.sh b/lib/libssl/src/util/x86asm.sh
deleted file mode 100644 (file)
index d2090a9..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/sh
-
-echo Generating x86 assember
-echo Bignum
-(cd crypto/bn/asm; perl x86.pl cpp > bn86unix.cpp)
-(cd crypto/bn/asm; perl x86.pl win32 > bn-win32.asm)
-
-echo DES
-(cd crypto/des/asm; perl des-586.pl cpp > dx86unix.cpp)
-(cd crypto/des/asm; perl des-586.pl win32 > d-win32.asm)
-
-echo "crypt(3)"
-(cd crypto/des/asm; perl crypt586.pl cpp > yx86unix.cpp)
-(cd crypto/des/asm; perl crypt586.pl win32 > y-win32.asm)
-
-echo Blowfish
-(cd crypto/bf/asm; perl bf-586.pl cpp > bx86unix.cpp)
-(cd crypto/bf/asm; perl bf-586.pl win32 > b-win32.asm)
-
-echo CAST5
-(cd crypto/cast/asm; perl cast-586.pl cpp > cx86unix.cpp)
-(cd crypto/cast/asm; perl cast-586.pl win32 > c-win32.asm)
-
-echo RC4
-(cd crypto/rc4/asm; perl rc4-586.pl cpp > rx86unix.cpp)
-(cd crypto/rc4/asm; perl rc4-586.pl win32 > r4-win32.asm)
-
-echo MD5
-(cd crypto/md5/asm; perl md5-586.pl cpp > mx86unix.cpp)
-(cd crypto/md5/asm; perl md5-586.pl win32 > m5-win32.asm)
-
-echo SHA1
-(cd crypto/sha/asm; perl sha1-586.pl cpp > sx86unix.cpp)
-(cd crypto/sha/asm; perl sha1-586.pl win32 > s1-win32.asm)
-
-echo RIPEMD160
-(cd crypto/ripemd/asm; perl rmd-586.pl cpp > rm86unix.cpp)
-(cd crypto/ripemd/asm; perl rmd-586.pl win32 > rm-win32.asm)
-
-echo RC5/32
-(cd crypto/rc5/asm; perl rc5-586.pl cpp > r586unix.cpp)
-(cd crypto/rc5/asm; perl rc5-586.pl win32 > r5-win32.asm)