This repository has been archived by the owner on Jul 8, 2021. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 152
Conversation
This file contains 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
This looks fine offhand, but I'd like to get tests running in the ztls repo running before we make the switch. Can you add a .travis.yml there? If possible let's try to get this merged today to reduce confusion of having code in two places. @dadrian can you also take a look?
Zakir
…On Mar 3, 2017, 8:42 PM -0500, Alex Holland ***@***.***>, wrote:
Following from #243 (https://github.com/zmap/zgrab/issues/243) I moved ztls to zmap/ztls, removed it from zgrab, and updated the references in existing files
You can view, comment on, or merge this pull request online at:
#254
Commit Summary
remove ztls, change references
File Changes
M main.go (https://github.com/zmap/zgrab/pull/254/files#diff-0) (2)
M zlib/conn.go (https://github.com/zmap/zgrab/pull/254/files#diff-1) (2)
M zlib/grabber.go (https://github.com/zmap/zgrab/pull/254/files#diff-2) (2)
M zlib/grabber_test.go (https://github.com/zmap/zgrab/pull/254/files#diff-3) (2)
M zlib/zgrab.go (https://github.com/zmap/zgrab/pull/254/files#diff-4) (2)
M ztools/http/client_test.go (https://github.com/zmap/zgrab/pull/254/files#diff-5) (2)
M ztools/http/request.go (https://github.com/zmap/zgrab/pull/254/files#diff-6) (2)
M ztools/http/transport.go (https://github.com/zmap/zgrab/pull/254/files#diff-7) (2)
D ztools/ztls/alert.go (https://github.com/zmap/zgrab/pull/254/files#diff-8) (77)
D ztools/ztls/chacha20_poly1305.go (https://github.com/zmap/zgrab/pull/254/files#diff-9) (163)
D ztools/ztls/chacha20_poly1305_test.go (https://github.com/zmap/zgrab/pull/254/files#diff-10) (103)
D ztools/ztls/cipher_suites.go (https://github.com/zmap/zgrab/pull/254/files#diff-11) (1076)
D ztools/ztls/cipher_suites_test.go (https://github.com/zmap/zgrab/pull/254/files#diff-12) (47)
D ztools/ztls/common.go (https://github.com/zmap/zgrab/pull/254/files#diff-13) (1244)
D ztools/ztls/conn.go (https://github.com/zmap/zgrab/pull/254/files#diff-14) (1097)
D ztools/ztls/conn_test.go (https://github.com/zmap/zgrab/pull/254/files#diff-15) (106)
D ztools/ztls/example_test.go (https://github.com/zmap/zgrab/pull/254/files#diff-16) (57)
D ztools/ztls/generate_cert.go (https://github.com/zmap/zgrab/pull/254/files#diff-17) (117)
D ztools/ztls/handshake_client.go (https://github.com/zmap/zgrab/pull/254/files#diff-18) (1062)
D ztools/ztls/handshake_client_test.go (https://github.com/zmap/zgrab/pull/254/files#diff-19) (503)
D ztools/ztls/handshake_extensions.go (https://github.com/zmap/zgrab/pull/254/files#diff-20) (392)
D ztools/ztls/handshake_messages.go (https://github.com/zmap/zgrab/pull/254/files#diff-21) (1718)
D ztools/ztls/handshake_messages_test.go (https://github.com/zmap/zgrab/pull/254/files#diff-22) (251)
D ztools/ztls/handshake_server.go (https://github.com/zmap/zgrab/pull/254/files#diff-23) (809)
D ztools/ztls/handshake_server_test.go (https://github.com/zmap/zgrab/pull/254/files#diff-24) (866)
D ztools/ztls/handshake_test.go (https://github.com/zmap/zgrab/pull/254/files#diff-25) (167)
D ztools/ztls/key_agreement.go (https://github.com/zmap/zgrab/pull/254/files#diff-26) (740)
D ztools/ztls/poly1305.go (https://github.com/zmap/zgrab/pull/254/files#diff-27) (1540)
D ztools/ztls/prf.go (https://github.com/zmap/zgrab/pull/254/files#diff-28) (460)
D ztools/ztls/prf_test.go (https://github.com/zmap/zgrab/pull/254/files#diff-29) (128)
D ztools/ztls/testdata/Client-TLSv10-ClientCert-ECDSA-ECDSA (https://github.com/zmap/zgrab/pull/254/files#diff-30) (129)
D ztools/ztls/testdata/Client-TLSv10-ClientCert-ECDSA-RSA (https://github.com/zmap/zgrab/pull/254/files#diff-31) (125)
D ztools/ztls/testdata/Client-TLSv10-ClientCert-RSA-ECDSA (https://github.com/zmap/zgrab/pull/254/files#diff-32) (128)
D ztools/ztls/testdata/Client-TLSv10-ClientCert-RSA-RSA (https://github.com/zmap/zgrab/pull/254/files#diff-33) (124)
D ztools/ztls/testdata/Client-TLSv10-ECDHE-ECDSA-AES (https://github.com/zmap/zgrab/pull/254/files#diff-34) (87)
D ztools/ztls/testdata/Client-TLSv10-ECDHE-RSA-AES (https://github.com/zmap/zgrab/pull/254/files#diff-35) (97)
D ztools/ztls/testdata/Client-TLSv10-RSA-RC4 (https://github.com/zmap/zgrab/pull/254/files#diff-36) (83)
D ztools/ztls/testdata/Client-TLSv11-ECDHE-ECDSA-AES (https://github.com/zmap/zgrab/pull/254/files#diff-37) (89)
D ztools/ztls/testdata/Client-TLSv11-ECDHE-RSA-AES (https://github.com/zmap/zgrab/pull/254/files#diff-38) (99)
D ztools/ztls/testdata/Client-TLSv11-RSA-RC4 (https://github.com/zmap/zgrab/pull/254/files#diff-39) (83)
D ztools/ztls/testdata/Client-TLSv12-ClientCert-ECDSA-ECDSA (https://github.com/zmap/zgrab/pull/254/files#diff-40) (134)
D ztools/ztls/testdata/Client-TLSv12-ClientCert-ECDSA-RSA (https://github.com/zmap/zgrab/pull/254/files#diff-41) (127)
D ztools/ztls/testdata/Client-TLSv12-ClientCert-RSA-ECDSA (https://github.com/zmap/zgrab/pull/254/files#diff-42) (133)
D ztools/ztls/testdata/Client-TLSv12-ClientCert-RSA-RSA (https://github.com/zmap/zgrab/pull/254/files#diff-43) (126)
D ztools/ztls/testdata/Client-TLSv12-ClientFingerprint (https://github.com/zmap/zgrab/pull/254/files#diff-44) (106)
D ztools/ztls/testdata/Client-TLSv12-ECDHE-ECDSA-AES (https://github.com/zmap/zgrab/pull/254/files#diff-45) (89)
D ztools/ztls/testdata/Client-TLSv12-ECDHE-ECDSA-AES-GCM (https://github.com/zmap/zgrab/pull/254/files#diff-46) (84)
D ztools/ztls/testdata/Client-TLSv12-ECDHE-RSA-AES (https://github.com/zmap/zgrab/pull/254/files#diff-47) (99)
D ztools/ztls/testdata/Client-TLSv12-RSA-RC4 (https://github.com/zmap/zgrab/pull/254/files#diff-48) (83)
D ztools/ztls/testdata/Server-SSLv3-RSA-3DES (https://github.com/zmap/zgrab/pull/254/files#diff-49) (83)
D ztools/ztls/testdata/Server-SSLv3-RSA-AES (https://github.com/zmap/zgrab/pull/254/files#diff-50) (84)
D ztools/ztls/testdata/Server-SSLv3-RSA-RC4 (https://github.com/zmap/zgrab/pull/254/files#diff-51) (79)
D ztools/ztls/testdata/Server-TLSv10-ECDHE-ECDSA-AES (https://github.com/zmap/zgrab/pull/254/files#diff-52) (84)
D ztools/ztls/testdata/Server-TLSv10-RSA-3DES (https://github.com/zmap/zgrab/pull/254/files#diff-53) (79)
D ztools/ztls/testdata/Server-TLSv10-RSA-AES (https://github.com/zmap/zgrab/pull/254/files#diff-54) (82)
D ztools/ztls/testdata/Server-TLSv10-RSA-RC4 (https://github.com/zmap/zgrab/pull/254/files#diff-55) (76)
D ztools/ztls/testdata/Server-TLSv11-RSA-RC4 (https://github.com/zmap/zgrab/pull/254/files#diff-56) (76)
D ztools/ztls/testdata/Server-TLSv12-CipherSuiteCertPreferenceECDSA (https://github.com/zmap/zgrab/pull/254/files#diff-57) (91)
D ztools/ztls/testdata/Server-TLSv12-CipherSuiteCertPreferenceRSA (https://github.com/zmap/zgrab/pull/254/files#diff-58) (101)
D ztools/ztls/testdata/Server-TLSv12-ClientAuthRequestedAndECDSAGiven (https://github.com/zmap/zgrab/pull/254/files#diff-59) (122)
D ztools/ztls/testdata/Server-TLSv12-ClientAuthRequestedAndGiven (https://github.com/zmap/zgrab/pull/254/files#diff-60) (121)
D ztools/ztls/testdata/Server-TLSv12-ClientAuthRequestedNotGiven (https://github.com/zmap/zgrab/pull/254/files#diff-61) (81)
D ztools/ztls/testdata/Server-TLSv12-ECDHE-ECDSA-AES (https://github.com/zmap/zgrab/pull/254/files#diff-62) (89)
D ztools/ztls/testdata/Server-TLSv12-IssueTicket (https://github.com/zmap/zgrab/pull/254/files#diff-63) (87)
D ztools/ztls/testdata/Server-TLSv12-IssueTicketPreDisable (https://github.com/zmap/zgrab/pull/254/files#diff-64) (87)
D ztools/ztls/testdata/Server-TLSv12-RSA-3DES (https://github.com/zmap/zgrab/pull/254/files#diff-65) (83)
D ztools/ztls/testdata/Server-TLSv12-RSA-AES (https://github.com/zmap/zgrab/pull/254/files#diff-66) (87)
D ztools/ztls/testdata/Server-TLSv12-RSA-AES-GCM (https://github.com/zmap/zgrab/pull/254/files#diff-67) (93)
D ztools/ztls/testdata/Server-TLSv12-RSA-RC4 (https://github.com/zmap/zgrab/pull/254/files#diff-68) (79)
D ztools/ztls/testdata/Server-TLSv12-Resume (https://github.com/zmap/zgrab/pull/254/files#diff-69) (36)
D ztools/ztls/testdata/Server-TLSv12-ResumeDisabled (https://github.com/zmap/zgrab/pull/254/files#diff-70) (87)
D ztools/ztls/testdata/Server-TLSv12-SNI (https://github.com/zmap/zgrab/pull/254/files#diff-71) (76)
D ztools/ztls/ticket.go (https://github.com/zmap/zgrab/pull/254/files#diff-72) (189)
D ztools/ztls/tls.go (https://github.com/zmap/zgrab/pull/254/files#diff-73) (287)
D ztools/ztls/tls_test.go (https://github.com/zmap/zgrab/pull/254/files#diff-74) (237)
D ztools/ztls/ztls_handshake.go (https://github.com/zmap/zgrab/pull/254/files#diff-75) (510)
D ztools/ztls/ztls_handshake_test.go (https://github.com/zmap/zgrab/pull/254/files#diff-76) (50)
D ztools/ztls/ztls_heartbeat.go (https://github.com/zmap/zgrab/pull/254/files#diff-77) (89)
D ztools/ztls/ztls_ka.go (https://github.com/zmap/zgrab/pull/254/files#diff-78) (171)
D ztools/ztls/ztls_names.go (https://github.com/zmap/zgrab/pull/254/files#diff-79) (565)
Patch Links:
https://github.com/zmap/zgrab/pull/254.patch
https://github.com/zmap/zgrab/pull/254.diff
—
You are receiving this because you are subscribed to this thread.
Reply to this email directly, view it on GitHub (#254), or mute the thread (https://github.com/notifications/unsubscribe-auth/AAMSUPb1OhbkAEf3UMCe5adKV1xehsYwks5riMGDgaJpZM4MS7bN).
|
Added .travis.yml but I don't have sufficient permissions to add the repo to travis I was going to put the tests/code in folders but it turned out to be a little more complicated with the way go does tests and the way we had paths specified. If you want it done I can do it. Otherwise this should be good. |
zakird
suggested changes
Mar 5, 2017
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It looks like we lost all history for the ztls repo because the files were copied over instead of using git filter-branch
. There's documentation on how to do this correctly here: https://help.github.com/articles/splitting-a-subfolder-out-into-a-new-repository/.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Following from #243 I moved ztls to zmap/ztls, removed it from zgrab, and updated the references in existing files