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.

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

jni: allow null as preshared key #229

Merged
merged 1 commit into from
Mar 3, 2022
Merged

jni: allow null as preshared key #229

merged 1 commit into from
Mar 3, 2022

Conversation

an-p
Copy link
Contributor

@an-p an-p commented Feb 24, 2022

Allows setting the arg_preshard_key argument for create_new_tunnel to null in order to create a tunnel without a preshared key.

Fixes #228.

@Noah-Kennedy
Copy link
Collaborator

@an-p the macos CI tests can sometimes fail spuriously. Looks like this is happening here. Could you push an empty commit to restart CI?

@an-p
Copy link
Contributor Author

an-p commented Feb 25, 2022

This doesn't seem to help. macOS arm64 tests keep timing out, probably because of this:

docker: unknown server OS: .
See 'docker run --help'.

@Noah-Kennedy
Copy link
Collaborator

@an-p I haven't had time to investigate, but this usually works, and only sometimes fails. I'd try one more time. If that fails I'm gonna remove this test from CI for the time being.

@Noah-Kennedy
Copy link
Collaborator

@an-p so I have good news and bad news. The good news is that we fixed the CI issues on the master branch, and all you need to do here is merge in those changes. The bad news is that there are some mean merge conflicts here, as we just split the crate into a workspace, which should have been done long ago.

@an-p
Copy link
Contributor Author

an-p commented Mar 3, 2022

I have rebased my PR on the latest master branch. All tests passed.

@Noah-Kennedy Noah-Kennedy merged commit 36f4e4b into cloudflare:master Mar 3, 2022
arvydasv pushed a commit to NordSecurity/boringtun that referenced this pull request Aug 1, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

jni: create_new_tunnel requires psk
2 participants