Hi,

anybody wants to take over MAINTAINER for security/p5-Authen-NTLM?
I'm quite glad that i don't have to use NTLM any longer,
so i'd like to drop it.

As a parting present, here is an update from 1.08 to 1.09.

Unfortunately, i can't really test, but the diff looks reasonable
enough (see at the very end).  The only change is one bugfix, see
https://rt.cpan.org/Public/Bug/Display.html?id=70703

OK?
  Ingo


Index: Makefile
===================================================================
RCS file: /cvs/ports/security/p5-Authen-NTLM/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- Makefile    11 Mar 2013 11:41:26 -0000      1.2
+++ Makefile    3 Sep 2014 05:33:35 -0000
@@ -2,10 +2,9 @@
 
 COMMENT =      perl interface to the NTLM authentication mechanism
 
-DISTNAME =     NTLM-1.08
+DISTNAME =     NTLM-1.09
 PKGNAME =      p5-Authen-${DISTNAME}
 CATEGORIES =   security
-MAINTAINER =   Ingo Schwarze <schwa...@openbsd.org>
 
 # perl
 PERMIT_PACKAGE_CDROM = Yes
Index: distinfo
===================================================================
RCS file: /cvs/ports/security/p5-Authen-NTLM/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo    20 Jul 2011 21:42:49 -0000      1.1.1.1
+++ distinfo    3 Sep 2014 05:33:35 -0000
@@ -1,5 +1,2 @@
-MD5 (NTLM-1.08.tar.gz) = xhcq0fuvh8HftgTTbyKx8A==
-RMD160 (NTLM-1.08.tar.gz) = CuGG2GsyatqdBRwdDaMi7gRtg+U=
-SHA1 (NTLM-1.08.tar.gz) = psksiKYLZ7P6B1DuwqURF+p+ZjU=
-SHA256 (NTLM-1.08.tar.gz) = f87jAUrXsRtd8iWJVF3VjTqKFKJZqbu48oNr3hJgXek=
-SIZE (NTLM-1.08.tar.gz) = 24201
+SHA256 (NTLM-1.09.tar.gz) = yCPjDNp2vBVjblhDAslg4rXu75UXwkSPdFRJiJMVH4U=
+SIZE (NTLM-1.09.tar.gz) = 28766

 ----- 8< ----- schnipp ----- >8 ----- 8< ----- schnapp ----- >8 -----

UPSTREAM DIFF:

diff -Napur p5-Authen-NTLM-1.08/NTLM-1.08/Changes 
p5-Authen-NTLM-1.09/NTLM-1.09/Changes
--- p5-Authen-NTLM-1.08/NTLM-1.08/Changes       Thu Apr  7 05:30:36 2011
+++ p5-Authen-NTLM-1.09/NTLM-1.09/Changes       Fri Sep  9 04:11:05 2011
@@ -1,6 +1,9 @@
 Revision history for Perl NTLM authentication suite
 
-1.08 - 6 Apr 2011
+1.09 8 Sep 2011
+       - fix CPAN ticket # 70703
+
+1.08 6 Apr 2011
        - fix CPAN ticket # 39925
 
 1.07 - not released
diff -Napur p5-Authen-NTLM-1.08/NTLM-1.08/DES/Makefile.old 
p5-Authen-NTLM-1.09/NTLM-1.09/DES/Makefile.old
--- p5-Authen-NTLM-1.08/NTLM-1.08/DES/Makefile.old      Thu Apr  7 05:27:03 2011
+++ p5-Authen-NTLM-1.09/NTLM-1.09/DES/Makefile.old      Fri Sep  9 04:06:27 2011
@@ -39,7 +39,7 @@ LIBC = 
 LIB_EXT = .a
 OBJ_EXT = .o
 OSNAME = linux
-OSVERS = 2.6.32-71.14.1.el6.x86_64
+OSVERS = 2.6.32-131.2.1.el6.x86_64
 RANLIB = :
 SITELIBEXP = /usr/local/share/perl5
 SITEARCHEXP = /usr/local/lib64/perl5
diff -Napur p5-Authen-NTLM-1.08/NTLM-1.08/MD4/Makefile.old 
p5-Authen-NTLM-1.09/NTLM-1.09/MD4/Makefile.old
--- p5-Authen-NTLM-1.08/NTLM-1.08/MD4/Makefile.old      Thu Apr  7 05:27:03 2011
+++ p5-Authen-NTLM-1.09/NTLM-1.09/MD4/Makefile.old      Fri Sep  9 04:06:27 2011
@@ -39,7 +39,7 @@ LIBC = 
 LIB_EXT = .a
 OBJ_EXT = .o
 OSNAME = linux
