Skip to content

Commit b71d4c3

Browse files
GiteaBotKN4CK3R
andauthored
Fix RPM/Debian signature key creation (#28352) (#28353)
Backport #28352 by @KN4CK3R Fixes #28324 The name parameter can't contain some characters (https://github.com/keybase/go-crypto/blob/master/openpgp/keys.go#L680) but is optional. Therefore just use an empty string. Co-authored-by: KN4CK3R <[email protected]>
1 parent bf537ad commit b71d4c3

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

services/packages/debian/repository.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ func GetOrCreateKeyPair(ctx context.Context, ownerID int64) (string, string, err
6767
}
6868

6969
func generateKeypair() (string, string, error) {
70-
e, err := openpgp.NewEntity(setting.AppName, "Debian Registry", "", nil)
70+
e, err := openpgp.NewEntity("", "Debian Registry", "", nil)
7171
if err != nil {
7272
return "", "", err
7373
}

services/packages/rpm/repository.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import (
2222
"code.gitea.io/gitea/modules/json"
2323
packages_module "code.gitea.io/gitea/modules/packages"
2424
rpm_module "code.gitea.io/gitea/modules/packages/rpm"
25-
"code.gitea.io/gitea/modules/setting"
2625
"code.gitea.io/gitea/modules/util"
2726
packages_service "code.gitea.io/gitea/services/packages"
2827

@@ -68,7 +67,7 @@ func GetOrCreateKeyPair(ctx context.Context, ownerID int64) (string, string, err
6867
}
6968

7069
func generateKeypair() (string, string, error) {
71-
e, err := openpgp.NewEntity(setting.AppName, "RPM Registry", "", nil)
70+
e, err := openpgp.NewEntity("", "RPM Registry", "", nil)
7271
if err != nil {
7372
return "", "", err
7473
}
@@ -126,7 +125,7 @@ type packageData struct {
126125

127126
type packageCache = map[*packages_model.PackageFile]*packageData
128127

129-
// BuildSpecificRepositoryFiles builds metadata files for the repository
128+
// BuildRepositoryFiles builds metadata files for the repository
130129
func BuildRepositoryFiles(ctx context.Context, ownerID int64) error {
131130
pv, err := GetOrCreateRepositoryVersion(ctx, ownerID)
132131
if err != nil {

0 commit comments

Comments
 (0)