Prevents disabling gossip keyring file from disabling gossip encryption. #3278

slackpad · 2017-07-15T05:58:45Z

kyhavlov

Looks good, should we have a test with an existing keyring file and DisableKeyringFile = true to override it with a different key?

Fixes #3243.

slackpad · 2017-07-17T19:11:31Z

@kyhavlov thanks for the review - I rebased and will add the requested test.

slackpad force-pushed the issue-3243 branch 2 times, most recently from 10c802e to 0e6aa4f Compare July 15, 2017 07:10

slackpad requested a review from kyhavlov July 15, 2017 07:10

slackpad changed the title ~~Fixes in-memory keyring initialization so gossip encryption still works.~~ Prevents disabling gossip keyring file from disabling gossip encryption. Jul 15, 2017

kyhavlov reviewed Jul 17, 2017

View reviewed changes

Fixes in-memory keyring initialization so gossip encryption still works.

19c8dfe

Fixes #3243.

slackpad force-pushed the issue-3243 branch from 0e6aa4f to 19c8dfe Compare July 17, 2017 19:10

slackpad added 2 commits July 17, 2017 12:36

Adds a positive check for the loaded key.

793c145

Converts to subtests and adds a test to make sure files are ignored.

ea02b73

slackpad merged commit fff0f96 into master Jul 17, 2017

slackpad deleted the issue-3243 branch July 17, 2017 19:48

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Prevents disabling gossip keyring file from disabling gossip encryption. #3278

Prevents disabling gossip keyring file from disabling gossip encryption. #3278

slackpad commented Jul 15, 2017

kyhavlov left a comment

slackpad commented Jul 17, 2017

Prevents disabling gossip keyring file from disabling gossip encryption. #3278

Prevents disabling gossip keyring file from disabling gossip encryption. #3278

Conversation

slackpad commented Jul 15, 2017

kyhavlov left a comment

Choose a reason for hiding this comment

slackpad commented Jul 17, 2017