Skip to content

Commit

Permalink
all: use crypto/ed25519 instead of golang.org/x/crypto/ed25519
Browse files Browse the repository at this point in the history
This is a follow-up to CL 317169, which dropped go1.12 compatibility,
and made the golang.org/x/crypto/ed25519 package an alias / wrapper for
crypto/ed25519 in stdlib.

This patch updates uses within this repository to use stdlib instead of
depending on the wrapper. With this patch applied, the only remaining
use of the wrapper is in ed25519_test, which appears to be in place to
verify compatibility of the wrapper itself.

Change-Id: I0195396102a75ae20bdd82ca8ab59855c0eb5cea
GitHub-Last-Rev: 24dbec5
GitHub-Pull-Request: #238
Reviewed-on: https://go-review.googlesource.com/c/crypto/+/448238
Reviewed-by: Bryan Mills <[email protected]>
Run-TryBot: Nicola Murino <[email protected]>
Reviewed-by: Nicola Murino <[email protected]>
TryBot-Result: Gopher Robot <[email protected]>
Reviewed-by: Joedian Reid <[email protected]>
Reviewed-by: Roland Shoemaker <[email protected]>
Reviewed-by: Than McIntosh <[email protected]>
  • Loading branch information
thaJeztah authored and FiloSottile committed Sep 27, 2023
1 parent a1aeb9b commit b665ba6
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 7 deletions.
3 changes: 1 addition & 2 deletions internal/wycheproof/eddsa_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,8 @@
package wycheproof

import (
"crypto/ed25519"
"testing"

"golang.org/x/crypto/ed25519"
)

func TestEddsa(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion nacl/sign/sign.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@
package sign

import (
"crypto/ed25519"
"io"

"golang.org/x/crypto/ed25519"
"golang.org/x/crypto/internal/alias"
)

Expand Down
2 changes: 1 addition & 1 deletion ssh/agent/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import (
"bytes"
"crypto/dsa"
"crypto/ecdsa"
"crypto/ed25519"
"crypto/elliptic"
"crypto/rsa"
"encoding/base64"
Expand All @@ -26,7 +27,6 @@ import (
"math/big"
"sync"

"golang.org/x/crypto/ed25519"
"golang.org/x/crypto/ssh"
)

Expand Down
2 changes: 1 addition & 1 deletion ssh/agent/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ package agent
import (
"crypto/dsa"
"crypto/ecdsa"
"crypto/ed25519"
"crypto/elliptic"
"crypto/rsa"
"encoding/binary"
Expand All @@ -16,7 +17,6 @@ import (
"log"
"math/big"

"golang.org/x/crypto/ed25519"
"golang.org/x/crypto/ssh"
)

Expand Down
2 changes: 1 addition & 1 deletion ssh/keys.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import (
"crypto/cipher"
"crypto/dsa"
"crypto/ecdsa"
"crypto/ed25519"
"crypto/elliptic"
"crypto/md5"
"crypto/rand"
Expand All @@ -28,7 +29,6 @@ import (
"math/big"
"strings"

"golang.org/x/crypto/ed25519"
"golang.org/x/crypto/ssh/internal/bcrypt_pbkdf"
)

Expand Down
2 changes: 1 addition & 1 deletion ssh/keys_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
"bytes"
"crypto/dsa"
"crypto/ecdsa"
"crypto/ed25519"
"crypto/elliptic"
"crypto/rand"
"crypto/rsa"
Expand All @@ -21,7 +22,6 @@ import (
"strings"
"testing"

"golang.org/x/crypto/ed25519"
"golang.org/x/crypto/ssh/testdata"
)

Expand Down

0 comments on commit b665ba6

Please sign in to comment.