aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--NEWS5
-rw-r--r--socket.c2
2 files changed, 4 insertions, 3 deletions
diff --git a/NEWS b/NEWS
index 86f2d4fe..081743e4 100644
--- a/NEWS
+++ b/NEWS
@@ -132,6 +132,8 @@ fetchmail-6.4.22 (not yet released):
and happened when plugging memory leaks, which did not account for that the
envelope parameter is special when set as "no envelope". The segfault happens
in a constant strlen(-1), triggered by trusted local input => no vulnerability.
+* Fix program abort (SIGABRT) with "internal error" when invalid sslproto is
+ given with OpenSSL 1.1.0 API compatible SSL implementations.
# CHANGES:
* IMAP: When fetchmail is in not-authenticated state and the server volunteers
@@ -146,8 +148,9 @@ fetchmail-6.4.22 (not yet released):
The defaults shall not change between 6.4.X releases for compatibility.
# TRANSLATIONS: These language translations were updated by these fine people:
-* fr: Frédéric Marchal [French]
* eo: Keith Bowes [Esperanto]
+* fr: Frédéric Marchal [French]
+* sv: Göran Uddeborg [Swedish]
--------------------------------------------------------------------------------
fetchmail-6.4.21 (released 2021-08-09, 30042 LoC):
diff --git a/socket.c b/socket.c
index d844a33b..b7be292c 100644
--- a/socket.c
+++ b/socket.c
@@ -1062,8 +1062,6 @@ static int OSSL110_proto_version_logic(int sock, const char **myproto,
report(stderr,
GT_("Invalid SSL protocol '%s' specified, using default autoselect (auto).\n"),
*myproto);
- report(stderr, "fetchmail internal error in OSSL110_proto_version_logic\n");
- abort();
}
return 0;
}