Skip to content

Commit 7307422

Browse files
authored
upgrade go-crypto from 1.1.4 to 1.1.6 (#33745) (#33754)
1 parent 8939c38 commit 7307422

File tree

3 files changed

+6
-9
lines changed

3 files changed

+6
-9
lines changed

Makefile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -508,8 +508,7 @@ unit-test-coverage:
508508
tidy:
509509
$(eval MIN_GO_VERSION := $(shell grep -Eo '^go\s+[0-9]+\.[0-9.]+' go.mod | cut -d' ' -f2))
510510
$(GO) mod tidy -compat=$(MIN_GO_VERSION)
511-
# disabled because of issues related to https://github.com/google/go-licenses/issues/128
512-
# @$(MAKE) --no-print-directory $(GO_LICENSE_FILE)
511+
$(MAKE) --no-print-directory $(GO_LICENSE_FILE)
513512

514513
vendor: go.mod go.sum
515514
$(GO) mod vendor
@@ -528,7 +527,7 @@ tidy-check: tidy
528527
go-licenses: $(GO_LICENSE_FILE)
529528

530529
$(GO_LICENSE_FILE): go.mod go.sum
531-
-$(GO) run $(GO_LICENSES_PACKAGE) save . --force --save_path=$(GO_LICENSE_TMP_DIR)
530+
-$(GO) run $(GO_LICENSES_PACKAGE) save . --force --save_path=$(GO_LICENSE_TMP_DIR) 2>/dev/null
532531
$(GO) run build/generate-go-licenses.go $(GO_LICENSE_TMP_DIR) $(GO_LICENSE_FILE)
533532
@rm -rf $(GO_LICENSE_TMP_DIR)
534533

go.mod

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
module code.gitea.io/gitea
22

3-
go 1.23.0
4-
5-
toolchain go1.23.6
3+
go 1.23.6
64

75
// rfc5280 said: "The serial number is an integer assigned by the CA to each certificate."
86
// But some CAs use negative serial number, just relax the check. related:
@@ -26,7 +24,7 @@ require (
2624
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.16.0
2725
github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.4.1
2826
github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358
29-
github.com/ProtonMail/go-crypto v1.1.4
27+
github.com/ProtonMail/go-crypto v1.1.6
3028
github.com/PuerkitoBio/goquery v1.10.0
3129
github.com/SaveTheRbtz/zstd-seekable-format-go/pkg v0.7.3
3230
github.com/alecthomas/chroma/v2 v2.15.0

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,8 @@ github.com/Masterminds/sprig/v3 v3.3.0/go.mod h1:Zy1iXRYNqNLUolqCpL4uhk6SHUMAOSC
7171
github.com/Microsoft/go-winio v0.5.2/go.mod h1:WpS1mjBmmwHBEWmogvA2mj8546UReBk4v8QkMxJ6pZY=
7272
github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY=
7373
github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU=
74-
github.com/ProtonMail/go-crypto v1.1.4 h1:G5U5asvD5N/6/36oIw3k2bOfBn5XVcZrb7PBjzzKKoE=
75-
github.com/ProtonMail/go-crypto v1.1.4/go.mod h1:rA3QumHc/FZ8pAHreoekgiAbzpNsfQAosU5td4SnOrE=
74+
github.com/ProtonMail/go-crypto v1.1.6 h1:ZcV+Ropw6Qn0AX9brlQLAUXfqLBc7Bl+f/DmNxpLfdw=
75+
github.com/ProtonMail/go-crypto v1.1.6/go.mod h1:rA3QumHc/FZ8pAHreoekgiAbzpNsfQAosU5td4SnOrE=
7676
github.com/PuerkitoBio/goquery v1.10.0 h1:6fiXdLuUvYs2OJSvNRqlNPoBm6YABE226xrbavY5Wv4=
7777
github.com/PuerkitoBio/goquery v1.10.0/go.mod h1:TjZZl68Q3eGHNBA8CWaxAN7rOU1EbDz3CWuolcO5Yu4=
7878
github.com/RoaringBitmap/roaring v0.4.23/go.mod h1:D0gp8kJQgE1A4LQ5wFLggQEyvDi06Mq5mKs52e1TwOo=

0 commit comments

Comments
 (0)