mirrors
/
forgejo
mirror of
1
Fork 0
Code Issues Releases Activity

Replace deprecated `elliptic.Marshal` (#26800) 

In PR #26786, the Go version for golangci-lint is bumped to 1.21. This
causes the following error:

```
models/migrations/v1_16/v210.go:132:23: SA1019: elliptic.Marshal has been deprecated since Go 1.21: for ECDH, use the crypto/ecdh package. This function returns an encoding equivalent to that of PublicKey.Bytes in crypto/ecdh. (staticcheck)
                                        PublicKey:       elliptic.Marshal(elliptic.P256(), parsed.PubKey.X, parsed.PubKey.Y),
```

The change now uses [func (*PublicKey)
ECDH](https://pkg.go.dev/crypto/ecdsa#PublicKey.ECDH), which is added in
Go 1.20.
This commit is contained in:
Chongyi Zheng 2023-08-29 16:19:40 -04:00 committed by GitHub
parent 438c7642c7
commit 2d9249b6d9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
models/migrations/v1_16/v210.go
View File

@ -4,7 +4,6 @@
package v1_16 //nolint package v1_16 //nolint
import ( import (
"crypto/elliptic"
"encoding/base32" "encoding/base32"
"fmt" "fmt"
"strings" "strings"
@ -123,13 +122,17 @@ func RemigrateU2FCredentials(x *xorm.Engine) error {
if err != nil { if err != nil {
continue continue
} }
pubKey, err := parsed.PubKey.ECDH()
if err != nil {
continue
}
remigrated := &webauthnCredential{ remigrated := &webauthnCredential{
ID: reg.ID, ID: reg.ID,
Name: reg.Name, Name: reg.Name,
LowerName: strings.ToLower(reg.Name), LowerName: strings.ToLower(reg.Name),
UserID: reg.UserID, UserID: reg.UserID,
CredentialID: base32.HexEncoding.EncodeToString(parsed.KeyHandle), CredentialID: base32.HexEncoding.EncodeToString(parsed.KeyHandle),
PublicKey: elliptic.Marshal(elliptic.P256(), parsed.PubKey.X, parsed.PubKey.Y), PublicKey: pubKey.Bytes(),
AttestationType: "fido-u2f", AttestationType: "fido-u2f",
AAGUID: []byte{}, AAGUID: []byte{},
SignCount: reg.Counter, SignCount: reg.Counter,