1
Description: Upstream changes introduced in version 1.7.1.3-1.1
2
This patch has been created by dpkg-source during the package build.
3
Here's the last changelog entry, hopefully it gives details on why
4
those changes were made:
6
socat (1.7.1.3-1.1) unstable; urgency=low
8
* Non-maintainer upload.
9
* Fix build against new openssl (without SSLv2 support), closes: #622018.
11
The person named in the Author field signed this changelog entry.
12
Author: Julien Cristau <jcristau@debian.org>
13
Bug-Debian: http://bugs.debian.org/622018
16
The information above should follow the Patch Tagging Guidelines, please
17
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
18
are templates for supplementary fields that you might want to add:
20
Origin: <vendor|upstream|other>, <url of original patch>
21
Bug: <url in upstream bugtracker>
22
Bug-Debian: http://bugs.debian.org/<bugnumber>
23
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
24
Forwarded: <no|not-needed|url proving that it has been forwarded>
25
Reviewed-By: <name and email of someone who approved the patch>
26
Last-Update: <YYYY-MM-DD>
28
--- socat-1.7.1.3.orig/sslcls.c
29
+++ socat-1.7.1.3/sslcls.c
30
@@ -35,6 +35,7 @@ int sycSSL_library_init(void) {
34
+#ifndef OPENSSL_NO_SSL2
35
SSL_METHOD *sycSSLv2_client_method(void) {
37
Debug("SSLv2_client_method()");
38
@@ -50,6 +51,7 @@ SSL_METHOD *sycSSLv2_server_method(void)
39
Debug1("SSLv2_server_method() -> %p", result);
44
SSL_METHOD *sycSSLv3_client_method(void) {
46
--- socat-1.7.1.3.orig/xio-openssl.c
47
+++ socat-1.7.1.3/xio-openssl.c
48
@@ -667,9 +667,12 @@ int
52
+#ifndef OPENSSL_NO_SSL2
53
if (!strcasecmp(me_str, "SSLv2") || !strcasecmp(me_str, "SSL2")) {
54
method = sycSSLv2_client_method();
55
- } else if (!strcasecmp(me_str, "SSLv3") || !strcasecmp(me_str, "SSL3")) {
58
+ if (!strcasecmp(me_str, "SSLv3") || !strcasecmp(me_str, "SSL3")) {
59
method = sycSSLv3_client_method();
60
} else if (!strcasecmp(me_str, "SSLv23") || !strcasecmp(me_str, "SSL23") ||
61
!strcasecmp(me_str, "SSL")) {
62
@@ -686,9 +689,12 @@ int
66
+#ifndef OPENSSL_NO_SSL2
67
if (!strcasecmp(me_str, "SSLv2") || !strcasecmp(me_str, "SSL2")) {
68
method = sycSSLv2_server_method();
69
- } else if (!strcasecmp(me_str, "SSLv3") || !strcasecmp(me_str, "SSL3")) {
72
+ if (!strcasecmp(me_str, "SSLv3") || !strcasecmp(me_str, "SSL3")) {
73
method = sycSSLv3_server_method();
74
} else if (!strcasecmp(me_str, "SSLv23") || !strcasecmp(me_str, "SSL23") ||
75
!strcasecmp(me_str, "SSL")) {
76
--- socat-1.7.1.3.orig/sslcls.h
77
+++ socat-1.7.1.3/sslcls.h
80
void sycSSL_load_error_strings(void);
81
int sycSSL_library_init(void);
82
+#ifndef OPENSSL_NO_SSL2
83
SSL_METHOD *sycSSLv2_client_method(void);
84
SSL_METHOD *sycSSLv2_server_method(void);
86
SSL_METHOD *sycSSLv3_client_method(void);
87
SSL_METHOD *sycSSLv3_server_method(void);
88
SSL_METHOD *sycSSLv23_client_method(void);