Update to 0.9.8g
Remove all patches as they are obsolete.
This commit is contained in:
Tom G. Christensen
tgc
@@ -1,11 +0,0 @@
|
||||
--- openssl-0.9.6k/Configure.orig 2003-10-02 10:59:28.409538000 +0200
|
||||
+++ openssl-0.9.6k/Configure 2003-10-02 11:01:48.521291000 +0200
|
||||
@@ -1006,7 +1006,7 @@
|
||||
elsif ($shared_extension ne "" && $shared_extension =~ /^\.s([ol])\.[^\.]*\.[^\.]*$/)
|
||||
{
|
||||
my $sotmp = $1;
|
||||
- s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.s$sotmp.\$(SHLIB_MAJOR) .s$sotmp/;
|
||||
+ s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.s$sotmp.\$(SHLIB_SOVER) .s$sotmp/;
|
||||
}
|
||||
elsif ($shared_extension ne "" && $shared_extension =~ /^\.[^\.]*\.[^\.]*\.dylib$/)
|
||||
{
|
||||
@@ -1,21 +0,0 @@
|
||||
--- openssl-0.9.6k/Makefile.org.orig 2003-10-15 14:32:32.535403000 +0200
|
||||
+++ openssl-0.9.6k/Makefile.org 2003-10-15 15:06:34.108563000 +0200
|
||||
@@ -10,6 +10,7 @@
|
||||
SHLIB_MAJOR=
|
||||
SHLIB_MINOR=
|
||||
SHLIB_EXT=
|
||||
+SHLIB_SOVER=
|
||||
PLATFORM=dist
|
||||
OPTIONS=
|
||||
CONFIGURE_ARGS=
|
||||
@@ -351,8 +352,9 @@
|
||||
libs='-L. ${SHLIBDEPS}'; for i in ${SHLIBDIRS}; do \
|
||||
( PATH=/usr/ccs/bin:$$PATH ; export PATH; \
|
||||
set -x; ${CC} ${SHARED_LDFLAGS} \
|
||||
+ -R${INSTALLTOP}/lib \
|
||||
-G -o lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \
|
||||
- -h lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \
|
||||
+ -h lib$$i.so.${SHLIB_SOVER} \
|
||||
-z allextract lib$$i.a $$libs ${EX_LIBS} -lc ) || exit 1; \
|
||||
libs="$$libs -l$$i"; \
|
||||
done; \
|
||||
@@ -1,11 +0,0 @@
|
||||
--- openssl-0.9.7c/Configure.orig 2003-12-27 20:24:05.940000000 +0100
|
||||
+++ openssl-0.9.7c/Configure 2003-12-27 20:25:42.690000000 +0100
|
||||
@@ -1259,7 +1259,7 @@
|
||||
elsif ($shared_extension ne "" && $shared_extension =~ /^\.s([ol])\.[^\.]*\.[^\.]*$/)
|
||||
{
|
||||
my $sotmp = $1;
|
||||
- s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.s$sotmp.\$(SHLIB_MAJOR) .s$sotmp/;
|
||||
+ s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.s$sotmp/;
|
||||
}
|
||||
elsif ($shared_extension ne "" && $shared_extension =~ /^\.[^\.]*\.[^\.]*\.dylib$/)
|
||||
{
|
||||
@@ -1,19 +0,0 @@
|
||||
diff -ur -x CVS openssl7/ssl/s3_pkt.c ossl7/ssl/s3_pkt.c
|
||||
--- openssl7/ssl/s3_pkt.c 2003-02-19 12:04:16.000000000 +0000
|
||||
+++ ossl7/ssl/s3_pkt.c 2004-02-02 01:10:12.000000000 +0000
|
||||
@@ -1085,6 +1085,14 @@
|
||||
goto err;
|
||||
}
|
||||
|
||||
+ /* Check we have a cipher to change to */
|
||||
+ if (s->s3->tmp.new_cipher == NULL)
|
||||
+ {
|
||||
+ i=SSL_AD_UNEXPECTED_MESSAGE;
|
||||
+ SSLerr(SSL_F_SSL3_GET_CERT_VERIFY,SSL_R_CCS_RECEIVED_EARLY);
|
||||
+ goto err;
|
||||
+ }
|
||||
+
|
||||
rr->length=0;
|
||||
|
||||
if (s->msg_callback)
|
||||
|
||||
@@ -1,32 +0,0 @@
|
||||
diff -ur -x CVS openssl7/ssl/s3_srvr.c ossl7/ssl/s3_srvr.c
|
||||
--- openssl7/ssl/s3_srvr.c 2004-01-14 23:02:49.000000000 +0000
|
||||
+++ ossl7/ssl/s3_srvr.c 2004-02-19 13:22:16.000000000 +0000
|
||||
@@ -1588,11 +1591,27 @@
|
||||
|
||||
n2s(p,i);
|
||||
enc_ticket.length = i;
|
||||
+
|
||||
+ if (n < enc_ticket.length + 6)
|
||||
+ {
|
||||
+ SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,
|
||||
+ SSL_R_DATA_LENGTH_TOO_LONG);
|
||||
+ goto err;
|
||||
+ }
|
||||
+
|
||||
enc_ticket.data = (char *)p;
|
||||
p+=enc_ticket.length;
|
||||
|
||||
n2s(p,i);
|
||||
authenticator.length = i;
|
||||
+
|
||||
+ if (n < enc_ticket.length + authenticator.length + 6)
|
||||
+ {
|
||||
+ SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,
|
||||
+ SSL_R_DATA_LENGTH_TOO_LONG);
|
||||
+ goto err;
|
||||
+ }
|
||||
+
|
||||
authenticator.data = (char *)p;
|
||||
p+=authenticator.length;
|
||||
|
||||
|
||||
@@ -1,11 +0,0 @@
|
||||
--- openssl-0.9.7c/doc/crypto/EVP_BytesToKey.pod.orig 2003-12-28 01:17:33.560000000 +0100
|
||||
+++ openssl-0.9.7c/doc/crypto/EVP_BytesToKey.pod 2003-12-28 01:17:42.310000000 +0100
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
=head1 NAME
|
||||
|
||||
- EVP_BytesToKey - password based encryption routine
|
||||
+EVP_BytesToKey - password based encryption routine
|
||||
|
||||
=head1 SYNOPSIS
|
||||
|
||||
@@ -1,10 +0,0 @@
|
||||
--- openssl-0.9.7c/Makefile.org.origc 2004-01-06 15:20:40.890005000 +0100
|
||||
+++ openssl-0.9.7c/Makefile.org 2004-01-06 15:22:02.059996000 +0100
|
||||
@@ -390,6 +390,7 @@
|
||||
MINUSZ='-z '; \
|
||||
(${CC} -v 2>&1 | grep gcc) > /dev/null && MINUSZ='-Wl,-z,'; \
|
||||
set -x; ${CC} ${SHARED_LDFLAGS} -G -dy -z text \
|
||||
+ -Wl,-R,@LIBDIR@ \
|
||||
-o lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \
|
||||
-h lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \
|
||||
$${MINUSZ}allextract lib$$i.a $${MINUSZ}defaultextract \
|
||||
@@ -1,10 +0,0 @@
|
||||
--- openssl-0.9.7k/Makefile.org.shlib 2006-09-08 10:57:26.078030000 +0200
|
||||
+++ openssl-0.9.7k/Makefile.org 2006-09-08 10:58:33.888821000 +0200
|
||||
@@ -432,6 +432,7 @@
|
||||
MINUSZ='-z '; \
|
||||
(${CC} -v 2>&1 | grep gcc) > /dev/null && MINUSZ='-Wl,-z,'; \
|
||||
set -x; $${FIPSLD:-${CC}} ${SHARED_LDFLAGS} \
|
||||
+ -Wl,-R,@LIBDIR@ \
|
||||
-o lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \
|
||||
-h lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \
|
||||
-Wl,-Bsymbolic \
|
||||
Reference in New Issue
Block a user