Switch golang.org/x/crypto to gravitational fork #19579
Conversation
jakule
force-pushed
the
jakule/switch-crypto-fork
branch
from
078feec to
1f4d3d1
Compare
github-actions
bot
added
machine-id
size/sm
tsh
| @@ -371,4 +366,6 @@ replace ( | |||
| github.com/pkg/sftp => github.com/gravitational/sftp v1.13.6-0.20220927202521-0e74d42f8055 | |||
| github.com/sirupsen/logrus => github.com/gravitational/logrus v1.4.4-0.20210817004754-047e20245621 | |||
| github.com/vulcand/predicate => github.com/gravitational/predicate v1.3.0 | |||
| // Use our internal crypto fork, to work around the issue with OpenSSH <= 7.6 mentioned here: https://github.com/golang/go/issues/53391 | |||
There was a problem hiding this comment.
Do we have an issue somewhere to track reverting this change once this issue has been resolved upstream?
|
@fspmarshall Friendly ping. |
|
cc @rosstimothy for awareness - we'll have to keep our fork up to date as upstream changes |
|
Does this change allow us to update dependencies which in turn depend on > |
There was a problem hiding this comment.
Could you update the following files as well?
-
api/go.mod -> needs the same replace as base go.mod, and it has the same "do not update" warning (https://github.com/gravitational/teleport/blob/master/api/go.mod#L32-L36).
-
.github/dependabot.yml -> please move crypto to the forked/replaced section (https://github.com/gravitational/teleport/blob/master/.github/dependabot.yml#L19), for both go.mod and api/go.mod entries.
@rosstimothy Yes, with this change, we can use |
jakule
force-pushed
the
jakule/switch-crypto-fork
branch
from
200c4cb to
9fa7a16
Compare
Missing dependabot.yml? |
jakule
force-pushed
the
jakule/switch-crypto-fork
branch
from
9fa7a16 to
981e541
Compare
|
@codingllama Sorry, I missed that. Fixed 981e541 |
jakule
force-pushed
the
jakule/switch-crypto-fork
branch
from
af165c5 to
5c73691
Compare
This PR switches Teleport from using
golang.org/x/cryptoto our internal forkgithub.aaakk.us.kg/gravitational/cryptoto work around the issue with OpenSSH < 7.6.Recently, Go crypto added support for OpenSSH 8.5+ golang/crypto@6fad3df, but they also broke the older OpenSSH compatibility. Our fork works with older and "modern" OpenSSH, including this gravitational/crypto@903e656 change (not yet available upstream).
Closes #10918
Closes #17197
Closes #17046