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.

Sign up for GitHub

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

Jump to bottom

[#8966] Adding curve25519 and ed25519 #644

Closed
wants to merge 105 commits into from
Closed

[#8966] Adding curve25519 and ed25519 #644

wants to merge 105 commits into from

Commits on Jul 27, 2016

  1. Adding ECDSA to SSH.

    @the0id
    the0id committed Jul 27, 2016
    Copy the full SHA
    533584f View commit details
    Browse the repository at this point in the history

  2. Commiting in progress changes for ECDH host key verification.

    @the0id
    the0id committed Jul 27, 2016
    Copy the full SHA
    5a6533d View commit details
    Browse the repository at this point in the history

Commits on Jul 28, 2016

  1. Updating knownhosts.py to correctly store ECDSA keys in the known_hos… 

    …ts file.
    @the0id
    the0id committed Jul 28, 2016
    Copy the full SHA
    9d00b8e View commit details
    Browse the repository at this point in the history

  2. Merging branches.

    @the0id
    the0id committed Jul 28, 2016
    Copy the full SHA
    ab0575c View commit details
    Browse the repository at this point in the history

  3. Updating the fingerprint prompt to correctly reflect the type of key … 

    …being presented. Updating the topfile.
    @the0id
    the0id committed Jul 28, 2016
    Copy the full SHA
    4c45ef9 View commit details
    Browse the repository at this point in the history

  4. Adding in ECDH, ECDSA, and Curve25519 to Conch. 

    Curve25519 is not supported by Cryptography, so pynacl and curve25519-donna are required.
This has the same ECDSA issue as the other branch does that it is mostly, but not completely stable.
    @the0id
    the0id committed Jul 28, 2016
    Copy the full SHA
    d242c0d View commit details
    Browse the repository at this point in the history

Commits on Jul 29, 2016

  1. Merge branch 'trunk' into 8370-the0id-sshECDSA

    @the0id
    the0id committed Jul 29, 2016
    Copy the full SHA
    adacce5 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'trunk' into 8370-the0id-sshEC-plus-Curve25519

    @the0id
    the0id committed Jul 29, 2016
    Copy the full SHA
    7917dd1 View commit details
    Browse the repository at this point in the history

  3. Added an additional keyType check that was not needed afterall.

    @the0id
    the0id committed Jul 29, 2016
    Copy the full SHA
    371194a View commit details
    Browse the repository at this point in the history

  4. Improved displaying the correct key type for the fingerprint, and upd… 

    …ated the key type for curve 25519.
    @the0id
    the0id committed Jul 29, 2016
    Copy the full SHA
    dcfa9fe View commit details
    Browse the repository at this point in the history

Commits on Aug 11, 2016

  1. Merging the updates to the trunk and ECH-redux.

    @the0id
    the0id committed Aug 11, 2016
    Copy the full SHA
    ed7d9c2 View commit details
    Browse the repository at this point in the history

  2. Starting merge, keys.py still needs to be merged.

    @the0id
    the0id committed Aug 11, 2016
    Copy the full SHA
    14739cb View commit details
    Browse the repository at this point in the history

  3. Uncommenting error check.

    @the0id
    the0id committed Aug 11, 2016
    Copy the full SHA
    e975fe6 View commit details
    Browse the repository at this point in the history

  4. Readding the base64 import in keys.py and removing the commeneded out… 

    … error cehcking in transport.py
    @the0id
    the0id committed Aug 11, 2016
    Copy the full SHA
    1690041 View commit details
    Browse the repository at this point in the history

Commits on Aug 26, 2016

  1. Merging trunk.

    @the0id
    the0id committed Aug 26, 2016
    Copy the full SHA
    a328e0a View commit details
    Browse the repository at this point in the history

  2. Fixed why ECDSA was broken, and removing MSG_KEX_ECH+DH_* because the… 

    …y broke a test for an unknown reason.
    @the0id
    the0id committed Aug 26, 2016
    Copy the full SHA
    2537d70 View commit details
    Browse the repository at this point in the history

  3. Merging from upstream, and from ECDSA to incorprate the fix to ECDSA … 

    …into this branch.
    @the0id
    the0id committed Aug 26, 2016
    Copy the full SHA
    7cf2da5 View commit details
    Browse the repository at this point in the history

Commits on Sep 13, 2016

  1. Merge branch 'trunk' into 8370-the0id-sshEC-plus-Curve25519

    @the0id
    the0id committed Sep 13, 2016
    Copy the full SHA
    db4ea11 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'trunk' into 8370-the0id-sshECDSA

    @the0id
    the0id committed Sep 13, 2016
    Copy the full SHA
    0441e1f View commit details
    Browse the repository at this point in the history

Commits on Sep 14, 2016

  1. Merging.

    @the0id
    the0id committed Sep 14, 2016
    Copy the full SHA
    6426aa8 View commit details
    Browse the repository at this point in the history

  2. Merge branch '8370-the0id-sshECDSA' into 8370-the0id-sshEC-plus-Curve… 

    …25519
    @the0id
    the0id committed Sep 14, 2016
    Copy the full SHA
    1eac606 View commit details
    Browse the repository at this point in the history

Commits on Oct 26, 2016

  1. Partial merge.

    @the0id
    the0id committed Oct 26, 2016
    Copy the full SHA
    81ffd78 View commit details
    Browse the repository at this point in the history

  2. Trying to make things work for python2 and python3. Added a return af… 

    …ter sendDisconnect.
    @the0id
    the0id committed Oct 26, 2016
    Copy the full SHA
    4baca28 View commit details
    Browse the repository at this point in the history

  3. A better way to handle sendDisconnect.

    @the0id
    the0id committed Oct 26, 2016
    Copy the full SHA
    e644d74 View commit details
    Browse the repository at this point in the history

Commits on Oct 27, 2016

  1. Removing b's in front of string compares.

    @the0id
    the0id committed Oct 27, 2016
    Copy the full SHA
    a97ae6e View commit details
    Browse the repository at this point in the history

  2. Merge branch 'trunk' into 8370-the0id-sshEC-plus-Curve25519

    @the0id
    the0id committed Oct 27, 2016
    Copy the full SHA
    e7f564b View commit details
    Browse the repository at this point in the history

Commits on Oct 28, 2016

  1. Merge branch 'trunk' into 8370-the0id-sshEC-plus-Curve25519

    user committed Oct 28, 2016
    Copy the full SHA
    06fedc4 View commit details
    Browse the repository at this point in the history

  2. Fixing Python3 related errors.

    user committed Oct 28, 2016
    Copy the full SHA
    862d23a View commit details
    Browse the repository at this point in the history

Commits on Oct 31, 2016

  1. Merge branch 'trunk' into 8370-the0id-sshEC-plus-Curve25519

    @the0id
    the0id committed Oct 31, 2016
    Copy the full SHA
    301f634 View commit details
    Browse the repository at this point in the history

  2. Removing some b's from strings.

    @the0id
    the0id committed Oct 31, 2016
    Copy the full SHA
    6b76f7d View commit details
    Browse the repository at this point in the history

Commits on Nov 14, 2016

  1. Fixing merge conflicts.

    @the0id
    the0id committed Nov 14, 2016
    Copy the full SHA
    127443b View commit details
    Browse the repository at this point in the history

Commits on Nov 16, 2016

  1. Fixed merge conflict.

    @the0id
    the0id committed Nov 16, 2016
    Copy the full SHA
    d5951d7 View commit details
    Browse the repository at this point in the history

  2. Merge branch '8370-the0id-sshECH-redux' into 8370-the0id-sshEC-plus-C… 

    …urve25519
    @the0id
    the0id committed Nov 16, 2016
    Copy the full SHA
    4419508 View commit details
    Browse the repository at this point in the history

Commits on Nov 21, 2016

  1. Merging and removed a broken test.

    @the0id
    the0id committed Nov 21, 2016
    Copy the full SHA
    a036d0e View commit details
    Browse the repository at this point in the history

Commits on Nov 29, 2016

  1. Merge remote-tracking branch 'upstream/trunk' into trunk

    @the0id
    the0id committed Nov 29, 2016
    Copy the full SHA
    8e7963c View commit details
    Browse the repository at this point in the history

  2. Merge branch 'trunk' into 8370-the0id-sshEC-plus-Curve25519

    @the0id
    the0id committed Nov 29, 2016
    Copy the full SHA
    9b23d4e View commit details
    Browse the repository at this point in the history

Commits on Dec 5, 2016

  1. Changing pynacl to the more lightweight ed25519 module.

    @the0id
    the0id committed Dec 5, 2016
    Copy the full SHA
    45cda7e View commit details
    Browse the repository at this point in the history

  2. Adding ed25519 and curve25519 as requirements for conch.

    @the0id
    the0id committed Dec 5, 2016
    Copy the full SHA
    cdebfb8 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'upstream/trunk' into trunk

    @the0id
    the0id committed Dec 5, 2016
    Copy the full SHA
    8ba2dc7 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'trunk' into 8370-the0id-sshEC-plus-Curve25519

    @the0id
    the0id committed Dec 5, 2016
    Copy the full SHA
    d5cdc94 View commit details
    Browse the repository at this point in the history

Commits on Dec 7, 2016

  1. Merge remote-tracking branch 'upstream/trunk' into trunk

    @the0id
    the0id committed Dec 7, 2016
    Copy the full SHA
    7177879 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'trunk' into 8370-the0id-sshEC-plus-Curve25519

    @the0id
    the0id committed Dec 7, 2016
    Copy the full SHA
    2394907 View commit details
    Browse the repository at this point in the history

Commits on Dec 8, 2016

  1. Merge remote-tracking branch 'upstream/trunk' into trunk

    @the0id
    the0id committed Dec 8, 2016
    Copy the full SHA
    d163064 View commit details
    Browse the repository at this point in the history

Commits on Dec 9, 2016

  1. Merge remote-tracking branch 'upstream/trunk' into trunk

    @the0id
    the0id committed Dec 9, 2016
    Copy the full SHA
    8ce0a98 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'trunk' into 8370-the0id-sshEC-plus-Curve25519

    @the0id
    the0id committed Dec 9, 2016
    Copy the full SHA
    8fe14ca View commit details
    Browse the repository at this point in the history

Commits on Dec 12, 2016

  1. Merge remote-tracking branch 'upstream/trunk' into trunk

    @the0id
    the0id committed Dec 12, 2016
    Copy the full SHA
    17fcb4d View commit details
    Browse the repository at this point in the history

Commits on Dec 19, 2016

  1. Better printing for ED25519 keys.

    @the0id
    the0id committed Dec 19, 2016
    Copy the full SHA
    d05c627 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/trunk' into trunk

    @the0id
    the0id committed Dec 19, 2016
    Copy the full SHA
    79c0629 View commit details
    Browse the repository at this point in the history

Commits on Dec 23, 2016

  1. Changing the curve25519 and ed25519 libraries to pynacl, and making 2… 

    …5519 work.
    @the0id
    the0id committed Dec 23, 2016
    Copy the full SHA
    d0dc8f0 View commit details
    Browse the repository at this point in the history

  2. Finishing merge.

    @the0id
    the0id committed Dec 23, 2016
    Copy the full SHA
    55eecad View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'upstream/trunk' into trunk

    @the0id
    the0id committed Dec 23, 2016
    Copy the full SHA
    9e1b0c4 View commit details
    Browse the repository at this point in the history

  4. Merging trunk.

    @the0id
    the0id committed Dec 23, 2016
    Copy the full SHA
    ede50e5 View commit details
    Browse the repository at this point in the history

  5. Updating _setup.py to use pynacl.

    @the0id
    the0id committed Dec 23, 2016
    Copy the full SHA
    76a555e View commit details
    Browse the repository at this point in the history

  6. We meet again, txchecker.

    @the0id
    the0id committed Dec 23, 2016
    Copy the full SHA
    92d1c20 View commit details
    Browse the repository at this point in the history

  7. Your move, txchecker.

    @the0id
    the0id committed Dec 23, 2016
    Copy the full SHA
    ef564b7 View commit details
    Browse the repository at this point in the history

Commits on Jan 3, 2017

  1. Merge remote-tracking branch 'upstream/trunk' into trunk

    @the0id
    the0id committed Jan 3, 2017
    Copy the full SHA
    123cbb7 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'trunk' into 8370-the0id-sshEC-plus-Curve25519

    @the0id
    the0id committed Jan 3, 2017
    Copy the full SHA
    5d97561 View commit details
    Browse the repository at this point in the history

  3. Removing old debugging code.

    @the0id
    the0id committed Jan 3, 2017
    Copy the full SHA
    7fcc813 View commit details
    Browse the repository at this point in the history

  4. Removing more debug code.

    @the0id
    the0id committed Jan 3, 2017
    Copy the full SHA
    cb0fd7d View commit details
    Browse the repository at this point in the history

Commits on Jan 4, 2017

  1. Writing unit tests revealed some errors. Funny that.

    @the0id
    the0id committed Jan 4, 2017
    Copy the full SHA
    8193f22 View commit details
    Browse the repository at this point in the history

  2. Fixed python3 errors and how the ed25519 test key is created.

    @the0id
    the0id committed Jan 4, 2017
    Copy the full SHA
    e15fbcf View commit details
    Browse the repository at this point in the history

  3. Hello txchecker, my old friend

    @the0id
    the0id committed Jan 4, 2017
    Copy the full SHA
    0ee4847 View commit details
    Browse the repository at this point in the history

  4. Rolling back privateED25519 name change and removing unused import.

    @the0id
    the0id committed Jan 4, 2017
    Copy the full SHA
    5ecff86 View commit details
    Browse the repository at this point in the history

Commits on Jan 11, 2017

  1. Merge branch 'trunk' into 8370-the0id-sshEC-plus-Curve25519

    @the0id
    the0id committed Jan 11, 2017
    Copy the full SHA
    46b55c3 View commit details
    Browse the repository at this point in the history

Commits on Jan 17, 2017

  1. Cleaning up __repr__ some more.

    @the0id
    the0id committed Jan 17, 2017
    Copy the full SHA
    fd878f5 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'trunk' into 8370-the0id-sshEC-plus-Curve25519

    @the0id
    the0id committed Jan 17, 2017
    Copy the full SHA
    fa50600 View commit details
    Browse the repository at this point in the history

  3. Merge branch '8370-the0id-sshEC-plus-Curve25519' of https://github.co… 

    …m/the0id/twisted into 8370-the0id-sshEC-plus-Curve25519
    @the0id
    the0id committed Jan 17, 2017
    Copy the full SHA
    5c3e24d View commit details
    Browse the repository at this point in the history

Commits on Jan 18, 2017

  1. supportedPublicKeys got stomped.

    @the0id
    the0id committed Jan 18, 2017
    Copy the full SHA
    84fadce View commit details
    Browse the repository at this point in the history

  2. Merge branch 'trunk' into 8370-the0id-sshEC-plus-Curve25519

    @the0id
    the0id committed Jan 18, 2017
    Copy the full SHA
    c458149 View commit details
    Browse the repository at this point in the history

  3. Forgot to b all I can b.

    @the0id
    the0id committed Jan 18, 2017
    Copy the full SHA
    4891c1c View commit details
    Browse the repository at this point in the history

Commits on Jan 26, 2017

  1. Adding more unit tests, removing some redundant checks, and renaming … 

    …the ed25519 keys in keydata to make txchecker happy for now.
    @the0id
    the0id committed Jan 26, 2017
    Copy the full SHA
    912ce94 View commit details
    Browse the repository at this point in the history

  2. Missing variable renames. Fixing formatting.

    @the0id
    the0id committed Jan 26, 2017
    Copy the full SHA
    8a31eed View commit details
    Browse the repository at this point in the history

  3. Added docstring and removed unused variables.

    @the0id
    the0id committed Jan 26, 2017
    Copy the full SHA
    10107c1 View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'upstream/trunk' into 8370-the0id-sshEC-… 

    …plus-Curve25519
    @the0id
    the0id committed Jan 26, 2017
    Copy the full SHA
    bf24483 View commit details
    Browse the repository at this point in the history

Commits on Jan 27, 2017

  1. Fixed some printing errors and added more unit tests.

    @the0id
    the0id committed Jan 27, 2017
    Copy the full SHA
    a98d12d View commit details
    Browse the repository at this point in the history

  2. Adding topfile.

    @the0id
    the0id committed Jan 27, 2017
    Copy the full SHA
    23c7c89 View commit details
    Browse the repository at this point in the history

  3. txchecker

    @the0id
    the0id committed Jan 27, 2017
    Copy the full SHA
    e9a9337 View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'upstream/trunk' into 8370-the0id-sshEC-… 

    …plus-Curve25519
    @the0id
    the0id committed Jan 27, 2017
    Copy the full SHA
    7209bff View commit details
    Browse the repository at this point in the history

  5. Changing ed25519 keys to use hex printing. Fixed unit tests.

    @the0id
    the0id committed Jan 27, 2017
    Copy the full SHA
    97f42c1 View commit details
    Browse the repository at this point in the history

  6. Fixed a bug where the length of a DSA key was checked after keys.py t… 

    …ried to parse they key.
    @the0id
    the0id committed Jan 27, 2017
    Copy the full SHA
    60f66bd View commit details
    Browse the repository at this point in the history

  7. Added more unit tests.

    @the0id
    the0id committed Jan 27, 2017
    Copy the full SHA
    3623b7e View commit details
    Browse the repository at this point in the history

  8. It's just a step to the left.

    @the0id
    the0id committed Jan 27, 2017
    Copy the full SHA
    23594ee View commit details
    Browse the repository at this point in the history

  9. Petting codecov on the head and whispering that it's ok if there's no… 

    … extra value when printing ed25519 keys.
    @the0id
    the0id committed Jan 27, 2017
    Copy the full SHA
    efc6c90 View commit details
    Browse the repository at this point in the history

Commits on Jan 30, 2017

  1. Changing 25519 check.

    @the0id
    the0id committed Jan 30, 2017
    Copy the full SHA
    6779038 View commit details
    Browse the repository at this point in the history

Commits on Apr 6, 2017

  1. Merge branch 'trunk' into 8370-the0id-sshEC-plus-Curve25519

    @the0id
    the0id committed Apr 6, 2017
    Copy the full SHA
    28d22e5 View commit details
    Browse the repository at this point in the history

Commits on Apr 7, 2017

  1. Making pynacl an optional import and re-adding support for all RFC 56… 

    …56 recommended curves.
    @the0id
    the0id committed Apr 7, 2017
    Copy the full SHA
    2614f6b View commit details
    Browse the repository at this point in the history

  2. Using requireModule to check to see if nacl is installed.

    @the0id
    the0id committed Apr 7, 2017
    Copy the full SHA
    b60ebef View commit details
    Browse the repository at this point in the history

  3. Removing curves to match changes in current baseline.

    @the0id
    the0id committed Apr 7, 2017
    Copy the full SHA
    ed11e51 View commit details
    Browse the repository at this point in the history

  4. Missed requireModule in tests.

    @the0id
    the0id committed Apr 7, 2017
    Copy the full SHA
    4d051a5 View commit details
    Browse the repository at this point in the history

Commits on Apr 10, 2017

  1. Doing the optional 25519 tests the right way now I think.

    @the0id
    the0id committed Apr 10, 2017
    Copy the full SHA
    9379cb1 View commit details
    Browse the repository at this point in the history

  2. Removing extra lines.

    @the0id
    the0id committed Apr 10, 2017
    Copy the full SHA
    13943bb View commit details
    Browse the repository at this point in the history

Commits on Apr 11, 2017

  1. Adding a conch_no_25519 install option.

    @the0id
    the0id committed Apr 11, 2017
    Copy the full SHA
    0d3734b View commit details
    Browse the repository at this point in the history

  2. Adding new conch_no_25519 tox env.

    @the0id
    the0id committed Apr 11, 2017
    Copy the full SHA
    2fab0da View commit details
    Browse the repository at this point in the history

Commits on Apr 14, 2017

  1. Reordering the supportedPublicKeys list.

    @the0id
    the0id committed Apr 14, 2017
    Copy the full SHA
    7e09196 View commit details
    Browse the repository at this point in the history

  2. Adding conch_no_25519 to the envlist. Another stab in the dark at tox.

    @the0id
    the0id committed Apr 14, 2017
    Copy the full SHA
    5412fba View commit details
    Browse the repository at this point in the history

  3. I think I might be figuring this out. Might.

    @the0id
    the0id committed Apr 14, 2017
    Copy the full SHA
    dfaf53d View commit details
    Browse the repository at this point in the history

Commits on Apr 19, 2017

  1. Empty commit to run tests again.

    @the0id
    the0id committed Apr 19, 2017
    Copy the full SHA
    0fbed75 View commit details
    Browse the repository at this point in the history

  2. Adding a test to check if empty nacl classes are created when the nac… 

    …l module isn't available.
    @the0id
    the0id committed Apr 19, 2017
    Copy the full SHA
    82f51fa View commit details
    Browse the repository at this point in the history

Commits on Apr 20, 2017

  1. Specifying the deps for conch_no_25519.

    @the0id
    the0id committed Apr 20, 2017
    Copy the full SHA
    0346e41 View commit details
    Browse the repository at this point in the history

Commits on May 31, 2017

  1. Merge branch 'trunk' into 8370-the0id-sshEC-plus-Curve25519

    @the0id
    the0id committed May 31, 2017
    Copy the full SHA
    6edbd6e View commit details
    Browse the repository at this point in the history

  2. Making changes based on review feedback.

    @the0id
    the0id committed May 31, 2017
    Copy the full SHA
    66108c6 View commit details
    Browse the repository at this point in the history

Commits on Aug 18, 2017

  1. Merge branch 'trunk' into 8370-the0id-sshEC-plus-Curve25519

    @the0id
    the0id committed Aug 18, 2017
    Copy the full SHA
    13e8c1a View commit details
    Browse the repository at this point in the history

Commits on Aug 22, 2017

  1. Merge branch 'trunk' into 8370-the0id-sshEC-plus-Curve25519

    @the0id
    the0id committed Aug 22, 2017
    Copy the full SHA
    dcff015 View commit details
    Browse the repository at this point in the history

Commits on Aug 24, 2017

  1. Merge branch 'trunk' of https://github.com/twisted/twisted into 8370-… 

    …the0id-sshEC-plus-Curve25519
    @the0id
    the0id committed Aug 24, 2017
    Copy the full SHA
    380a324 View commit details
    Browse the repository at this point in the history

  2. Removing redundant imports from merge.

    @the0id
    the0id committed Aug 24, 2017
    Copy the full SHA
    85fd025 View commit details
    Browse the repository at this point in the history