Skip to content
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

Fix various bugs #25

Merged
merged 4 commits into from
Feb 27, 2017
Merged

Fix various bugs #25

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
242aeef
fix bugs
Feb 27, 2017
665f3a1
go-kit has moved to std lib Context. Fix build failure.
Feb 27, 2017
278f2c2
iOS 10 requires support for either SHA-1, SHA-256 or SHA-512 as CA ca…
Feb 27, 2017
fc31343
revert previous change to import of 'golang.org/x/net/context';
zhangchn Feb 27, 2017
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
8 changes: 3 additions & 5 deletions depot/file/depot.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,11 +369,9 @@ func loadKey(data []byte, password []byte) (*rsa.PrivateKey, error) {
return nil, errors.New("unmatched type or headers")
}

if password != "" {
b, err := x509.DecryptPEMBlock(pemBlock, password)
if err != nil {
return nil, err
}
b, err := x509.DecryptPEMBlock(pemBlock, password)
if err != nil {
return nil, err
}
return x509.ParsePKCS1PrivateKey(b)
}
Expand Down
2 changes: 1 addition & 1 deletion server/service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ type service struct {
}

func (svc service) GetCACaps(ctx context.Context) ([]byte, error) {
defaultCaps := []byte(`POSTPKIOperation`)
defaultCaps := []byte("SHA-1\nPOSTPKIOperation")
return defaultCaps, nil
}

Expand Down
2 changes: 1 addition & 1 deletion server/transport.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"github.com/go-kit/kit/endpoint"
kitlog "github.com/go-kit/kit/log"
kithttp "github.com/go-kit/kit/transport/http"
"golang.org/x/net/context"
"context"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't make this change. Even though go-kit has switched to stdlib context, we can't yet.
There are lots of places where we import "golang.org/x/net/context" in this project as well as other repositories in micromdm. It will take a bit of a coordinated effort to shift to stdlib context, and I'm not prepared to do it until go kit issues a 1.0.0 release in a few weeks.

Instead, use glide install to download the correct dependencies to the /vendor folder and the project should compile. The correct version of go-kit is already pinned in the lock file.

See https://github.com/Masterminds/glide

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would it be better if something like semver were incorporated to manage all the versioning constraints?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's what glide is for :)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure how familiar you are with Go, but the dependency management is not great. There's lots of tools glide, dep, godep, govendor etc which are all trying to manage versions.

)

// ServiceHandler is an HTTP Handler for a SCEP endpoint.
Expand Down