diff options
| -rwxr-xr-x | Configure | 37 | ||||
| -rw-r--r-- | INSTALL | 5 | ||||
| -rw-r--r-- | crypto/bf/Makefile.ssl | 2 | ||||
| -rw-r--r-- | crypto/bn/Makefile.ssl | 2 | ||||
| -rw-r--r-- | crypto/cast/Makefile.ssl | 2 | ||||
| -rw-r--r-- | crypto/des/Makefile.ssl | 2 | ||||
| -rw-r--r-- | crypto/md5/Makefile.ssl | 2 | ||||
| -rw-r--r-- | crypto/md5/md5_locl.h | 1 | ||||
| -rw-r--r-- | crypto/rc4/Makefile.ssl | 2 | ||||
| -rw-r--r-- | crypto/rc5/Makefile.ssl | 2 | ||||
| -rw-r--r-- | crypto/ripemd/Makefile.ssl | 2 | ||||
| -rw-r--r-- | crypto/sha/Makefile.ssl | 2 |
12 files changed, 52 insertions, 9 deletions
@@ -367,6 +367,14 @@ foreach (@ARGV) $options .= $_ unless $_ eq $target; } +if ($target eq "TABLE") { + foreach $target (sort keys %table) { + print_table_entry($target); + } + print "\n"; + exit 0; +} + &usage if (!defined($table{$target})); my $IsWindows=scalar grep /^$target$/,@WinTargets; @@ -757,3 +765,32 @@ sub dofile rename($f,"$ff.bak") || die "unable to rename $f\n" if -e $f; rename("$ff.new",$f) || die "unable to rename $ff.new\n"; } + +sub print_table_entry + { + my $target = shift; + + (my $cc,my $cflags,my $thread_cflag,my $lflags,my $bn_ops, + my $bn_obj,my $des_obj,my $bf_obj, + $md5_obj,$sha1_obj,my $cast_obj,my $rc4_obj,$rmd160_obj,my $rc5_obj)= + split(/\s*:\s*/,$table{$target} . ":" x 20 , -1); + + print <<EOF + +*** $target +\$cc = $cc +\$cflags = $cflags +\$thread_cflag = $thread_cflag +\$lflags = $lflags +\$bn_ops = $bn_ops +\$bn_obj = $bn_obj +\$des_obj = $des_obj +\$bf_obj = $bf_obj +\$md5_obj = $md5_obj +\$sha1_obj = $sha1_obj +\$cast_obj = $cast_obj +\$rc4_obj = $rc4_obj +\$rmd160_obj = $rmd160_obj +\$rc5_obj = $rc5_obj +EOF + } @@ -119,6 +119,11 @@ Include the output of "./config -t" and the OpenSSL version number in your message. + [If you encounter assembler error messages, try the "no-asm" + configuration option as an immediate fix. Note that on Solaris x86 + (not on Sparcs!) you may have to install the GNU assembler to use + OpenSSL assembler code -- /usr/ccs/bin/as won't do.] + 3. After a successful build, the libraries should be tested. Run: $ make test diff --git a/crypto/bf/Makefile.ssl b/crypto/bf/Makefile.ssl index f23fb54494..18bddda0db 100644 --- a/crypto/bf/Makefile.ssl +++ b/crypto/bf/Makefile.ssl @@ -100,7 +100,7 @@ dclean: mv -f Makefile.new $(MAKEFILE) clean: - rm -f *.o asm/*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff + rm -f asm/bx86unix.cpp *.o asm/*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff # DO NOT DELETE THIS LINE -- make depend depends on it. diff --git a/crypto/bn/Makefile.ssl b/crypto/bn/Makefile.ssl index b27b912a49..e42f088c03 100644 --- a/crypto/bn/Makefile.ssl +++ b/crypto/bn/Makefile.ssl @@ -156,7 +156,7 @@ dclean: mv -f Makefile.new $(MAKEFILE) clean: - rm -f *.o */*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff bn_asm.s + rm -f asm/co86unix.cpp asm/bn86unix.cpp *.o */*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff bn_asm.s # DO NOT DELETE THIS LINE -- make depend depends on it. diff --git a/crypto/cast/Makefile.ssl b/crypto/cast/Makefile.ssl index 4c3256b0d1..4e4b543a60 100644 --- a/crypto/cast/Makefile.ssl +++ b/crypto/cast/Makefile.ssl @@ -103,7 +103,7 @@ dclean: mv -f Makefile.new $(MAKEFILE) clean: - rm -f *.o asm/*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff + rm -f asm/cx86unix.cpp *.o asm/*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff # DO NOT DELETE THIS LINE -- make depend depends on it. diff --git a/crypto/des/Makefile.ssl b/crypto/des/Makefile.ssl index c0d49c8adc..e9300e70c0 100644 --- a/crypto/des/Makefile.ssl +++ b/crypto/des/Makefile.ssl @@ -132,7 +132,7 @@ dclean: mv -f Makefile.new $(MAKEFILE) clean: - rm -f *.o asm/*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff + rm -f asm/dx86unix.cpp asm/yx86unix.cpp *.o asm/*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff # DO NOT DELETE THIS LINE -- make depend depends on it. diff --git a/crypto/md5/Makefile.ssl b/crypto/md5/Makefile.ssl index b9e658feac..3db39ae422 100644 --- a/crypto/md5/Makefile.ssl +++ b/crypto/md5/Makefile.ssl @@ -109,7 +109,7 @@ dclean: mv -f Makefile.new $(MAKEFILE) clean: - rm -f *.o asm/*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff + rm -f asm/mx86unix.cpp *.o asm/*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff # DO NOT DELETE THIS LINE -- make depend depends on it. diff --git a/crypto/md5/md5_locl.h b/crypto/md5/md5_locl.h index cc96bf50d5..222639788f 100644 --- a/crypto/md5/md5_locl.h +++ b/crypto/md5/md5_locl.h @@ -58,6 +58,7 @@ #include <stdlib.h> #include <string.h> +#include <openssl/opensslconf.h> #include <openssl/md5.h> #ifndef MD5_LONG_LOG2 diff --git a/crypto/rc4/Makefile.ssl b/crypto/rc4/Makefile.ssl index 0c6637e63a..64092fd4f1 100644 --- a/crypto/rc4/Makefile.ssl +++ b/crypto/rc4/Makefile.ssl @@ -102,7 +102,7 @@ dclean: mv -f Makefile.new $(MAKEFILE) clean: - rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff asm/*.o + rm -f asm/rx86unix.cpp *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff asm/*.o # DO NOT DELETE THIS LINE -- make depend depends on it. diff --git a/crypto/rc5/Makefile.ssl b/crypto/rc5/Makefile.ssl index d0161d13ce..666c4b6539 100644 --- a/crypto/rc5/Makefile.ssl +++ b/crypto/rc5/Makefile.ssl @@ -100,7 +100,7 @@ dclean: mv -f Makefile.new $(MAKEFILE) clean: - rm -f *.o asm/*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff + rm -f asm/r586unix.cpp *.o asm/*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff # DO NOT DELETE THIS LINE -- make depend depends on it. diff --git a/crypto/ripemd/Makefile.ssl b/crypto/ripemd/Makefile.ssl index 5997402ca6..b7cd25f123 100644 --- a/crypto/ripemd/Makefile.ssl +++ b/crypto/ripemd/Makefile.ssl @@ -98,7 +98,7 @@ dclean: mv -f Makefile.new $(MAKEFILE) clean: - rm -f *.o asm/*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff + rm -f asm/rm86unix.cpp *.o asm/*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff # DO NOT DELETE THIS LINE -- make depend depends on it. diff --git a/crypto/sha/Makefile.ssl b/crypto/sha/Makefile.ssl index 1477a53089..cf53ca4db6 100644 --- a/crypto/sha/Makefile.ssl +++ b/crypto/sha/Makefile.ssl @@ -97,7 +97,7 @@ dclean: mv -f Makefile.new $(MAKEFILE) clean: - rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff asm/*.o + rm -f asm/sx86unix.cpp *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff asm/*.o # DO NOT DELETE THIS LINE -- make depend depends on it. |