Skip to content

chore(eap-noob): use slices.Contains instead of a hand-rolled helper #110

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
woodsonl wants to merge 1 commit into from
Closed

chore(eap-noob): use slices.Contains instead of a hand-rolled helper #110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions services/eap-noob/helpers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,6 @@ import (

func intp(i int) *int { return &i }

func containsInt(s []int, v int) bool {
for _, x := range s {
if x == v {
return true
}
}
return false
}

// newPeerId generates a fresh, unguessable 16-byte identifier base64url-encoded
// to a 22-character string (RFC 9140, Section 3.3.1).
func newPeerId() (string, error) {
Expand Down
5 changes: 3 additions & 2 deletions services/eap-noob/peer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
"crypto/rand"
"encoding/json"
"fmt"
"slices"
)

// PeerConfig configures the EAP peer role.
Expand Down Expand Up @@ -406,7 +407,7 @@ func (p *Peer) fail(code int, info string) (Outcome, error) {
func bestVersion(serverVers, peerVers []int) (int, bool) {
best, ok := 0, false
for _, v := range serverVers {
if containsInt(peerVers, v) && v >= best {
if slices.Contains(peerVers, v) && v >= best {
best, ok = v, true
}
}
Expand All @@ -415,7 +416,7 @@ func bestVersion(serverVers, peerVers []int) (int, bool) {

func firstSupported(serverCS, peerCS []int) (int, bool) {
for _, c := range serverCS {
if containsInt(peerCS, c) && isSupportedCryptosuite(c) {
if slices.Contains(peerCS, c) && isSupportedCryptosuite(c) {
return c, true
}
}
Expand Down
5 changes: 3 additions & 2 deletions services/eap-noob/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
"crypto/rand"
"encoding/json"
"fmt"
"slices"
)

// ServerConfig configures the EAP server role.
Expand Down Expand Up @@ -192,14 +193,14 @@ func (s *Server) onNegotiation(wm *wireMessage) (Outcome, error) {
if err != nil {
return s.fail(ErrInvalidData, "bad Verp")
}
if !containsInt(s.cfg.Versions, verp) {
if !slices.Contains(s.cfg.Versions, verp) {
return s.fail(ErrUnsupportedVersion, "peer selected unsupported version")
}
csp, err := rawToInt(wm.Cryptosuitep)
if err != nil {
return s.fail(ErrInvalidData, "bad Cryptosuitep")
}
if !containsInt(s.cfg.Cryptosuites, csp) || !isSupportedCryptosuite(csp) {
if !slices.Contains(s.cfg.Cryptosuites, csp) || !isSupportedCryptosuite(csp) {
return s.fail(ErrUnsupportedCryptosuite, "peer selected unsupported cryptosuite")
}
dirp, err := rawToInt(wm.Dirp)
Expand Down