/[gentoo-alt]/trunk/prefix/dev-libs/openssl/files/openssl-0.9.7-CAN-2005-2969.patch
Gentoo

Contents of /trunk/prefix/dev-libs/openssl/files/openssl-0.9.7-CAN-2005-2969.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 920 - (show annotations) (download)
Tue Dec 13 20:55:14 2005 UTC (12 years, 9 months ago) by kito
File size: 2173 byte(s)
drop -overlay
1 Index: doc/ssl/SSL_CTX_set_options.pod
2 ===================================================================
3 RCS file: /e/openssl/cvs/openssl/doc/ssl/SSL_CTX_set_options.pod,v
4 retrieving revision 1.9.2.4
5 diff -u -r1.9.2.4 SSL_CTX_set_options.pod
6 --- doc/ssl/SSL_CTX_set_options.pod 22 Mar 2005 17:54:13 -0000 1.9.2.4
7 +++ doc/ssl/SSL_CTX_set_options.pod 23 Sep 2005 03:38:43 -0000
8 @@ -86,7 +86,7 @@
9
10 =item SSL_OP_MSIE_SSLV2_RSA_PADDING
11
12 -...
13 +As of OpenSSL 0.9.7h and 0.9.8a, this option has no effect.
14
15 =item SSL_OP_SSLEAY_080_CLIENT_DH_BUG
16
17 Index: ssl/s23_srvr.c
18 ===================================================================
19 RCS file: /e/openssl/cvs/openssl/ssl/s23_srvr.c,v
20 retrieving revision 1.41.2.6
21 diff -u -r1.41.2.6 s23_srvr.c
22 --- ssl/s23_srvr.c 31 Jan 2005 01:33:35 -0000 1.41.2.6
23 +++ ssl/s23_srvr.c 23 Sep 2005 03:38:44 -0000
24 @@ -268,9 +268,6 @@
25 int n=0,j;
26 int type=0;
27 int v[2];
28 -#ifndef OPENSSL_NO_RSA
29 - int use_sslv2_strong=0;
30 -#endif
31
32 if (s->state == SSL23_ST_SR_CLNT_HELLO_A)
33 {
34 @@ -528,9 +525,7 @@
35 }
36
37 s->state=SSL2_ST_GET_CLIENT_HELLO_A;
38 - if ((s->options & SSL_OP_MSIE_SSLV2_RSA_PADDING) ||
39 - use_sslv2_strong ||
40 - (s->options & SSL_OP_NO_TLSv1 && s->options & SSL_OP_NO_SSLv3))
41 + if (s->options & SSL_OP_NO_TLSv1 && s->options & SSL_OP_NO_SSLv3)
42 s->s2->ssl2_rollback=0;
43 else
44 /* reject SSL 2.0 session if client supports SSL 3.0 or TLS 1.0
45 Index: ssl/ssl.h
46 ===================================================================
47 RCS file: /e/openssl/cvs/openssl/ssl/ssl.h,v
48 retrieving revision 1.126.2.23
49 diff -u -r1.126.2.23 ssl.h
50 --- ssl/ssl.h 10 Jun 2005 20:00:39 -0000 1.126.2.23
51 +++ ssl/ssl.h 23 Sep 2005 03:38:47 -0000
52 @@ -467,7 +467,7 @@
53 #define SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG 0x00000008L
54 #define SSL_OP_SSLREF2_REUSE_CERT_TYPE_BUG 0x00000010L
55 #define SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER 0x00000020L
56 -#define SSL_OP_MSIE_SSLV2_RSA_PADDING 0x00000040L
57 +#define SSL_OP_MSIE_SSLV2_RSA_PADDING 0x00000040L /* no effect since 0.9.7h and 0.9.8b */
58 #define SSL_OP_SSLEAY_080_CLIENT_DH_BUG 0x00000080L
59 #define SSL_OP_TLS_D5_BUG 0x00000100L
60 #define SSL_OP_TLS_BLOCK_PADDING_BUG 0x00000200L

  ViewVC Help
Powered by ViewVC 1.1.20