瀏覽代碼

Use `crypto/sha256` (#29386)

Go 1.21 improved the performance of `crypto/sha256`. It's now similar to
`minio/sha256-simd`, so we should just use the standard libs.

https://go.dev/doc/go1.21#crypto/sha256
https://go-review.googlesource.com/c/go/+/408795
https://github.com/multiformats/go-multihash/pull/173
tags/v1.22.0-rc0
KN4CK3R 3 月之前
父節點
當前提交
f79c9e817a
No account linked to committer's email address

+ 1
- 1
go.mod 查看文件

@@ -78,7 +78,6 @@ require (
github.com/mholt/archiver/v3 v3.5.1
github.com/microcosm-cc/bluemonday v1.0.26
github.com/minio/minio-go/v7 v7.0.66
github.com/minio/sha256-simd v1.0.1
github.com/msteinert/pam v1.2.0
github.com/nektos/act v0.2.52
github.com/niklasfasching/go-org v1.7.0
@@ -230,6 +229,7 @@ require (
github.com/mholt/acmez v1.2.0 // indirect
github.com/miekg/dns v1.1.58 // indirect
github.com/minio/md5-simd v1.1.2 // indirect
github.com/minio/sha256-simd v1.0.1 // indirect
github.com/mitchellh/copystructure v1.2.0 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/mitchellh/reflectwalk v1.0.2 // indirect

+ 1
- 1
models/auth/twofactor.go 查看文件

@@ -6,6 +6,7 @@ package auth
import (
"context"
"crypto/md5"
"crypto/sha256"
"crypto/subtle"
"encoding/base32"
"encoding/base64"
@@ -18,7 +19,6 @@ import (
"code.gitea.io/gitea/modules/timeutil"
"code.gitea.io/gitea/modules/util"

"github.com/minio/sha256-simd"
"github.com/pquerna/otp/totp"
"golang.org/x/crypto/pbkdf2"
)

+ 1
- 1
models/migrations/base/hash.go 查看文件

@@ -4,9 +4,9 @@
package base

import (
"crypto/sha256"
"encoding/hex"

"github.com/minio/sha256-simd"
"golang.org/x/crypto/pbkdf2"
)


+ 1
- 1
models/migrations/v1_14/v166.go 查看文件

@@ -4,9 +4,9 @@
package v1_14 //nolint

import (
"crypto/sha256"
"encoding/hex"

"github.com/minio/sha256-simd"
"golang.org/x/crypto/argon2"
"golang.org/x/crypto/bcrypt"
"golang.org/x/crypto/pbkdf2"

+ 1
- 1
modules/auth/password/hash/pbkdf2.go 查看文件

@@ -4,12 +4,12 @@
package hash

import (
"crypto/sha256"
"encoding/hex"
"strings"

"code.gitea.io/gitea/modules/log"

"github.com/minio/sha256-simd"
"golang.org/x/crypto/pbkdf2"
)


+ 1
- 2
modules/avatar/hash.go 查看文件

@@ -4,10 +4,9 @@
package avatar

import (
"crypto/sha256"
"encoding/hex"
"strconv"

"github.com/minio/sha256-simd"
)

// HashAvatar will generate a unique string, which ensures that when there's a

+ 1
- 2
modules/avatar/identicon/identicon.go 查看文件

@@ -7,11 +7,10 @@
package identicon

import (
"crypto/sha256"
"fmt"
"image"
"image/color"

"github.com/minio/sha256-simd"
)

const minImageSize = 16

+ 1
- 1
modules/base/tool.go 查看文件

@@ -5,6 +5,7 @@ package base

import (
"crypto/sha1"
"crypto/sha256"
"encoding/base64"
"encoding/hex"
"errors"
@@ -22,7 +23,6 @@ import (
"code.gitea.io/gitea/modules/setting"

"github.com/dustin/go-humanize"
"github.com/minio/sha256-simd"
)

// EncodeSha1 string to sha1 hex value.

+ 1
- 2
modules/git/last_commit_cache.go 查看文件

@@ -4,12 +4,11 @@
package git

import (
"crypto/sha256"
"fmt"

"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/setting"

"github.com/minio/sha256-simd"
)

// Cache represents a caching interface

+ 1
- 2
modules/lfs/content_store.go 查看文件

@@ -4,6 +4,7 @@
package lfs

import (
"crypto/sha256"
"encoding/hex"
"errors"
"hash"
@@ -12,8 +13,6 @@ import (

"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/storage"

"github.com/minio/sha256-simd"
)

var (

+ 1
- 2
modules/lfs/pointer.go 查看文件

@@ -4,6 +4,7 @@
package lfs

import (
"crypto/sha256"
"encoding/hex"
"errors"
"fmt"
@@ -12,8 +13,6 @@ import (
"regexp"
"strconv"
"strings"

"github.com/minio/sha256-simd"
)

const (

+ 1
- 2
modules/secret/secret.go 查看文件

@@ -7,13 +7,12 @@ import (
"crypto/aes"
"crypto/cipher"
"crypto/rand"
"crypto/sha256"
"encoding/base64"
"encoding/hex"
"errors"
"fmt"
"io"

"github.com/minio/sha256-simd"
)

// AesEncrypt encrypts text and given key with AES.

+ 1
- 2
modules/util/keypair.go 查看文件

@@ -7,10 +7,9 @@ import (
"crypto"
"crypto/rand"
"crypto/rsa"
"crypto/sha256"
"crypto/x509"
"encoding/pem"

"github.com/minio/sha256-simd"
)

// GenerateKeyPair generates a public and private keypair

+ 1
- 1
modules/util/keypair_test.go 查看文件

@@ -7,12 +7,12 @@ import (
"crypto"
"crypto/rand"
"crypto/rsa"
"crypto/sha256"
"crypto/x509"
"encoding/pem"
"regexp"
"testing"

"github.com/minio/sha256-simd"
"github.com/stretchr/testify/assert"
)


+ 1
- 2
routers/api/packages/chef/auth.go 查看文件

@@ -8,6 +8,7 @@ import (
"crypto"
"crypto/rsa"
"crypto/sha1"
"crypto/sha256"
"crypto/x509"
"encoding/base64"
"encoding/pem"
@@ -26,8 +27,6 @@ import (
chef_module "code.gitea.io/gitea/modules/packages/chef"
"code.gitea.io/gitea/modules/util"
"code.gitea.io/gitea/services/auth"

"github.com/minio/sha256-simd"
)

const (

+ 1
- 2
routers/api/packages/maven/maven.go 查看文件

@@ -6,6 +6,7 @@ package maven
import (
"crypto/md5"
"crypto/sha1"
"crypto/sha256"
"crypto/sha512"
"encoding/hex"
"encoding/xml"
@@ -26,8 +27,6 @@ import (
maven_module "code.gitea.io/gitea/modules/packages/maven"
"code.gitea.io/gitea/routers/api/packages/helper"
packages_service "code.gitea.io/gitea/services/packages"

"github.com/minio/sha256-simd"
)

const (

+ 1
- 1
services/lfs/server.go 查看文件

@@ -5,6 +5,7 @@ package lfs

import (
stdCtx "context"
"crypto/sha256"
"encoding/base64"
"encoding/hex"
"errors"
@@ -33,7 +34,6 @@ import (
"code.gitea.io/gitea/modules/storage"

"github.com/golang-jwt/jwt/v5"
"github.com/minio/sha256-simd"
)

// requestContext contain variables from the HTTP request.

+ 1
- 2
services/mailer/token/token.go 查看文件

@@ -6,14 +6,13 @@ package token
import (
"context"
crypto_hmac "crypto/hmac"
"crypto/sha256"
"encoding/base32"
"fmt"
"time"

user_model "code.gitea.io/gitea/models/user"
"code.gitea.io/gitea/modules/util"

"github.com/minio/sha256-simd"
)

// A token is a verifiable container describing an action.

+ 1
- 1
services/webhook/deliver.go 查看文件

@@ -7,6 +7,7 @@ import (
"context"
"crypto/hmac"
"crypto/sha1"
"crypto/sha256"
"crypto/tls"
"encoding/hex"
"fmt"
@@ -29,7 +30,6 @@ import (
webhook_module "code.gitea.io/gitea/modules/webhook"

"github.com/gobwas/glob"
"github.com/minio/sha256-simd"
)

// Deliver deliver hook task

+ 1
- 1
tests/integration/api_packages_chef_test.go 查看文件

@@ -11,6 +11,7 @@ import (
"crypto/rand"
"crypto/rsa"
"crypto/sha1"
"crypto/sha256"
"crypto/x509"
"encoding/base64"
"encoding/pem"
@@ -33,7 +34,6 @@ import (
chef_router "code.gitea.io/gitea/routers/api/packages/chef"
"code.gitea.io/gitea/tests"

"github.com/minio/sha256-simd"
"github.com/stretchr/testify/assert"
)


+ 1
- 1
tests/integration/api_packages_container_test.go 查看文件

@@ -5,6 +5,7 @@ package integration

import (
"bytes"
"crypto/sha256"
"encoding/base64"
"fmt"
"net/http"
@@ -24,7 +25,6 @@ import (
"code.gitea.io/gitea/modules/test"
"code.gitea.io/gitea/tests"

"github.com/minio/sha256-simd"
oci "github.com/opencontainers/image-spec/specs-go/v1"
"github.com/stretchr/testify/assert"
)

+ 1
- 1
tests/integration/api_packages_test.go 查看文件

@@ -5,6 +5,7 @@ package integration

import (
"bytes"
"crypto/sha256"
"fmt"
"net/http"
"strings"
@@ -24,7 +25,6 @@ import (
packages_cleanup_service "code.gitea.io/gitea/services/packages/cleanup"
"code.gitea.io/gitea/tests"

"github.com/minio/sha256-simd"
"github.com/stretchr/testify/assert"
)


Loading…
取消
儲存