Changed/removed dependencies in the go-ntlm

psiphon/upstreamproxy/go-ntlm/ntlm/crypto.go

@@ -8,7 +8,7 @@ import (
 	md5P "crypto/md5"
 	"crypto/rand"
 	rc4P "crypto/rc4"
-	md4P "github.com/ThomsonReutersEikon/go-ntlm/ntlm/md4"
+	md4P "github.com/Psiphon-Labs/psiphon-tunnel-core/psiphon/upstreamproxy/go-ntlm/ntlm/md4"
 	crc32P "hash/crc32"
 )
 

psiphon/upstreamproxy/go-ntlm/ntlm/ntlmv1.go

@@ -6,7 +6,6 @@ import (
 	"bytes"
 	rc4P "crypto/rc4"
 	"errors"
-	l4g "github.com/ThomsonReutersEikon/log4go"
 	"strings"
 )
 
@@ -181,7 +180,6 @@ func (n *V1ServerSession) ProcessAuthenticateMessage(am *AuthenticateMessage) (e
 	// They should always be correct (I hope)
 	n.user = am.UserName.String()
 	n.userDomain = am.DomainName.String()
-	l4g.Info("(ProcessAuthenticateMessage)NTLM v1 User %s Domain %s", n.user, n.userDomain)
 
 	err = n.fetchResponseKeys()
 	if err != nil {
@@ -225,7 +223,6 @@ func (n *V1ServerSession) ProcessAuthenticateMessage(am *AuthenticateMessage) (e
 		//UGH not entirely sure how this could possibly happen, going to put this in for now
 		//TODO investigate if this ever is really happening
 		am.Version = &VersionStruct{ProductMajorVersion: uint8(5), ProductMinorVersion: uint8(1), ProductBuild: uint16(2600), NTLMRevisionCurrent: uint8(15)}
-		l4g.Error("Nil version in ntlmv1")
 	}
 
 	err = n.calculateKeys(am.Version.NTLMRevisionCurrent)

psiphon/upstreamproxy/go-ntlm/ntlm/ntlmv2.go

@@ -7,7 +7,6 @@ import (
 	rc4P "crypto/rc4"
 	"encoding/binary"
 	"errors"
-	l4g "github.com/ThomsonReutersEikon/log4go"
 	"strings"
 	"time"
 )
@@ -204,7 +203,6 @@ func (n *V2ServerSession) ProcessAuthenticateMessage(am *AuthenticateMessage) (e
 	// They should always be correct (I hope)
 	n.user = am.UserName.String()
 	n.userDomain = am.DomainName.String()
-	l4g.Info("(ProcessAuthenticateMessage)NTLM v2 User %s Domain %s", n.user, n.userDomain)
 
 	err = n.fetchResponseKeys()
 	if err != nil {
@@ -243,7 +241,6 @@ func (n *V2ServerSession) ProcessAuthenticateMessage(am *AuthenticateMessage) (e
 		//TODO investigate if this ever is really happening
 		am.Version = &VersionStruct{ProductMajorVersion: uint8(5), ProductMinorVersion: uint8(1), ProductBuild: uint16(2600), NTLMRevisionCurrent: uint8(15)}
 
-		l4g.Error("Nil version in ntlmv2")
 	}
 
 	err = n.calculateKeys(am.Version.NTLMRevisionCurrent)