aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--go.mod2
-rw-r--r--models/auth/twofactor.go2
-rw-r--r--models/migrations/base/hash.go2
-rw-r--r--models/migrations/v1_14/v166.go2
-rw-r--r--modules/auth/password/hash/pbkdf2.go2
-rw-r--r--modules/avatar/hash.go3
-rw-r--r--modules/avatar/identicon/identicon.go3
-rw-r--r--modules/base/tool.go2
-rw-r--r--modules/git/last_commit_cache.go3
-rw-r--r--modules/lfs/content_store.go3
-rw-r--r--modules/lfs/pointer.go3
-rw-r--r--modules/secret/secret.go3
-rw-r--r--modules/util/keypair.go3
-rw-r--r--modules/util/keypair_test.go2
-rw-r--r--routers/api/packages/chef/auth.go3
-rw-r--r--routers/api/packages/maven/maven.go3
-rw-r--r--services/lfs/server.go2
-rw-r--r--services/mailer/token/token.go3
-rw-r--r--services/webhook/deliver.go2
-rw-r--r--tests/integration/api_packages_chef_test.go2
-rw-r--r--tests/integration/api_packages_container_test.go2
-rw-r--r--tests/integration/api_packages_test.go2
22 files changed, 22 insertions, 32 deletions
diff --git a/go.mod b/go.mod
index 7a752ec874..03f6ad1215 100644
--- a/go.mod
+++ b/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
diff --git a/models/auth/twofactor.go b/models/auth/twofactor.go
index 51061e5205..d0c341a192 100644
--- a/models/auth/twofactor.go
+++ b/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"
)
diff --git a/models/migrations/base/hash.go b/models/migrations/base/hash.go
index 0debec272b..00fd1efd4a 100644
--- a/models/migrations/base/hash.go
+++ b/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"
)
diff --git a/models/migrations/v1_14/v166.go b/models/migrations/v1_14/v166.go
index 78f33e8f9b..e5731582fd 100644
--- a/models/migrations/v1_14/v166.go
+++ b/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"
diff --git a/modules/auth/password/hash/pbkdf2.go b/modules/auth/password/hash/pbkdf2.go
index 9ff6d162fc..27382fedb8 100644
--- a/modules/auth/password/hash/pbkdf2.go
+++ b/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"
)
diff --git a/modules/avatar/hash.go b/modules/avatar/hash.go
index 4fc28a7739..50db9c1943 100644
--- a/modules/avatar/hash.go
+++ b/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
diff --git a/modules/avatar/identicon/identicon.go b/modules/avatar/identicon/identicon.go
index 9b7a2faf05..63926d5f19 100644
--- a/modules/avatar/identicon/identicon.go
+++ b/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
diff --git a/modules/base/tool.go b/modules/base/tool.go
index 19fb2c451f..168a2220b2 100644
--- a/modules/base/tool.go
+++ b/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.
diff --git a/modules/git/last_commit_cache.go b/modules/git/last_commit_cache.go
index 7c7baedd2f..5b62b90b27 100644
--- a/modules/git/last_commit_cache.go
+++ b/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
diff --git a/modules/lfs/content_store.go b/modules/lfs/content_store.go
index daf8c6cfdd..0d9c0c98ac 100644
--- a/modules/lfs/content_store.go
+++ b/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 (
diff --git a/modules/lfs/pointer.go b/modules/lfs/pointer.go
index 3e5bb8f91d..ebde20f826 100644
--- a/modules/lfs/pointer.go
+++ b/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 (
diff --git a/modules/secret/secret.go b/modules/secret/secret.go
index 9c2ecd181d..e70ae1839c 100644
--- a/modules/secret/secret.go
+++ b/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.
diff --git a/modules/util/keypair.go b/modules/util/keypair.go
index 97f2d9ebca..8b86c142af 100644
--- a/modules/util/keypair.go
+++ b/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
diff --git a/modules/util/keypair_test.go b/modules/util/keypair_test.go
index c9925f7988..c6f68c845a 100644
--- a/modules/util/keypair_test.go
+++ b/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"
)
diff --git a/routers/api/packages/chef/auth.go b/routers/api/packages/chef/auth.go
index 3aef8281a4..a790e9a363 100644
--- a/routers/api/packages/chef/auth.go
+++ b/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 (
diff --git a/routers/api/packages/maven/maven.go b/routers/api/packages/maven/maven.go
index 0b93382b01..5106395eb1 100644
--- a/routers/api/packages/maven/maven.go
+++ b/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 (
diff --git a/services/lfs/server.go b/services/lfs/server.go
index 62134b7d60..56714120ad 100644
--- a/services/lfs/server.go
+++ b/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.
diff --git a/services/mailer/token/token.go b/services/mailer/token/token.go
index aa7b567188..8a5a762d6b 100644
--- a/services/mailer/token/token.go
+++ b/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.
diff --git a/services/webhook/deliver.go b/services/webhook/deliver.go
index 8f728d3aa6..935981d29c 100644
--- a/services/webhook/deliver.go
+++ b/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
diff --git a/tests/integration/api_packages_chef_test.go b/tests/integration/api_packages_chef_test.go
index 4123c7216c..05545f11a6 100644
--- a/tests/integration/api_packages_chef_test.go
+++ b/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"
)
diff --git a/tests/integration/api_packages_container_test.go b/tests/integration/api_packages_container_test.go
index 509ad424e6..9ac6e5256b 100644
--- a/tests/integration/api_packages_container_test.go
+++ b/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"
)
diff --git a/tests/integration/api_packages_test.go b/tests/integration/api_packages_test.go
index 8c981566b6..daf32e82f9 100644
--- a/tests/integration/api_packages_test.go
+++ b/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"
)
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-26 04:42:14 +0000