mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-12-21 01:55:33 +02:00
68e11bcffb
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@546 3c298f89-4303-0410-b956-a3cf2f4a3e73
181 lines
5.7 KiB
Diff
181 lines
5.7 KiB
Diff
diff -Nur openssl-0.9.7f/Configure openssl-0.9.7f.new/Configure
|
|
--- openssl-0.9.7f/Configure 2005-03-12 12:28:21.000000000 +0100
|
|
+++ openssl-0.9.7f.new/Configure 2005-04-03 20:32:00.000000000 +0200
|
|
@@ -1,4 +1,4 @@
|
|
-:
|
|
+#!/usr/bin/perl
|
|
eval 'exec perl -S $0 ${1+"$@"}'
|
|
if $running_under_some_shell;
|
|
##
|
|
diff -Nur openssl-0.9.7f/include/openssl/opensslconf.h openssl-0.9.7f.new/include/openssl/opensslconf.h
|
|
--- openssl-0.9.7f/include/openssl/opensslconf.h 2005-03-22 20:18:28.000000000 +0100
|
|
+++ openssl-0.9.7f.new/include/openssl/opensslconf.h 2005-04-03 20:38:09.000000000 +0200
|
|
@@ -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
|
|
+#defne 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
|
|
diff -Nur openssl-0.9.7f/ssl/ssl_algs.c openssl-0.9.7f.new/ssl/ssl_algs.c
|
|
--- openssl-0.9.7f/ssl/ssl_algs.c 2001-02-20 09:11:58.000000000 +0100
|
|
+++ openssl-0.9.7f.new/ssl/ssl_algs.c 2005-04-03 20:40:27.000000000 +0200
|
|
@@ -109,3 +109,9 @@
|
|
return(1);
|
|
}
|
|
|
|
+#undef SSLeay_add_ssl_algorithms
|
|
+int SSLeay_add_ssl_algorithms(void)
|
|
+ {
|
|
+ return SSL_library_init();
|
|
+ }
|
|
+
|
|
diff -Nur openssl-0.9.7f/tools/c_rehash.in openssl-0.9.7f.new/tools/c_rehash.in
|
|
--- openssl-0.9.7f/tools/c_rehash.in 2002-10-11 22:35:45.000000000 +0200
|
|
+++ openssl-0.9.7f.new/tools/c_rehash.in 2005-04-03 20:41:17.000000000 +0200
|
|
@@ -1,4 +1,4 @@
|
|
-#!/usr/local/bin/perl
|
|
+#!/usr/bin/perl
|
|
|
|
|
|
# Perl c_rehash script, scan all files in a directory
|
|
diff -Nur openssl-0.9.7f/util/clean-depend.pl openssl-0.9.7f.new/util/clean-depend.pl
|
|
--- openssl-0.9.7f/util/clean-depend.pl 2001-10-10 10:27:28.000000000 +0200
|
|
+++ openssl-0.9.7f.new/util/clean-depend.pl 2005-04-03 20:41:38.000000000 +0200
|
|
@@ -1,4 +1,4 @@
|
|
-#!/usr/local/bin/perl -w
|
|
+#!/usr/bin/perl -w
|
|
# Clean the dependency list in a makefile of standard includes...
|
|
# Written by Ben Laurie <ben@algroup.co.uk> 19 Jan 1999
|
|
|
|
diff -Nur openssl-0.9.7f/util/mkdef.pl openssl-0.9.7f.new/util/mkdef.pl
|
|
--- openssl-0.9.7f/util/mkdef.pl 2005-02-05 18:19:23.000000000 +0100
|
|
+++ openssl-0.9.7f.new/util/mkdef.pl 2005-04-03 20:42:49.000000000 +0200
|
|
@@ -1,4 +1,4 @@
|
|
-#!/usr/local/bin/perl -w
|
|
+#!/usr/bin/perl
|
|
#
|
|
# generate a .def file
|
|
#
|
|
diff -Nur openssl-0.9.7f/util/mkerr.pl openssl-0.9.7f.new/util/mkerr.pl
|
|
--- openssl-0.9.7f/util/mkerr.pl 2005-01-31 02:28:17.000000000 +0100
|
|
+++ openssl-0.9.7f.new/util/mkerr.pl 2005-04-03 20:43:02.000000000 +0200
|
|
@@ -1,4 +1,4 @@
|
|
-#!/usr/local/bin/perl -w
|
|
+#!/usr/bin/perl
|
|
|
|
my $config = "crypto/err/openssl.ec";
|
|
my $debug = 0;
|
|
diff -Nur openssl-0.9.7f/util/mkstack.pl openssl-0.9.7f.new/util/mkstack.pl
|
|
--- openssl-0.9.7f/util/mkstack.pl 2004-10-04 18:27:36.000000000 +0200
|
|
+++ openssl-0.9.7f.new/util/mkstack.pl 2005-04-03 20:43:18.000000000 +0200
|
|
@@ -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
|
|
diff -Nur openssl-0.9.7f/util/pod2man.pl openssl-0.9.7f.new/util/pod2man.pl
|
|
--- openssl-0.9.7f/util/pod2man.pl 2002-05-30 17:30:21.000000000 +0200
|
|
+++ openssl-0.9.7f.new/util/pod2man.pl 2005-04-03 20:43:52.000000000 +0200
|
|
@@ -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;
|
|
|
|
diff -Nur openssl-0.9.7f/util/selftest.pl openssl-0.9.7f.new/util/selftest.pl
|
|
--- openssl-0.9.7f/util/selftest.pl 2004-05-11 14:46:19.000000000 +0200
|
|
+++ openssl-0.9.7f.new/util/selftest.pl 2005-04-03 20:44:10.000000000 +0200
|
|
@@ -1,4 +1,4 @@
|
|
-#!/usr/local/bin/perl -w
|
|
+#!/usr/bin/perl
|
|
#
|
|
# Run the test suite and generate a report
|
|
#
|