From 625c77a2267d0e29e507fc893086f5de3d3c6551 Mon Sep 17 00:00:00 2001
From: Vladislav Gruchik <gruchikvlad@gmail.com>
Date: Thu, 7 Nov 2019 00:10:59 +0300
Subject: [PATCH 1/4] Rename asn1.ber dependency.

---
 README.md       | 2 +-
 add.go          | 2 +-
 bind.go         | 2 +-
 compare.go      | 2 +-
 conn.go         | 2 +-
 conn_test.go    | 2 +-
 control.go      | 2 +-
 control_test.go | 2 +-
 debug.go        | 2 +-
 del.go          | 2 +-
 dn.go           | 2 +-
 error.go        | 2 +-
 error_test.go   | 2 +-
 filter.go       | 2 +-
 filter_test.go  | 2 +-
 go.mod          | 4 +++-
 go.sum          | 6 ++++--
 ldap.go         | 2 +-
 moddn.go        | 2 +-
 modify.go       | 2 +-
 passwdmodify.go | 2 +-
 request.go      | 2 +-
 search.go       | 2 +-
 23 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/README.md b/README.md
index 25cf730b..deb5cc8f 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@ Import the latest version with:
 
 ## Required Libraries:
 
- - gopkg.in/asn1-ber.v1
+ - github.com/go-asn1-ber/asn1-ber
 
 ## Features:
 
diff --git a/add.go b/add.go
index e2cb9b06..a3e6b881 100644
--- a/add.go
+++ b/add.go
@@ -12,7 +12,7 @@ package ldap
 import (
 	"log"
 
-	ber "gopkg.in/asn1-ber.v1"
+	ber "github.com/go-asn1-ber/asn1-ber"
 )
 
 // Attribute represents an LDAP attribute
diff --git a/bind.go b/bind.go
index 7b5e657a..15307f50 100644
--- a/bind.go
+++ b/bind.go
@@ -4,7 +4,7 @@ import (
 	"errors"
 	"fmt"
 
-	ber "gopkg.in/asn1-ber.v1"
+	ber "github.com/go-asn1-ber/asn1-ber"
 )
 
 // SimpleBindRequest represents a username/password bind operation
diff --git a/compare.go b/compare.go
index 83694d82..04a2e17c 100644
--- a/compare.go
+++ b/compare.go
@@ -22,7 +22,7 @@ package ldap
 import (
 	"fmt"
 
-	ber "gopkg.in/asn1-ber.v1"
+	ber "github.com/go-asn1-ber/asn1-ber"
 )
 
 // CompareRequest represents an LDAP CompareRequest operation.
