age: move package from filippo.io/age/age to filippo.io/age 🤦‍♂️

FiloSottile · Jun 28, 2020 · 189041b · mohammed90 · Jun 28, 2020 · FiloSottile
1 parent e609359
commit 189041b
Show file tree

Hide file tree

Showing 14 changed files with 11 additions and 11 deletions.
diff --git a/age/age.go → age.go b/age/age.go → age.go
@@ -10,7 +10,7 @@
 // For most use cases, use the Encrypt and Decrypt functions with
 // X25519Recipient and X25519Identity. If passphrase encryption is required, use
 // ScryptRecipient and ScryptIdentity. For compatibility with existing SSH keys
-// use the filippo.io/age/agessh package.
+// use the filippo.io/agessh package.
 //
 // Age encrypted files are binary and not malleable, for encoding them as text,
 // use the filippo.io/age/armor package.

diff --git a/age/age_test.go → age_test.go b/age/age_test.go → age_test.go
@@ -15,7 +15,7 @@ import (
 	"log"
 	"testing"
 
-	"filippo.io/age/age"
+	"filippo.io/age"
 )
 
 func ExampleEncrypt() {

diff --git a/agessh/agessh.go b/agessh/agessh.go
@@ -23,7 +23,7 @@ import (
 	"io"
 	"math/big"
 
-	"filippo.io/age/age"
+	"filippo.io/age"
 	"filippo.io/age/internal/format"
 	"golang.org/x/crypto/chacha20poly1305"
 	"golang.org/x/crypto/curve25519"

diff --git a/agessh/encrypted_keys.go b/agessh/encrypted_keys.go
@@ -11,7 +11,7 @@ import (
 	"crypto/rsa"
 	"fmt"
 
-	"filippo.io/age/age"
+	"filippo.io/age"
 	"golang.org/x/crypto/ssh"
 )
 

diff --git a/armor/armor_test.go b/armor/armor_test.go
@@ -16,7 +16,7 @@ import (
 	"strings"
 	"testing"
 
-	"filippo.io/age/age"
+	"filippo.io/age"
 	"filippo.io/age/armor"
 )
 

diff --git a/cmd/age-keygen/keygen.go b/cmd/age-keygen/keygen.go
@@ -13,7 +13,7 @@ import (
 	"os"
 	"time"
 
-	"filippo.io/age/age"
+	"filippo.io/age"
 	"golang.org/x/crypto/ssh/terminal"
 )
 

diff --git a/cmd/age/age.go b/cmd/age/age.go
@@ -16,7 +16,7 @@ import (
 	"os"
 	"strings"
 
-	"filippo.io/age/age"
+	"filippo.io/age"
 	"filippo.io/age/armor"
 	"golang.org/x/crypto/ssh/terminal"
 )

diff --git a/cmd/age/age_test.go b/cmd/age/age_test.go
@@ -13,7 +13,7 @@ import (
 	"strings"
 	"testing"
 
-	"filippo.io/age/age"
+	"filippo.io/age"
 )
 
 func TestVectors(t *testing.T) {

diff --git a/cmd/age/encrypted_keys.go b/cmd/age/encrypted_keys.go
@@ -10,7 +10,7 @@ import (
 	"fmt"
 	"os"
 
-	"filippo.io/age/age"
+	"filippo.io/age"
 	"golang.org/x/crypto/ssh/terminal"
 )
 

diff --git a/cmd/age/parse.go b/cmd/age/parse.go
@@ -15,7 +15,7 @@ import (
 	"os"
 	"strings"
 
-	"filippo.io/age/age"
+	"filippo.io/age"
 	"filippo.io/age/agessh"
 	"golang.org/x/crypto/ssh"
 )

diff --git a/age/primitives.go → primitives.go b/age/primitives.go → primitives.go
diff --git a/age/recipients_test.go → recipients_test.go b/age/recipients_test.go → recipients_test.go
@@ -11,7 +11,7 @@ import (
 	"crypto/rand"
 	"testing"
 
-	"filippo.io/age/age"
+	"filippo.io/age"
 	"filippo.io/age/internal/format"
 )
 

diff --git a/age/scrypt.go → scrypt.go b/age/scrypt.go → scrypt.go
diff --git a/age/x25519.go → x25519.go b/age/x25519.go → x25519.go