Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 573352 | Differences between
and this patch

Collapse All | Expand All

(-)a/configure.ac (+1 lines)
Lines 803-808 Link Here
803
803
804
case "$LIBS" in *-lssl*)
804
case "$LIBS" in *-lssl*)
805
	AC_CHECK_DECLS([SSLv2_client_method],,,[#include <openssl/ssl.h>])
805
	AC_CHECK_DECLS([SSLv2_client_method],,,[#include <openssl/ssl.h>])
806
	AC_CHECK_DECLS([SSLv3_client_method],,,[#include <openssl/ssl.h>])
806
	;;
807
	;;
807
esac
808
esac
808
809
(-)a/po/de.po (-9 / +13 lines)
Lines 8-15 Link Here
8
msgstr ""
8
msgstr ""
9
"Project-Id-Version: fetchmail 6.3.26\n"
9
"Project-Id-Version: fetchmail 6.3.26\n"
10
"Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
10
"Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
11
"POT-Creation-Date: 2013-04-23 23:24+0200\n"
11
"POT-Creation-Date: 2015-01-16 20:42+0100\n"
12
"PO-Revision-Date: 2013-04-23 23:33+0200\n"
12
"PO-Revision-Date: 2016-01-30 00:23-0500\n"
13
"Last-Translator: Matthias Andree <matthias.andree@gmx.de>\n"
13
"Last-Translator: Matthias Andree <matthias.andree@gmx.de>\n"
14
"Language-Team: Deutsch <de@li.org>\n"
14
"Language-Team: Deutsch <de@li.org>\n"
15
"Language: \n"
15
"Language: \n"
Lines 3198-3217 Link Here
3198
msgstr "Datei-Deskriptor außerhalb des Bereichs für SSL"
3198
msgstr "Datei-Deskriptor außerhalb des Bereichs für SSL"
3199
3199
3200
#: socket.c:913
3200
#: socket.c:913
3201
msgid "Your operating system does not support SSLv2.\n"
3201
msgid "Your OpenSSL version does not support SSLv2.\n"
3202
msgstr "Ihr Betriebssystem unterstützt SSLv2 nicht.\n"
3202
msgstr "Ihre OpenSSL-Version unterstützt SSLv2 nicht.\n"
3203
3203
3204
#: socket.c:923
3204
#: socket.c:920
3205
msgid "Your OpenSSL version does not support SSLv3.\n"
3206
msgstr "Ihre OpenSSL-Version unterstützt SSLv3 nicht.\n"
3207
3208
#: socket.c:928
3205
#, c-format
3209
#, c-format
3206
msgid "Invalid SSL protocol '%s' specified, using default (SSLv23).\n"
3210
msgid "Invalid SSL protocol '%s' specified, using default (SSLv23).\n"
3207
msgstr ""
3211
msgstr ""
3208
"Ungültiges SSL-Protokoll „%s“ angegeben, benutze Voreinstellung (SSLv23).\n"
3212
"Ungültiges SSL-Protokoll „%s“ angegeben, benutze Voreinstellung (SSLv23).\n"
3209
3213
3210
#: socket.c:1022
3214
#: socket.c:1027
3211
msgid "Certificate/fingerprint verification was somehow skipped!\n"
3215
msgid "Certificate/fingerprint verification was somehow skipped!\n"
3212
msgstr "Zertifikat-/Fingerabdruck-Überprüfung wurde irgendwie übersprungen!\n"
3216
msgstr "Zertifikat-/Fingerabdruck-Überprüfung wurde irgendwie übersprungen!\n"
3213
3217
3214
#: socket.c:1039
3218
#: socket.c:1044
3215
msgid ""
3219
msgid ""
3216
"Warning: the connection is insecure, continuing anyways. (Better use --"
3220
"Warning: the connection is insecure, continuing anyways. (Better use --"
3217
"sslcertck!)\n"
3221
"sslcertck!)\n"
Lines 3219-3229 Link Here
3219
"Warnung: Die Verbindung ist unsicher, mache trotzdem weiter. (Nehmen Sie "
3223
"Warnung: Die Verbindung ist unsicher, mache trotzdem weiter. (Nehmen Sie "
3220
"lieber --sslcertck!)\n"
3224
"lieber --sslcertck!)\n"
3221
3225
3222
#: socket.c:1081
3226
#: socket.c:1086
3223
msgid "Cygwin socket read retry\n"
3227
msgid "Cygwin socket read retry\n"
3224
msgstr "Cygwin-Socket-Lese-Wiederholung\n"
3228
msgstr "Cygwin-Socket-Lese-Wiederholung\n"
3225
3229
3226
#: socket.c:1084
3230
#: socket.c:1089
3227
msgid "Cygwin socket read retry failed!\n"
3231
msgid "Cygwin socket read retry failed!\n"
3228
msgstr "Cygwin-Socket-Lese-Wiederholung fehlgeschlagen!\n"
3232
msgstr "Cygwin-Socket-Lese-Wiederholung fehlgeschlagen!\n"
3229
3233
(-)a/fetchmail.c (+10 lines)
Lines 54-59 Link Here
54
#define ENETUNREACH   128       /* Interactive doesn't know this */
54
#define ENETUNREACH   128       /* Interactive doesn't know this */
55
#endif /* ENETUNREACH */
55
#endif /* ENETUNREACH */
56
56
57
#ifdef SSL_ENABLE
58
#include <openssl/ssl.h>	/* for OPENSSL_NO_SSL2 and ..._SSL3 checks */
59
#endif
60
57
/* prototypes for internal functions */
61
/* prototypes for internal functions */
58
static int load_params(int, char **, int);
62
static int load_params(int, char **, int);
59
static void dump_params (struct runctl *runp, struct query *, flag implicit);
63
static void dump_params (struct runctl *runp, struct query *, flag implicit);
Lines 263-268 Link Here
263
#ifdef SSL_ENABLE
267
#ifdef SSL_ENABLE
264
	"+SSL"
268
	"+SSL"
265
#endif
269
#endif
270
#if HAVE_DECL_SSLV2_CLIENT_METHOD + 0 == 0
271
	"-SSLv2"
272
#endif
273
#if HAVE_DECL_SSLV3_CLIENT_METHOD + 0 == 0
274
	"-SSLv3"
275
#endif
266
#ifdef OPIE_ENABLE
276
#ifdef OPIE_ENABLE
267
	"+OPIE"
277
	"+OPIE"
268
#endif /* OPIE_ENABLE */
278
#endif /* OPIE_ENABLE */
(-)a/socket.c (-2 / +7 lines)
Lines 907-920 Link Here
907
	_ssl_context[sock] = NULL;
907
	_ssl_context[sock] = NULL;
908
	if(myproto) {
908
	if(myproto) {
909
		if(!strcasecmp("ssl2",myproto)) {
909
		if(!strcasecmp("ssl2",myproto)) {
910
#if HAVE_DECL_SSLV2_CLIENT_METHOD + 0 > 0
910
#if (HAVE_DECL_SSLV2_CLIENT_METHOD + 0 > 0) && (0 == OPENSSL_NO_SSL2 + 0)
911
			_ctx[sock] = SSL_CTX_new(SSLv2_client_method());
911
			_ctx[sock] = SSL_CTX_new(SSLv2_client_method());
912
#else
912
#else
913
			report(stderr, GT_("Your operating system does not support SSLv2.\n"));
913
			report(stderr, GT_("Your OpenSSL version does not support SSLv2.\n"));
914
			return -1;
914
			return -1;
915
#endif
915
#endif
916
		} else if(!strcasecmp("ssl3",myproto)) {
916
		} else if(!strcasecmp("ssl3",myproto)) {
917
#if (HAVE_DECL_SSLV3_CLIENT_METHOD + 0 > 0) && (0 == OPENSSL_NO_SSL3 + 0)
917
			_ctx[sock] = SSL_CTX_new(SSLv3_client_method());
918
			_ctx[sock] = SSL_CTX_new(SSLv3_client_method());
919
#else
920
			report(stderr, GT_("Your OpenSSL version does not support SSLv3.\n"));
921
			return -1;
922
#endif
918
		} else if(!strcasecmp("tls1",myproto)) {
923
		} else if(!strcasecmp("tls1",myproto)) {
919
			_ctx[sock] = SSL_CTX_new(TLSv1_client_method());
924
			_ctx[sock] = SSL_CTX_new(TLSv1_client_method());
920
		} else if (!strcasecmp("ssl23",myproto)) {
925
		} else if (!strcasecmp("ssl23",myproto)) {

Return to bug 573352