-OSVERS = 2.6.32-71.14.1.el6.x86_64
+OSVERS = 2.6.32-131.2.1.el6.x86_64
 RANLIB = :
 SITELIBEXP = /usr/local/share/perl5
 SITEARCHEXP = /usr/local/lib64/perl5
diff -Napur p5-Authen-NTLM-1.08/NTLM-1.08/META.yml 
p5-Authen-NTLM-1.09/NTLM-1.09/META.yml
--- p5-Authen-NTLM-1.08/NTLM-1.08/META.yml      Thu Apr  7 05:30:53 2011
+++ p5-Authen-NTLM-1.09/NTLM-1.09/META.yml      Fri Sep  9 04:10:27 2011
@@ -1,10 +1,10 @@
 --- #YAML:1.0
 name:                Authen-NTLM
-version:             1.08
+version:             1.09
 abstract:            ~
 license:             perl
 author:              
-    - David (Buzz) Bussenschutt <davidb...@gmail.com>, Mark Bush 
<mark.b...@bushnet.demon.co.uk>
+    - David (Buzz) Bussenschutt <davidb...@gmail.com>, Mark Bush 
<mark.b...@bushnet.demon.co.uk>, Nick Bebout <nbeb...@cpan.org>
 generated_by:        ExtUtils::MakeMaker version 6.42
 distribution_type:   module
 requires:     
diff -Napur p5-Authen-NTLM-1.08/NTLM-1.08/NTLM.pm 
p5-Authen-NTLM-1.09/NTLM-1.09/NTLM.pm
--- p5-Authen-NTLM-1.08/NTLM-1.08/NTLM.pm       Thu Apr  7 05:31:21 2011
+++ p5-Authen-NTLM-1.09/NTLM-1.09/NTLM.pm       Fri Sep  9 04:09:56 2011
@@ -148,6 +148,7 @@ L<perl>, L<Mail::IMAPClient>, L<LWP::Authen::Ntlm> 
 
 =head1 HISTORY
 
+    1.09 - fix CPAN ticket # 70703
     1.08 - fix CPAN ticket # 39925
     1.07 - not publicly released
     1.06 - relicense as GPL+ or Artistic
@@ -158,7 +159,7 @@ L<perl>, L<Mail::IMAPClient>, L<LWP::Authen::Ntlm> 
 
 =cut
 
-$VERSION = "1.08";
+$VERSION = "1.09";
 @ISA = qw(Exporter);
 @EXPORT = qw(ntlm ntlm_domain ntlm_user ntlm_password ntlm_reset ntlm_host 
ntlmv2);
 
@@ -213,7 +214,7 @@ sub challenge
    my ( $self, $challenge) = @_;
    $state = defined $challenge;
    ($user,$domain,$password,$host) = @{$self}{qw(user domain password host)};
-   $ntlm_v2 = ($self-> {version} > 1) ? 1 : 0;
+   $ntlm_v2 = ($self-> {version} eq '2') ? 1 : 0;
    return ntlm($challenge);
 }
 
@@ -290,10 +291,17 @@ sub ntlm
       $lmResp = &lmEncrypt($c_info->{data});
       $ntResp = &ntEncrypt($c_info->{data});
       $flags = pack($msg3_tl, $c_info->{flags});
-    } else {
+        }
+        elsif ($ntlm_v2 eq '1') {
       $lmResp = &lmv2Encrypt($c_info->{data});
       $ntResp = &ntv2Encrypt($c_info->{data}, $c_info->{target_data});
       $flags = pack($msg3_tl, $ntlm_v2_msg3_flags);
+        }
+    else {
+      $domain = &unicode($domain);#substr($challenge, 
$c_info->{domain}{offset}, $c_info->{domain}{len}); 
+      $lmResp = &lmEncrypt($c_info->{data});
+      $ntResp = &ntEncrypt($c_info->{data});
+      $flags = pack($msg3_tl, $c_info->{flags});
     }
     $u_host = &unicode(($host ? $host : $user));
     $response = pack($msg3, $ident, 3);
@@ -321,7 +329,7 @@ sub ntlm
       $f &= ~NTLMSSP_NEGOTIATE_OEM_DOMAIN_SUPPLIED;
     }
     $msg1_host = $user;
-    if ($ntlm_v2) {
+    if ($ntlm_v2 and $ntlm_v2 eq '1') {
       $f &= ~NTLMSSP_NEGOTIATE_OEM_WORKSTATION_SUPPLIED;
       $f |= NTLMSSP_NEGOTIATE_NTLM2;
       $msg1_host = "";

Reply via email to