Conjure merge to Master #50
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…nclusion/exclusion
… naming conventions
This change replaces all old links to sergeyfrolov/gotapdance with refraction-networking/gotapdance
* added secret value and removed tests which run forever. testing travis pipeline * adding forgotten files to commit * commented out failing test * linter fixes * Trying 18.04 bionic for build with newer openssl * possible issue fix * fixing patch file for conjure build * fixing tapdance build * Clean Disable for tests
* added secret value and removed tests which run forever. testing travis pipeline * adding forgotten files to commit * commented out failing test * linter fixes * Trying 18.04 bionic for build with newer openssl * possible issue fix * fixing patch file for conjure build * fixing tapdance build * Clean Disable for tests * digest ClientConf of current branch into Psiphon Android App. * Added Psiphon Specific comments * Small fixes
* added secret value and removed tests which run forever. testing travis pipeline * adding forgotten files to commit * commented out failing test * linter fixes * Trying 18.04 bionic for build with newer openssl * possible issue fix * fixing patch file for conjure build * fixing tapdance build * Clean Disable for tests * digest ClientConf of current branch into Psiphon Android App. * Added Psiphon Specific comments * Small fixes * Adding Specific commit checkout for building psiphon library and apk * trying older commit * possible fix for build problems based on govendor issues. * accomodating relics of sergeyfrolov/gotapdance repo in Psiphon * testing newer psiphon system commit
…ble. -- not fully working
* addressing issue #38 by moving ed25519 code locally to keep elligator working as the original repo is no longer suppoting it. * corrected github links that I missed * missed one * fix sed issue in build * applying patch for bit leak from pull request * TestObfuscationRandomness test was not passing with patch applied * attempted hot patch for missing go dependencies in build pipeline * simple elligator util * fix -b representation issue * Debug travis docker golang problems * cleanup tools for build reasons * bit always zero in test -> expected behavior for now * added debug logging reasons for failed registration connections Co-authored-by: Eric Wustrow <ewust@colorado.edu>
* trying build with latest releases of psiphon code * build breaking on docker build * build breaking because of go libs available during build * build breaking because of gomobile is failing * stupid mistake * back to basics * packages not pulled * should new be getting utls dependencies * maybe I was overwriting the gomobile in the psiabdroid image * missing utls dependecies in refraction/psiandroid * go get all refraction-networking dependencies inside of the psiandroid docker image * removed dependence on /android-sdk-linux/tools/bin/sdkmanager which is (unexplainably) missing from the latest psiandroid image build * accepting licenses because sdkmanager IS GONE FOR SOME REASON * Still missing some licenses for unknown reason * accepting license that makes it work locally? * added comments with warnings and uncommented all other build stages to run a full build again. * missed one line
* Basic registration API start * Send shared secret, FSP, VSP in payload * Simplify client-to-API payload * Don't copy protobuf structs * Add support for retries, fallback to API registration * Change APIRegistrar HTTP.Client to pointer * Use API registration in Psiphon app * Fix typo in Psiphon patch * Add test for APIRegistrar * Bump connection delay to 750ms * Make sure to close response body, even when empty * Increase CLI connection delay to 750ms * Fix endpoint in Psiphon patch * Use specified TCPDialer for registration * Move flags from FSP to C2S
* test build with alternative psiphon tunnel core branch * issue 1 - the way the branch was pulled * moving to github for psiphon android build * add email to myself for failing builds in major branches * config parsing correction * correct config error * testing solution to issue #32 * revert testing change involving partner library git tag/version
* Basic registration API start * Send shared secret, FSP, VSP in payload * Simplify client-to-API payload * Don't copy protobuf structs * Add support for retries, fallback to API registration * Change APIRegistrar HTTP.Client to pointer * Use API registration in Psiphon app * Fix typo in Psiphon patch * Add test for APIRegistrar * Bump connection delay to 750ms * Make sure to close response body, even when empty * Increase CLI connection delay to 750ms * Fix endpoint in Psiphon patch * Use specified TCPDialer for registration * Add obfs4 support * Move flags from FSP to C2S * Remove stutter in transport names * Fix support for NullTransport * Default to MinTransport * Correct test to specify transport
* Add registration source field to ZMQPayload * resolving differences in generated protobuf go source file * updating signaling protobuf golang library Co-authored-by: jmwample <jack.wampler@colorado.edu> Co-authored-by: Jack Wampler <jmwample@users.noreply.github.com>
* build issues * trying build with update all SDK packages * trying build with update wildcard filtered SDK packages * seeing if the new lts psiphon core fixes build issues * missed some docker tags * trying more filtering * trying more filtering * naming test conjure apk
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Merging Conjure code into the production branch for integrating. This will allow tracking of merge issues, and collect future features to fully complete integration.