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

Add sha2 support #596

Merged
merged 7 commits into from Nov 2, 2015
Merged

Conversation

GuyShaanan
Copy link

This adds SHA-256 support based on a fork of 'zamiam69:add_sha2_support'.
This commit fixes the problem with the fork where you can't connect using SHA1 anymore.
The fix changes the '_preferred_macs' and '_preferred_kex' order.

zamiam69 and others added 7 commits July 15, 2014 12:22
…add_sha2_support

Conflicts:
	paramiko/transport.py
- let _compute_key default default to sha1 if local_mac is not set
  instead of setting local_mac explicitly in the unit test
- add tests for KexGexSHA256
Conflicts:
	paramiko/transport.py
	tests/test_transport.py
…rt'.

This commit fixes the problem with the fork where you can't connect using SHA1 anymore.
The fix changes the '_preferred_macs' and '_preferred_kex' order.
bitprophet added a commit that referenced this pull request Nov 2, 2015
Will expand to include SHA512 stuff if I merge that prior to release.
@bitprophet bitprophet merged commit 53e91cc into paramiko:master Nov 2, 2015
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.

None yet

4 participants