Skip to content

Conversation

virvum
Copy link

@virvum virvum commented Oct 30, 2017

Add new configuration keys SSH_SERVER_KEY_EXCHANGES and SSH_SERVER_MACS in order to configure key exchange algorithm and MAC suite.

Copy link
Member

@lafriks lafriks left a comment

Choose a reason for hiding this comment

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

@lafriks lafriks added the type/enhancement An improvement of existing functionality label Oct 30, 2017
@lafriks lafriks added this to the 1.x.x milestone Oct 30, 2017
@virvum
Copy link
Author

virvum commented Oct 30, 2017

@lafriks done

@tboerger tboerger added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Oct 30, 2017
@codecov-io
Copy link

codecov-io commented Oct 30, 2017

Codecov Report

Merging #2806 into master will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master    #2806   +/-   ##
=======================================
  Coverage   26.84%   26.84%           
=======================================
  Files          89       89           
  Lines       17608    17608           
=======================================
  Hits         4727     4727           
  Misses      12195    12195           
  Partials      686      686

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update d94e2a1...065b5b9. Read the comment docs.

@lafriks
Copy link
Member

lafriks commented Oct 31, 2017

LGTM

@tboerger tboerger added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Oct 31, 2017
if len(serverCiphers) > 0 {
SSH.ServerCiphers = serverCiphers
}
serverKeyExchanges := sec.Key("SSH_SERVER_KEY_EXCHANGES").Strings(",")
Copy link
Member

@sapk sapk Nov 2, 2017

Choose a reason for hiding this comment

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

~~~For example if SSH_SERVER_KEY_EXCHANGES is not set. serverKeyExchanges = "," -> len(serverKeyExchanges) > 0 == true~~~

Copy link
Member

@sapk sapk Nov 2, 2017

Choose a reason for hiding this comment

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

Sorry misread ... the .Strings

Copy link
Member

@sapk sapk left a comment

Choose a reason for hiding this comment

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

@sapk
Copy link
Member

sapk commented Nov 2, 2017

LGTM

@tboerger tboerger added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Nov 2, 2017
@lunny lunny modified the milestones: 1.x.x, 1.3.0 Nov 2, 2017
@lunny lunny merged commit eecaba2 into go-gitea:master Nov 2, 2017
@go-gitea go-gitea locked and limited conversation to collaborators Nov 23, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. type/enhancement An improvement of existing functionality
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants