cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update p5-IO-Socket-SSL to 2.054

Browse Source 
remove LibreSSL version check for npn, fix is in p5-Net-SSLeay
This commit is contained in:
bluhm 2018-02-03 18:23:19 +00:00
parent 89c617a3ab
commit c576dd2521
3 changed files with 32 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
security/p5-IO-Socket-SSL/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.115 2017/10/29 22:27:52 bluhm Exp $
# $OpenBSD: Makefile,v 1.116 2018/02/03 18:23:19 bluhm Exp $
COMMENT = Perl SSL sockets with IO::Socket interface
DISTNAME = IO-Socket-SSL-2.052
DISTNAME = IO-Socket-SSL-2.054
CATEGORIES = security

4
security/p5-IO-Socket-SSL/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (IO-Socket-SSL-2.052.tar.gz) = 5Il6mxfLGKPESqaDmA1SzvU0zfy4Bj1od8h5v6LyZnM=
SIZE (IO-Socket-SSL-2.052.tar.gz) = 221703
SHA256 (IO-Socket-SSL-2.054.tar.gz) = AuoE6aM2p9PKmqYEwMW1qvPvpRPO/s/HPMec7rUTHks=
SIZE (IO-Socket-SSL-2.054.tar.gz) = 232199

28
security/p5-IO-Socket-SSL/patches/patch-lib_IO_Socket_SSL_pm Normal file
View File

@ -0,0 +1,28 @@
$OpenBSD: patch-lib_IO_Socket_SSL_pm,v 1.1 2018/02/03 18:23:19 bluhm Exp $
Index: lib/IO/Socket/SSL.pm
--- lib/IO/Socket/SSL.pm.orig
+++ lib/IO/Socket/SSL.pm
@@ -70,21 +70,7 @@ my $can_tckt_keycb; # TLS ticket key callback
BEGIN {
$can_client_sni = Net::SSLeay::OPENSSL_VERSION_NUMBER() >= 0x01000000;
$can_server_sni = defined &Net::SSLeay::get_servername;
- if ($can_npn = defined &Net::SSLeay::P_next_proto_negotiated and
- Net::SSLeay::SSLeay_version(0) =~m{^LibreSSL\s+(\d+)\.(\d+)\.(\d+)}) {
- # LibreSSL 2.6.1 disabled NPN by keeping the relevant functions
- # available but remove the actual functionality from these functions. It
- # does not set OPENSSL_NO_NEXTPROTONEG as OpenSSL does in case NPN is
- # not supported, which means one need to rely on checking the LibreSSL
- # version instead.
- $can_npn =
- $1 < 2 ? $can_npn : # version 1.x.y
- $1 > 2 ? 0 : # version 3.x.y
- $2 < 6 ? $can_npn : # version 2.5.y and lower
- $2 > 6 ? 0 : # version 2.7.y and higher
- $3 == 0 ? $can_npn : # version 2.6.0
- 0; # version 2.6.1 and higher
- }
+ $can_npn = defined &Net::SSLeay::P_next_proto_negotiated;
$can_alpn = defined &Net::SSLeay::CTX_set_alpn_protos;
$can_ecdh = defined &Net::SSLeay::CTX_set_tmp_ecdh &&
# There is a regression with elliptic curves on 1.0.1d with 64bit