|
 |
d62d69 |
From 0edc4099455173649bf23ce25c20679c198287f7 Mon Sep 17 00:00:00 2001
|
|
|
d62d69 |
From: Peter Marschall <peter@adpm.de>
|
|
|
d62d69 |
Date: Thu, 2 Apr 2015 14:20:50 +0200
|
|
|
d62d69 |
Subject: [PATCH] LDAP.pm: do not set default sslversion for start_tls
|
|
|
d62d69 |
MIME-Version: 1.0
|
|
|
d62d69 |
Content-Type: text/plain; charset=UTF-8
|
|
|
d62d69 |
Content-Transfer-Encoding: 8bit
|
|
|
d62d69 |
|
|
|
d62d69 |
Instead of setting a default sslversion for start_tls, rely on the default
|
|
|
d62d69 |
value used by IO::Socket::SSL.
|
|
|
d62d69 |
In addition, extend documentation slightly.
|
|
|
d62d69 |
|
|
|
d62d69 |
Petr Písař: Ported to 0.56.
|
|
|
d62d69 |
|
|
|
d62d69 |
Signed-off-by: Petr Písař <ppisar@redhat.com>
|
|
|
d62d69 |
---
|
|
|
d62d69 |
lib/Net/LDAP.pm | 1 -
|
|
|
d62d69 |
lib/Net/LDAP.pod | 8 +++++---
|
|
|
d62d69 |
2 files changed, 5 insertions(+), 4 deletions(-)
|
|
|
d62d69 |
|
|
|
d62d69 |
diff --git a/lib/Net/LDAP.pm b/lib/Net/LDAP.pm
|
|
|
d62d69 |
index 5969785..afa3620 100644
|
|
|
d62d69 |
--- a/lib/Net/LDAP.pm
|
|
|
d62d69 |
+++ b/lib/Net/LDAP.pm
|
|
|
d62d69 |
@@ -1079,7 +1079,6 @@ sub start_tls {
|
|
|
d62d69 |
|
|
|
d62d69 |
delete $ldap->{net_ldap_root_dse};
|
|
|
d62d69 |
|
|
|
d62d69 |
- $arg->{sslversion} = 'tlsv1' unless defined $arg->{sslversion};
|
|
|
d62d69 |
$arg->{sslserver} = $ldap->{net_ldap_host} unless defined $arg->{sslserver};
|
|
|
d62d69 |
|
|
|
d62d69 |
my $sock_class = ref($sock);
|
|
|
d62d69 |
diff --git a/lib/Net/LDAP.pod b/lib/Net/LDAP.pod
|
|
|
d62d69 |
index 06bab70..c819e24 100644
|
|
|
d62d69 |
--- a/lib/Net/LDAP.pod
|
|
|
d62d69 |
+++ b/lib/Net/LDAP.pod
|
|
|
d62d69 |
@@ -770,10 +770,12 @@ The server must provide a certificate, and it must be valid.
|
|
|
d62d69 |
If you set verify to optional or require, you must also set either
|
|
|
d62d69 |
cafile or capath. The most secure option is B<require>.
|
|
|
d62d69 |
|
|
|
d62d69 |
-=item sslversion =E<gt> 'sslv2' | 'sslv3' | 'sslv23' | 'tlsv1'
|
|
|
d62d69 |
+=item sslversion =E<gt> 'sslv2' | 'sslv3' | 'sslv23' | 'tlsv1' | 'tlsv1_1' | 'tlsv1_2'
|
|
|
d62d69 |
|
|
|
d62d69 |
-This defines the version of the SSL/TLS protocol to use. Defaults to
|
|
|
d62d69 |
-B<'tlsv1'>.
|
|
|
d62d69 |
+This defines the version of the SSL/TLS protocol to use.
|
|
|
d62d69 |
+Default is to use the value that L<IO::Socket::SSL> uses as default.
|
|
|
d62d69 |
+
|
|
|
d62d69 |
+See L<IO::Socket::SSL/SSL_version> for more details.
|
|
|
d62d69 |
|
|
|
d62d69 |
=item ciphers =E<gt> CIPHERS
|
|
|
d62d69 |
|
|
|
d62d69 |
--
|
|
|
d62d69 |
2.13.6
|
|
|
d62d69 |
|