diff --git a/conn.go b/conn.go
index a14d8943..e6051170 100644
--- a/conn.go
+++ b/conn.go
@@ -11,7 +11,7 @@ import (
 	"sync/atomic"
 	"time"
 
-	ber "gopkg.in/asn1-ber.v1"
+	ber "github.com/go-asn1-ber/asn1-ber"
 )
 
 const (
diff --git a/conn_test.go b/conn_test.go
index 488754d1..f815a967 100644
--- a/conn_test.go
+++ b/conn_test.go
@@ -12,7 +12,7 @@ import (
 	"testing"
 	"time"
 
-	"gopkg.in/asn1-ber.v1"
+	"github.com/go-asn1-ber/asn1-ber"
 )
 
 func TestUnresponsiveConnection(t *testing.T) {
diff --git a/control.go b/control.go
index 3f181912..463fe3a3 100644
--- a/control.go
+++ b/control.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strconv"
 
-	"gopkg.in/asn1-ber.v1"
+	"github.com/go-asn1-ber/asn1-ber"
 )
 
 const (
diff --git a/control_test.go b/control_test.go
index 0d59d10c..309d7f27 100644
--- a/control_test.go
+++ b/control_test.go
@@ -7,7 +7,7 @@ import (
 	"runtime"
 	"testing"
 
-	ber "gopkg.in/asn1-ber.v1"
+	ber "github.com/go-asn1-ber/asn1-ber"
 )
 
 func TestControlPaging(t *testing.T) {
diff --git a/debug.go b/debug.go
index 61628e3a..2c0b30c8 100644
--- a/debug.go
+++ b/debug.go
@@ -3,7 +3,7 @@ package ldap
 import (
 	"log"
 
-	ber "gopkg.in/asn1-ber.v1"
+	ber "github.com/go-asn1-ber/asn1-ber"
 )
 
 // debugging type
diff --git a/del.go b/del.go
index 0e7767b2..49811d34 100644
--- a/del.go
+++ b/del.go
@@ -8,7 +8,7 @@ package ldap
 import (
 	"log"
 
-	ber "gopkg.in/asn1-ber.v1"
+	ber "github.com/go-asn1-ber/asn1-ber"
 )
 
 // DelRequest implements an LDAP deletion request
diff --git a/dn.go b/dn.go
index f89e73a9..9d32e7fa 100644
--- a/dn.go
+++ b/dn.go
@@ -48,7 +48,7 @@ import (
 	"fmt"
 	"strings"
 
-	"gopkg.in/asn1-ber.v1"
+	"github.com/go-asn1-ber/asn1-ber"
 )
 
 // AttributeTypeAndValue represents an attributeTypeAndValue from https://tools.ietf.org/html/rfc4514
diff --git a/error.go b/error.go
index 53dedb95..b1fda2d8 100644
--- a/error.go
+++ b/error.go
@@ -3,7 +3,7 @@ package ldap
 import (
 	"fmt"
 
-	ber "gopkg.in/asn1-ber.v1"
+	ber "github.com/go-asn1-ber/asn1-ber"
 )
 
 // LDAP Result Codes
diff --git a/error_test.go b/error_test.go
index 816bf8a1..c547e454 100644
--- a/error_test.go
+++ b/error_test.go
@@ -7,7 +7,7 @@ import (
 	"testing"
 	"time"
 
-	"gopkg.in/asn1-ber.v1"
+	"github.com/go-asn1-ber/asn1-ber"
 )
 
 // TestNilPacket tests that nil packets don't cause a panic.
diff --git a/filter.go b/filter.go
index 4cc4207b..a3875506 100644
--- a/filter.go
+++ b/filter.go
@@ -8,7 +8,7 @@ import (
 	"strings"
 	"unicode/utf8"
 
-	"gopkg.in/asn1-ber.v1"
+	"github.com/go-asn1-ber/asn1-ber"
 )
 
 // Filter choices
diff --git a/filter_test.go b/filter_test.go
index 7a9194f7..45796325 100644
--- a/filter_test.go
+++ b/filter_test.go
@@ -4,7 +4,7 @@ import (
 	"strings"
 	"testing"
 
-	"gopkg.in/asn1-ber.v1"
+	"github.com/go-asn1-ber/asn1-ber"
 )
 
 type compileTest struct {
diff --git a/go.mod b/go.mod
index 89dab6c4..9b350ff9 100644
--- a/go.mod
+++ b/go.mod
@@ -1,3 +1,5 @@
 module github.com/go-ldap/ldap
 
-require gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d
+require github.com/go-asn1-ber/asn1-ber v1.3.1
+
+go 1.13
diff --git a/go.sum b/go.sum
index dd2f5e15..78be90d1 100644
--- a/go.sum
+++ b/go.sum
@@ -1,2 +1,4 @@
-gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d h1:TxyelI5cVkbREznMhfzycHdkp5cLA7DpE+GKjSslYhM=
-gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d/go.mod h1:cuepJuh7vyXfUyUwEgHQXw849cJrilpS5NeIjOWESAw=
+github.com/go-asn1-ber/asn1-ber v1.3.1 h1:gvPdv/Hr++TRFCl0UbPFHC54P9N9jgsRPnmnr419Uck=
+github.com/go-asn1-ber/asn1-ber v1.3.1/go.mod h1:hEBeB/ic+5LoWskz+yKT7vGhhPYkProFKoKdwZRWMe0=
+github.com/go-asn1-ber/asn1-ber v1.0.0-20181015200546-f715ec2f112d h1:TxyelI5cVkbREznMhfzycHdkp5cLA7DpE+GKjSslYhM=
+github.com/go-asn1-ber/asn1-ber v1.0.0-20181015200546-f715ec2f112d/go.mod h1:cuepJuh7vyXfUyUwEgHQXw849cJrilpS5NeIjOWESAw=
diff --git a/ldap.go b/ldap.go
index 5b694bf3..b29c018a 100644
--- a/ldap.go
+++ b/ldap.go
@@ -5,7 +5,7 @@ import (
 	"io/ioutil"
 	"os"
 
-	ber "gopkg.in/asn1-ber.v1"
+	ber "github.com/go-asn1-ber/asn1-ber"
 )
 
 // LDAP Application Codes
diff --git a/moddn.go b/moddn.go
index 889a82ac..ca48b2b4 100644
--- a/moddn.go
+++ b/moddn.go
@@ -13,7 +13,7 @@ package ldap
 import (
 	"log"
 
-	ber "gopkg.in/asn1-ber.v1"
+	ber "github.com/go-asn1-ber/asn1-ber"
 )
 
 // ModifyDNRequest holds the request to modify a DN
diff --git a/modify.go b/modify.go
index 7e09b507..88f65c1b 100644
--- a/modify.go
+++ b/modify.go
@@ -28,7 +28,7 @@ package ldap
 import (
 	"log"
 
-	ber "gopkg.in/asn1-ber.v1"
+	ber "github.com/go-asn1-ber/asn1-ber"
 )
 
 // Change operation choices
diff --git a/passwdmodify.go b/passwdmodify.go
index bfaceff3..135554d9 100644
--- a/passwdmodify.go
+++ b/passwdmodify.go
@@ -8,7 +8,7 @@ package ldap
 import (
 	"fmt"
 
-	ber "gopkg.in/asn1-ber.v1"
+	ber "github.com/go-asn1-ber/asn1-ber"
 )
 
 const (
diff --git a/request.go b/request.go
index 814e29fe..4790bbfe 100644
--- a/request.go
+++ b/request.go
@@ -3,7 +3,7 @@ package ldap
 import (
 	"errors"
 
-	ber "gopkg.in/asn1-ber.v1"
+	ber "github.com/go-asn1-ber/asn1-ber"
 )
 
 var (
diff --git a/search.go b/search.go
index 51eb7dc6..186246c0 100644
--- a/search.go
+++ b/search.go
@@ -61,7 +61,7 @@ import (
 	"sort"
 	"strings"
 
-	ber "gopkg.in/asn1-ber.v1"
+	ber "github.com/go-asn1-ber/asn1-ber"
 )
 
 // scope choices

From ff3c381cc4c7099c4ef856a9d240dda51283c136 Mon Sep 17 00:00:00 2001
From: Vladislav Gruchik <gruchikvlad@gmail.com>
Date: Thu, 7 Nov 2019 00:17:21 +0300
Subject: [PATCH 2/4] go mod tidy

---
 go.sum | 2 --
 1 file changed, 2 deletions(-)

diff --git a/go.sum b/go.sum
index 78be90d1..c8b9085b 100644
--- a/go.sum
+++ b/go.sum
@@ -1,4 +1,2 @@
 github.com/go-asn1-ber/asn1-ber v1.3.1 h1:gvPdv/Hr++TRFCl0UbPFHC54P9N9jgsRPnmnr419Uck=
 github.com/go-asn1-ber/asn1-ber v1.3.1/go.mod h1:hEBeB/ic+5LoWskz+yKT7vGhhPYkProFKoKdwZRWMe0=
-github.com/go-asn1-ber/asn1-ber v1.0.0-20181015200546-f715ec2f112d h1:TxyelI5cVkbREznMhfzycHdkp5cLA7DpE+GKjSslYhM=
-github.com/go-asn1-ber/asn1-ber v1.0.0-20181015200546-f715ec2f112d/go.mod h1:cuepJuh7vyXfUyUwEgHQXw849cJrilpS5NeIjOWESAw=

From ea4ca57532ccd2b7d3963d633390f75cb0628014 Mon Sep 17 00:00:00 2001
From: Vladislav Gruchik <gruchikvlad@gmail.com>
Date: Thu, 7 Nov 2019 00:23:54 +0300
Subject: [PATCH 3/4] Update travic CI to new asn1 ber

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 107aa786..203990d2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,7 +13,7 @@ go:
     - tip
 
 git:
-  depth: 1
+    depth: 1
 
 matrix:
     fast_finish: true
@@ -21,7 +21,7 @@ matrix:
         - go: tip
 go_import_path: gopkg.in/ldap.v3
 install:
-    - go get gopkg.in/asn1-ber.v1
+    - go get github.com/go-asn1-ber/asn1-ber
     - go get code.google.com/p/go.tools/cmd/cover || go get golang.org/x/tools/cmd/cover
     - go get github.com/golang/lint/golint || go get golang.org/x/lint/golint || true
     - go build -v ./...

From e540622ff49164eb56bec84b7c113edaeea3c5e8 Mon Sep 17 00:00:00 2001
From: Vladislav Gruchik <gruchikvlad@gmail.com>
Date: Thu, 7 Nov 2019 01:16:25 +0300
Subject: [PATCH 4/4] Update travis go_import_path

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 203990d2..f2538fd5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,7 +19,7 @@ matrix:
     fast_finish: true
     allow_failures:
         - go: tip
-go_import_path: gopkg.in/ldap.v3
+go_import_path: github.com/go-ldap/ldap
 install:
     - go get github.com/go-asn1-ber/asn1-ber
     - go get code.google.com/p/go.tools/cmd/cover || go get golang.org/x/tools/cmd/cover