mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-11-24 06:20:16 +02:00
239 lines
12 KiB
Diff
239 lines
12 KiB
Diff
--- openssl-0.9.7.orig/Configure
|
|
+++ openssl-0.9.7/Configure
|
|
@@ -1,4 +1,4 @@
|
|
-:
|
|
+#!/usr/bin/perl
|
|
eval 'exec perl -S $0 ${1+"$@"}'
|
|
if $running_under_some_shell;
|
|
##
|
|
@@ -373,6 +373,40 @@
|
|
# assembler versions -- currently defunct:
|
|
##"OpenBSD-alpha","gcc:-DTERMIOS -O3 -fomit-frame-pointer:::(unknown):SIXTY_FOUR_BIT_LONG DES_INT DES_PTR DES_RISC2:${alpha_asm}",
|
|
|
|
+# Sane Linux configuration values, stolen from the Debian package....
|
|
+"linux-alpha","gcc:-DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL:${alpha_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
|
|
+"linux-alpha-ev4","gcc:-DTERMIO -O3 -mcpu=ev4 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL:${alpha_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
|
|
+"linux-alpha-ev5","gcc:-DTERMIO -O3 -mcpu=ev5 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL:${alpha_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
|
|
+"linux-arm","gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
|
|
+"linux-freebsd-alpha","gcc:-DTERMIOS -O -fomit-frame-pointer::(unknown):::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_PTR DES_RISC2::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
|
|
+"linux-freebsd-i386", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::-pthread -D_REENTRANT -D_THREAD_SAFE -D_THREADSAFE:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
|
|
+"linux-hppa","gcc:-DB_ENDIAN -DTERMIO -O2 -Wall::-D_REENTRANT::-ldl:BN_LLONG MD2_CHAR RC4_INDEX::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
|
|
+"linux-hurd-i386","gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -m486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
|
|
+"linux-ia64","gcc:-DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR:asm/ia64.o:::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
|
|
+#"linux-i386","gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -m486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::dlfcn:linux-shared:-fPIC",
|
|
+"linux-i386","gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
|
|
+"linux-i386-i486","gcc:-DL_ENDIAN -DTERMIO -O3 -march=i486 -mcpu=i486 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
|
|
+"linux-i386-i586","gcc:-DL_ENDIAN -DTERMIO -O3 -march=i586 -mcpu=i586 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
|
|
+"linux-i386-i686/cmov","gcc:-DL_ENDIAN -DTERMIO -O3 -march=i686 -mcpu=i686 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
|
|
+"linux-m68k","gcc:-DB_ENDIAN -DTERMIO -O2 -Wall::-D_REENTRANT::-ldl:BN_LLONG MD2_CHAR RC4_INDEX::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
|
|
+"linux-mips", "gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
|
|
+"linux-mipsel", "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
|
|
+"linux-netbsd-i386", "gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -m486 -Wall::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
|
|
+"linux-netbsd-m68k", "gcc:-DB_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -Wall::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
|
|
+"linux-netbsd-sparc", "gcc:-DB_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -mv8 -Wall::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
|
|
+"linux-openbsd-alpha","gcc:-DTERMIOS -O3 -fomit-frame-pointer::(unknown):::SIXTY_FOUR_BIT_LONG DES_INT DES_PTR DES_RISC2::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
|
|
+"linux-openbsd-i386", "gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -m486::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
|
|
+"linux-openbsd-mips","gcc:-O2 -DL_ENDIAN::(unknown)::BN_LLONG MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC2 DES_PTR BF_PTR:::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
|
|
+"linux-powerpc","gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_UNROLL DES_RISC2 DES_PTR MD2_CHAR RC4_INDEX::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
|
|
+"linux-s390","gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
|
|
+"linux-sh3", "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
|
|
+"linux-sh4", "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
|
|
+"linux-sh3eb", "gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
|
|
+"linux-sh4eb", "gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
|
|
+"linux-sparc","gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
|
|
+"linux-sparc-v8","gcc:-DB_ENDIAN -DTERMIO -O3 -mcpu=v8 -fomit-frame-pointer -Wall -DBN_DIV2W::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8.o:::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
|
|
+"linux-sparc-v9","gcc:-DB_ENDIAN -DTERMIO -O3 -mcpu=v9 -Wa,-Av8plus -fomit-frame-pointer -Wall -DULTRASPARC -DBN_DIV2W::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8plus.o:::asm/md5-sparcv8plus.o::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
|
|
+"linux-cris", "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fpic::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
|
|
# The intel boxes :-), It would be worth seeing if bsdi-gcc can use the
|
|
# bn86-elf.o file file since it is hand tweaked assembler.
|
|
"linux-elf", "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -m486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
|
|
--- openssl-0.9.7.orig/crypto/md5/asm/md5-sparcv9.S
|
|
+++ openssl-0.9.7/crypto/md5/asm/md5-sparcv9.S
|
|
@@ -72,14 +72,14 @@
|
|
#define Dval R8
|
|
|
|
#if defined(MD5_BLOCK_DATA_ORDER)
|
|
-# if defined(OPENSSL_SYSNAME_ULTRASPARC)
|
|
+/*# if defined(OPENSSL_SYSNAME_ULTRASPARC)*/
|
|
# define LOAD lda
|
|
# define X(i) [%i1+i*4]%asi
|
|
# define md5_block md5_block_asm_data_order_aligned
|
|
# define ASI_PRIMARY_LITTLE 0x88
|
|
-# else
|
|
+/*# else
|
|
# error "MD5_BLOCK_DATA_ORDER is supported only on UltraSPARC!"
|
|
-# endif
|
|
+# endif*/
|
|
#else
|
|
# define LOAD ld
|
|
# define X(i) [%i1+i*4]
|
|
--- openssl-0.9.7.orig/crypto/opensslconf.h
|
|
+++ openssl-0.9.7/crypto/opensslconf.h
|
|
@@ -4,17 +4,38 @@
|
|
/* OpenSSL was configured with the following options: */
|
|
#ifndef OPENSSL_DOING_MAKEDEPEND
|
|
|
|
+#ifndef OPENSSL_NO_IDEA
|
|
+# define OPENSSL_NO_IDEA
|
|
+#endif
|
|
+#ifndef OPENSSL_NO_MDC2
|
|
+# define OPENSSL_NO_MDC2
|
|
+#endif
|
|
+#ifndef OPENSSL_NO_RC5
|
|
+# define OPENSSL_NO_RC5
|
|
+#endif
|
|
#ifndef OPENSSL_NO_KRB5
|
|
# define OPENSSL_NO_KRB5
|
|
#endif
|
|
|
|
#endif /* OPENSSL_DOING_MAKEDEPEND */
|
|
+#ifndef OPENSSL_THREADS
|
|
+# define OPENSSL_THREADS
|
|
+#endif
|
|
|
|
/* The OPENSSL_NO_* macros are also defined as NO_* if the application
|
|
asks for it. This is a transient feature that is provided for those
|
|
who haven't had the time to do the appropriate changes in their
|
|
applications. */
|
|
#ifdef OPENSSL_ALGORITHM_DEFINES
|
|
+# if defined(OPENSSL_NO_IDEA) && !defined(NO_IDEA)
|
|
+# define NO_IDEA
|
|
+# endif
|
|
+# if defined(OPENSSL_NO_MDC2) && !defined(NO_MDC2)
|
|
+# define NO_MDC2
|
|
+# endif
|
|
+# if defined(OPENSSL_NO_RC5) && !defined(NO_RC5)
|
|
+# define NO_RC5
|
|
+# endif
|
|
# if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5)
|
|
# define NO_KRB5
|
|
# endif
|
|
@@ -27,7 +48,7 @@
|
|
|
|
#if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */
|
|
#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
|
|
-#define OPENSSLDIR "/usr/local/ssl"
|
|
+#define OPENSSLDIR "/usr/lib/ssl"
|
|
#endif
|
|
#endif
|
|
|
|
@@ -79,7 +100,7 @@
|
|
|
|
#if defined(HEADER_BN_H) && !defined(CONFIG_HEADER_BN_H)
|
|
#define CONFIG_HEADER_BN_H
|
|
-#undef BN_LLONG
|
|
+#define BN_LLONG
|
|
|
|
/* Should we define BN_DIV2W here? */
|
|
|
|
@@ -98,7 +119,7 @@
|
|
#define CONFIG_HEADER_RC4_LOCL_H
|
|
/* if this is defined data[i] is used instead of *data, this is a %20
|
|
* speedup on x86 */
|
|
-#undef RC4_INDEX
|
|
+#define RC4_INDEX
|
|
#endif
|
|
|
|
#if defined(HEADER_BF_LOCL_H) && !defined(CONFIG_HEADER_BF_LOCL_H)
|
|
@@ -112,14 +133,14 @@
|
|
/* the following is tweaked from a config script, that is why it is a
|
|
* protected undef/define */
|
|
#ifndef DES_PTR
|
|
-#undef DES_PTR
|
|
+#define DES_PTR
|
|
#endif
|
|
|
|
/* This helps C compiler generate the correct code for multiple functional
|
|
* units. It reduces register dependancies at the expense of 2 more
|
|
* registers */
|
|
#ifndef DES_RISC1
|
|
-#undef DES_RISC1
|
|
+#define DES_RISC1
|
|
#endif
|
|
|
|
#ifndef DES_RISC2
|
|
@@ -133,7 +154,7 @@
|
|
/* Unroll the inner loop, this sometimes helps, sometimes hinders.
|
|
* Very mucy CPU dependant */
|
|
#ifndef DES_UNROLL
|
|
-#undef DES_UNROLL
|
|
+#define DES_UNROLL
|
|
#endif
|
|
|
|
/* These default values were supplied by
|
|
--- openssl-0.9.7.orig/ssl/ssl_algs.c
|
|
+++ openssl-0.9.7/ssl/ssl_algs.c
|
|
@@ -109,3 +109,8 @@
|
|
return(1);
|
|
}
|
|
|
|
+#undef SSLeay_add_ssl_algorithms
|
|
+int SSLeay_add_ssl_algorithms(void)
|
|
+ {
|
|
+ return SSL_library_init();
|
|
+ }
|
|
--- openssl-0.9.7.orig/tools/c_rehash.in
|
|
+++ openssl-0.9.7/tools/c_rehash.in
|
|
@@ -1,4 +1,4 @@
|
|
-#!/usr/local/bin/perl
|
|
+#!/usr/bin/perl
|
|
|
|
|
|
# Perl c_rehash script, scan all files in a directory
|
|
--- openssl-0.9.7.orig/util/clean-depend.pl
|
|
+++ openssl-0.9.7/util/clean-depend.pl
|
|
@@ -1,4 +1,4 @@
|
|
-#!/usr/local/bin/perl -w
|
|
+#!/usr/bin/perl
|
|
# Clean the dependency list in a makefile of standard includes...
|
|
# Written by Ben Laurie <ben@algroup.co.uk> 19 Jan 1999
|
|
|
|
--- openssl-0.9.7.orig/util/extract-names.pl
|
|
+++ openssl-0.9.7/util/extract-names.pl
|
|
@@ -1,4 +1,4 @@
|
|
-#!/usr/bin/perl
|
|
+#!/usr/bin/perl
|
|
|
|
$/ = ""; # Eat a paragraph at once.
|
|
while(<STDIN>) {
|
|
--- openssl-0.9.7.orig/util/mkdef.pl
|
|
+++ openssl-0.9.7/util/mkdef.pl
|
|
@@ -1,4 +1,4 @@
|
|
-#!/usr/local/bin/perl -w
|
|
+#!/usr/bin/perl
|
|
#
|
|
# generate a .def file
|
|
#
|
|
--- openssl-0.9.7.orig/util/mkerr.pl
|
|
+++ openssl-0.9.7/util/mkerr.pl
|
|
@@ -1,4 +1,4 @@
|
|
-#!/usr/local/bin/perl -w
|
|
+#!/usr/bin/perl
|
|
|
|
my $config = "crypto/err/openssl.ec";
|
|
my $debug = 0;
|
|
--- openssl-0.9.7.orig/util/mkstack.pl
|
|
+++ openssl-0.9.7/util/mkstack.pl
|
|
@@ -1,4 +1,4 @@
|
|
-#!/usr/local/bin/perl -w
|
|
+#!/usr/bin/perl
|
|
|
|
# This is a utility that searches out "DECLARE_STACK_OF()"
|
|
# declarations in .h and .c files, and updates/creates/replaces
|
|
--- openssl-0.9.7.orig/util/pod2man.pl
|
|
+++ openssl-0.9.7/util/pod2man.pl
|
|
@@ -1,4 +1,4 @@
|
|
-: #!/usr/bin/perl-5.005
|
|
+#!/usr/bin/perl
|
|
eval 'exec /usr/bin/perl -S $0 ${1+"$@"}'
|
|
if $running_under_some_shell;
|
|
|
|
--- openssl-0.9.7.orig/util/selftest.pl
|
|
+++ openssl-0.9.7/util/selftest.pl
|
|
@@ -1,4 +1,4 @@
|
|
-#!/usr/local/bin/perl -w
|
|
+#!/usr/bin/perl
|
|
#
|
|
# Run the test suite and generate a report
|
|
#
|