Moved crypto/tls into cfss repository

Bartek20 · Jul 26, 2018 · 56268a6 · 56268a6
1 parent 7478155
commit 56268a6
Show file tree

Hide file tree

Showing 122 changed files with 6 additions and 5 deletions.
diff --git a/scan/connectivity.go b/scan/connectivity.go
@@ -2,11 +2,12 @@ package scan
 
 import (
 	"bufio"
-	"crypto/tls"
 	"errors"
 	"fmt"
 	"io"
 	"net"
+
+	"github.com/cloudflare/cfssl/scan/crypto/tls"
 )
 
 // Connectivity contains scanners testing basic connectivity to the host

diff --git a/scan/vendor/crypto/crypto.go → scan/crypto/crypto.go b/scan/vendor/crypto/crypto.go → scan/crypto/crypto.go
diff --git a/scan/vendor/crypto/md5/example_test.go → scan/crypto/md5/example_test.go b/scan/vendor/crypto/md5/example_test.go → scan/crypto/md5/example_test.go
diff --git a/scan/vendor/crypto/md5/gen.go → scan/crypto/md5/gen.go b/scan/vendor/crypto/md5/gen.go → scan/crypto/md5/gen.go
diff --git a/scan/vendor/crypto/md5/md5.go → scan/crypto/md5/md5.go b/scan/vendor/crypto/md5/md5.go → scan/crypto/md5/md5.go
diff --git a/scan/vendor/crypto/md5/md5_test.go → scan/crypto/md5/md5_test.go b/scan/vendor/crypto/md5/md5_test.go → scan/crypto/md5/md5_test.go
diff --git a/scan/vendor/crypto/md5/md5block.go → scan/crypto/md5/md5block.go b/scan/vendor/crypto/md5/md5block.go → scan/crypto/md5/md5block.go
diff --git a/scan/vendor/crypto/md5/md5block_386.s → scan/crypto/md5/md5block_386.s b/scan/vendor/crypto/md5/md5block_386.s → scan/crypto/md5/md5block_386.s
diff --git a/scan/vendor/crypto/md5/md5block_amd64.s → scan/crypto/md5/md5block_amd64.s b/scan/vendor/crypto/md5/md5block_amd64.s → scan/crypto/md5/md5block_amd64.s
diff --git a/scan/vendor/crypto/md5/md5block_amd64p32.s → scan/crypto/md5/md5block_amd64p32.s b/scan/vendor/crypto/md5/md5block_amd64p32.s → scan/crypto/md5/md5block_amd64p32.s
diff --git a/scan/vendor/crypto/md5/md5block_arm.s → scan/crypto/md5/md5block_arm.s b/scan/vendor/crypto/md5/md5block_arm.s → scan/crypto/md5/md5block_arm.s
diff --git a/scan/vendor/crypto/md5/md5block_decl.go → scan/crypto/md5/md5block_decl.go b/scan/vendor/crypto/md5/md5block_decl.go → scan/crypto/md5/md5block_decl.go
diff --git a/scan/vendor/crypto/md5/md5block_generic.go → scan/crypto/md5/md5block_generic.go b/scan/vendor/crypto/md5/md5block_generic.go → scan/crypto/md5/md5block_generic.go
diff --git a/scan/vendor/crypto/rsa/example_test.go → scan/crypto/rsa/example_test.go b/scan/vendor/crypto/rsa/example_test.go → scan/crypto/rsa/example_test.go
diff --git a/scan/vendor/crypto/rsa/pkcs1v15.go → scan/crypto/rsa/pkcs1v15.go b/scan/vendor/crypto/rsa/pkcs1v15.go → scan/crypto/rsa/pkcs1v15.go
diff --git a/scan/vendor/crypto/rsa/pkcs1v15_test.go → scan/crypto/rsa/pkcs1v15_test.go b/scan/vendor/crypto/rsa/pkcs1v15_test.go → scan/crypto/rsa/pkcs1v15_test.go
diff --git a/scan/vendor/crypto/rsa/pss.go → scan/crypto/rsa/pss.go b/scan/vendor/crypto/rsa/pss.go → scan/crypto/rsa/pss.go
diff --git a/scan/vendor/crypto/rsa/pss_test.go → scan/crypto/rsa/pss_test.go b/scan/vendor/crypto/rsa/pss_test.go → scan/crypto/rsa/pss_test.go
diff --git a/scan/vendor/crypto/rsa/rsa.go → scan/crypto/rsa/rsa.go b/scan/vendor/crypto/rsa/rsa.go → scan/crypto/rsa/rsa.go
diff --git a/scan/vendor/crypto/rsa/rsa_test.go → scan/crypto/rsa/rsa_test.go b/scan/vendor/crypto/rsa/rsa_test.go → scan/crypto/rsa/rsa_test.go
diff --git a/...ndor/crypto/rsa/testdata/pss-vect.txt.bz2 → scan/crypto/rsa/testdata/pss-vect.txt.bz2 b/...ndor/crypto/rsa/testdata/pss-vect.txt.bz2 → scan/crypto/rsa/testdata/pss-vect.txt.bz2
diff --git a/scan/vendor/crypto/sha1/example_test.go → scan/crypto/sha1/example_test.go b/scan/vendor/crypto/sha1/example_test.go → scan/crypto/sha1/example_test.go
diff --git a/scan/vendor/crypto/sha1/sha1.go → scan/crypto/sha1/sha1.go b/scan/vendor/crypto/sha1/sha1.go → scan/crypto/sha1/sha1.go
diff --git a/scan/vendor/crypto/sha1/sha1_test.go → scan/crypto/sha1/sha1_test.go b/scan/vendor/crypto/sha1/sha1_test.go → scan/crypto/sha1/sha1_test.go
diff --git a/scan/vendor/crypto/sha1/sha1block.go → scan/crypto/sha1/sha1block.go b/scan/vendor/crypto/sha1/sha1block.go → scan/crypto/sha1/sha1block.go
diff --git a/scan/vendor/crypto/sha1/sha1block_386.s → scan/crypto/sha1/sha1block_386.s b/scan/vendor/crypto/sha1/sha1block_386.s → scan/crypto/sha1/sha1block_386.s
diff --git a/scan/vendor/crypto/sha1/sha1block_amd64.s → scan/crypto/sha1/sha1block_amd64.s b/scan/vendor/crypto/sha1/sha1block_amd64.s → scan/crypto/sha1/sha1block_amd64.s
diff --git a/scan/vendor/crypto/sha1/sha1block_amd64p32.s → scan/crypto/sha1/sha1block_amd64p32.s b/scan/vendor/crypto/sha1/sha1block_amd64p32.s → scan/crypto/sha1/sha1block_amd64p32.s
diff --git a/scan/vendor/crypto/sha1/sha1block_arm.s → scan/crypto/sha1/sha1block_arm.s b/scan/vendor/crypto/sha1/sha1block_arm.s → scan/crypto/sha1/sha1block_arm.s
diff --git a/scan/vendor/crypto/sha1/sha1block_decl.go → scan/crypto/sha1/sha1block_decl.go b/scan/vendor/crypto/sha1/sha1block_decl.go → scan/crypto/sha1/sha1block_decl.go
diff --git a/scan/vendor/crypto/sha1/sha1block_generic.go → scan/crypto/sha1/sha1block_generic.go b/scan/vendor/crypto/sha1/sha1block_generic.go → scan/crypto/sha1/sha1block_generic.go
diff --git a/scan/vendor/crypto/sha256/sha256.go → scan/crypto/sha256/sha256.go b/scan/vendor/crypto/sha256/sha256.go → scan/crypto/sha256/sha256.go
diff --git a/scan/vendor/crypto/sha256/sha256_test.go → scan/crypto/sha256/sha256_test.go b/scan/vendor/crypto/sha256/sha256_test.go → scan/crypto/sha256/sha256_test.go
diff --git a/scan/vendor/crypto/sha256/sha256block.go → scan/crypto/sha256/sha256block.go b/scan/vendor/crypto/sha256/sha256block.go → scan/crypto/sha256/sha256block.go
diff --git a/scan/vendor/crypto/sha256/sha256block_386.s → scan/crypto/sha256/sha256block_386.s b/scan/vendor/crypto/sha256/sha256block_386.s → scan/crypto/sha256/sha256block_386.s
diff --git a/.../vendor/crypto/sha256/sha256block_amd64.s → scan/crypto/sha256/sha256block_amd64.s b/.../vendor/crypto/sha256/sha256block_amd64.s → scan/crypto/sha256/sha256block_amd64.s
diff --git a/.../vendor/crypto/sha256/sha256block_decl.go → scan/crypto/sha256/sha256block_decl.go b/.../vendor/crypto/sha256/sha256block_decl.go → scan/crypto/sha256/sha256block_decl.go
diff --git a/scan/vendor/crypto/sha512/sha512.go → scan/crypto/sha512/sha512.go b/scan/vendor/crypto/sha512/sha512.go → scan/crypto/sha512/sha512.go
diff --git a/scan/vendor/crypto/sha512/sha512_test.go → scan/crypto/sha512/sha512_test.go b/scan/vendor/crypto/sha512/sha512_test.go → scan/crypto/sha512/sha512_test.go
diff --git a/scan/vendor/crypto/sha512/sha512block.go → scan/crypto/sha512/sha512block.go b/scan/vendor/crypto/sha512/sha512block.go → scan/crypto/sha512/sha512block.go
diff --git a/.../vendor/crypto/sha512/sha512block_amd64.s → scan/crypto/sha512/sha512block_amd64.s b/.../vendor/crypto/sha512/sha512block_amd64.s → scan/crypto/sha512/sha512block_amd64.s
diff --git a/.../vendor/crypto/sha512/sha512block_decl.go → scan/crypto/sha512/sha512block_decl.go b/.../vendor/crypto/sha512/sha512block_decl.go → scan/crypto/sha512/sha512block_decl.go
diff --git a/scan/vendor/crypto/tls/alert.go → scan/crypto/tls/alert.go b/scan/vendor/crypto/tls/alert.go → scan/crypto/tls/alert.go
diff --git a/scan/vendor/crypto/tls/cfsslscan_common.go → scan/crypto/tls/cfsslscan_common.go b/scan/vendor/crypto/tls/cfsslscan_common.go → scan/crypto/tls/cfsslscan_common.go
diff --git a/.../vendor/crypto/tls/cfsslscan_handshake.go → scan/crypto/tls/cfsslscan_handshake.go b/.../vendor/crypto/tls/cfsslscan_handshake.go → scan/crypto/tls/cfsslscan_handshake.go
diff --git a/scan/vendor/crypto/tls/cipher_suites.go → scan/crypto/tls/cipher_suites.go b/scan/vendor/crypto/tls/cipher_suites.go → scan/crypto/tls/cipher_suites.go
diff --git a/scan/vendor/crypto/tls/common.go → scan/crypto/tls/common.go b/scan/vendor/crypto/tls/common.go → scan/crypto/tls/common.go
diff --git a/scan/vendor/crypto/tls/conn.go → scan/crypto/tls/conn.go b/scan/vendor/crypto/tls/conn.go → scan/crypto/tls/conn.go
diff --git a/scan/vendor/crypto/tls/conn_test.go → scan/crypto/tls/conn_test.go b/scan/vendor/crypto/tls/conn_test.go → scan/crypto/tls/conn_test.go
diff --git a/scan/vendor/crypto/tls/example_test.go → scan/crypto/tls/example_test.go b/scan/vendor/crypto/tls/example_test.go → scan/crypto/tls/example_test.go
diff --git a/scan/vendor/crypto/tls/generate_cert.go → scan/crypto/tls/generate_cert.go b/scan/vendor/crypto/tls/generate_cert.go → scan/crypto/tls/generate_cert.go
diff --git a/scan/vendor/crypto/tls/handshake_client.go → scan/crypto/tls/handshake_client.go b/scan/vendor/crypto/tls/handshake_client.go → scan/crypto/tls/handshake_client.go
diff --git a/...endor/crypto/tls/handshake_client_test.go → scan/crypto/tls/handshake_client_test.go b/...endor/crypto/tls/handshake_client_test.go → scan/crypto/tls/handshake_client_test.go
diff --git a/scan/vendor/crypto/tls/handshake_messages.go → scan/crypto/tls/handshake_messages.go b/scan/vendor/crypto/tls/handshake_messages.go → scan/crypto/tls/handshake_messages.go
diff --git a/...dor/crypto/tls/handshake_messages_test.go → scan/crypto/tls/handshake_messages_test.go b/...dor/crypto/tls/handshake_messages_test.go → scan/crypto/tls/handshake_messages_test.go
diff --git a/scan/vendor/crypto/tls/handshake_server.go → scan/crypto/tls/handshake_server.go b/scan/vendor/crypto/tls/handshake_server.go → scan/crypto/tls/handshake_server.go
diff --git a/...endor/crypto/tls/handshake_server_test.go → scan/crypto/tls/handshake_server_test.go b/...endor/crypto/tls/handshake_server_test.go → scan/crypto/tls/handshake_server_test.go
diff --git a/scan/vendor/crypto/tls/handshake_test.go → scan/crypto/tls/handshake_test.go b/scan/vendor/crypto/tls/handshake_test.go → scan/crypto/tls/handshake_test.go
diff --git a/scan/vendor/crypto/tls/key_agreement.go → scan/crypto/tls/key_agreement.go b/scan/vendor/crypto/tls/key_agreement.go → scan/crypto/tls/key_agreement.go
diff --git a/scan/vendor/crypto/tls/prf.go → scan/crypto/tls/prf.go b/scan/vendor/crypto/tls/prf.go → scan/crypto/tls/prf.go
diff --git a/scan/vendor/crypto/tls/prf_test.go → scan/crypto/tls/prf_test.go b/scan/vendor/crypto/tls/prf_test.go → scan/crypto/tls/prf_test.go
diff --git a/...data/Client-TLSv10-ClientCert-ECDSA-ECDSA → ...data/Client-TLSv10-ClientCert-ECDSA-ECDSA b/...data/Client-TLSv10-ClientCert-ECDSA-ECDSA → ...data/Client-TLSv10-ClientCert-ECDSA-ECDSA
diff --git a/...stdata/Client-TLSv10-ClientCert-ECDSA-RSA → ...stdata/Client-TLSv10-ClientCert-ECDSA-RSA b/...stdata/Client-TLSv10-ClientCert-ECDSA-RSA → ...stdata/Client-TLSv10-ClientCert-ECDSA-RSA
diff --git a/...stdata/Client-TLSv10-ClientCert-RSA-ECDSA → ...stdata/Client-TLSv10-ClientCert-RSA-ECDSA b/...stdata/Client-TLSv10-ClientCert-RSA-ECDSA → ...stdata/Client-TLSv10-ClientCert-RSA-ECDSA
diff --git a/...testdata/Client-TLSv10-ClientCert-RSA-RSA → ...testdata/Client-TLSv10-ClientCert-RSA-RSA b/...testdata/Client-TLSv10-ClientCert-RSA-RSA → ...testdata/Client-TLSv10-ClientCert-RSA-RSA
diff --git a/...ls/testdata/Client-TLSv10-ECDHE-ECDSA-AES → ...ls/testdata/Client-TLSv10-ECDHE-ECDSA-AES b/...ls/testdata/Client-TLSv10-ECDHE-ECDSA-AES → ...ls/testdata/Client-TLSv10-ECDHE-ECDSA-AES
diff --git a/.../tls/testdata/Client-TLSv10-ECDHE-RSA-AES → .../tls/testdata/Client-TLSv10-ECDHE-RSA-AES b/.../tls/testdata/Client-TLSv10-ECDHE-RSA-AES → .../tls/testdata/Client-TLSv10-ECDHE-RSA-AES
diff --git a/...crypto/tls/testdata/Client-TLSv10-RSA-RC4 → ...crypto/tls/testdata/Client-TLSv10-RSA-RC4 b/...crypto/tls/testdata/Client-TLSv10-RSA-RC4 → ...crypto/tls/testdata/Client-TLSv10-RSA-RC4
diff --git a/...ls/testdata/Client-TLSv11-ECDHE-ECDSA-AES → ...ls/testdata/Client-TLSv11-ECDHE-ECDSA-AES b/...ls/testdata/Client-TLSv11-ECDHE-ECDSA-AES → ...ls/testdata/Client-TLSv11-ECDHE-ECDSA-AES
diff --git a/.../tls/testdata/Client-TLSv11-ECDHE-RSA-AES → .../tls/testdata/Client-TLSv11-ECDHE-RSA-AES b/.../tls/testdata/Client-TLSv11-ECDHE-RSA-AES → .../tls/testdata/Client-TLSv11-ECDHE-RSA-AES
diff --git a/...crypto/tls/testdata/Client-TLSv11-RSA-RC4 → ...crypto/tls/testdata/Client-TLSv11-RSA-RC4 b/...crypto/tls/testdata/Client-TLSv11-RSA-RC4 → ...crypto/tls/testdata/Client-TLSv11-RSA-RC4
diff --git a/.../testdata/Client-TLSv12-AES128-GCM-SHA256 → .../testdata/Client-TLSv12-AES128-GCM-SHA256 b/.../testdata/Client-TLSv12-AES128-GCM-SHA256 → .../testdata/Client-TLSv12-AES128-GCM-SHA256
diff --git a/.../testdata/Client-TLSv12-AES256-GCM-SHA384 → .../testdata/Client-TLSv12-AES256-GCM-SHA384 b/.../testdata/Client-TLSv12-AES256-GCM-SHA384 → .../testdata/Client-TLSv12-AES256-GCM-SHA384
diff --git a/...or/crypto/tls/testdata/Client-TLSv12-ALPN → scan/crypto/tls/testdata/Client-TLSv12-ALPN b/...or/crypto/tls/testdata/Client-TLSv12-ALPN → scan/crypto/tls/testdata/Client-TLSv12-ALPN
diff --git a/...o/tls/testdata/Client-TLSv12-ALPN-NoMatch → ...o/tls/testdata/Client-TLSv12-ALPN-NoMatch b/...o/tls/testdata/Client-TLSv12-ALPN-NoMatch → ...o/tls/testdata/Client-TLSv12-ALPN-NoMatch
diff --git a/...data/Client-TLSv12-ClientCert-ECDSA-ECDSA → ...data/Client-TLSv12-ClientCert-ECDSA-ECDSA b/...data/Client-TLSv12-ClientCert-ECDSA-ECDSA → ...data/Client-TLSv12-ClientCert-ECDSA-ECDSA
diff --git a/...stdata/Client-TLSv12-ClientCert-ECDSA-RSA → ...stdata/Client-TLSv12-ClientCert-ECDSA-RSA b/...stdata/Client-TLSv12-ClientCert-ECDSA-RSA → ...stdata/Client-TLSv12-ClientCert-ECDSA-RSA
diff --git a/...t-TLSv12-ClientCert-RSA-AES256-GCM-SHA384 → ...t-TLSv12-ClientCert-RSA-AES256-GCM-SHA384 b/...t-TLSv12-ClientCert-RSA-AES256-GCM-SHA384 → ...t-TLSv12-ClientCert-RSA-AES256-GCM-SHA384
diff --git a/...stdata/Client-TLSv12-ClientCert-RSA-ECDSA → ...stdata/Client-TLSv12-ClientCert-RSA-ECDSA b/...stdata/Client-TLSv12-ClientCert-RSA-ECDSA → ...stdata/Client-TLSv12-ClientCert-RSA-ECDSA
diff --git a/...testdata/Client-TLSv12-ClientCert-RSA-RSA → ...testdata/Client-TLSv12-ClientCert-RSA-RSA b/...testdata/Client-TLSv12-ClientCert-RSA-RSA → ...testdata/Client-TLSv12-ClientCert-RSA-RSA
diff --git a/...ls/testdata/Client-TLSv12-ECDHE-ECDSA-AES → ...ls/testdata/Client-TLSv12-ECDHE-ECDSA-AES b/...ls/testdata/Client-TLSv12-ECDHE-ECDSA-AES → ...ls/testdata/Client-TLSv12-ECDHE-ECDSA-AES
diff --git a/...estdata/Client-TLSv12-ECDHE-ECDSA-AES-GCM → ...estdata/Client-TLSv12-ECDHE-ECDSA-AES-GCM b/...estdata/Client-TLSv12-ECDHE-ECDSA-AES-GCM → ...estdata/Client-TLSv12-ECDHE-ECDSA-AES-GCM
diff --git a/...ient-TLSv12-ECDHE-ECDSA-AES256-GCM-SHA384 → ...ient-TLSv12-ECDHE-ECDSA-AES256-GCM-SHA384 b/...ient-TLSv12-ECDHE-ECDSA-AES256-GCM-SHA384 → ...ient-TLSv12-ECDHE-ECDSA-AES256-GCM-SHA384
diff --git a/.../tls/testdata/Client-TLSv12-ECDHE-RSA-AES → .../tls/testdata/Client-TLSv12-ECDHE-RSA-AES b/.../tls/testdata/Client-TLSv12-ECDHE-RSA-AES → .../tls/testdata/Client-TLSv12-ECDHE-RSA-AES
diff --git a/...crypto/tls/testdata/Client-TLSv12-RSA-RC4 → ...crypto/tls/testdata/Client-TLSv12-RSA-RC4 b/...crypto/tls/testdata/Client-TLSv12-RSA-RC4 → ...crypto/tls/testdata/Client-TLSv12-RSA-RC4
diff --git a/...dor/crypto/tls/testdata/Client-TLSv12-SCT → scan/crypto/tls/testdata/Client-TLSv12-SCT b/...dor/crypto/tls/testdata/Client-TLSv12-SCT → scan/crypto/tls/testdata/Client-TLSv12-SCT
diff --git a/...crypto/tls/testdata/Server-SSLv3-RSA-3DES → ...crypto/tls/testdata/Server-SSLv3-RSA-3DES b/...crypto/tls/testdata/Server-SSLv3-RSA-3DES → ...crypto/tls/testdata/Server-SSLv3-RSA-3DES
diff --git a/.../crypto/tls/testdata/Server-SSLv3-RSA-AES → .../crypto/tls/testdata/Server-SSLv3-RSA-AES b/.../crypto/tls/testdata/Server-SSLv3-RSA-AES → .../crypto/tls/testdata/Server-SSLv3-RSA-AES
diff --git a/.../crypto/tls/testdata/Server-SSLv3-RSA-RC4 → .../crypto/tls/testdata/Server-SSLv3-RSA-RC4 b/.../crypto/tls/testdata/Server-SSLv3-RSA-RC4 → .../crypto/tls/testdata/Server-SSLv3-RSA-RC4
diff --git a/...ls/testdata/Server-TLSv10-ECDHE-ECDSA-AES → ...ls/testdata/Server-TLSv10-ECDHE-ECDSA-AES b/...ls/testdata/Server-TLSv10-ECDHE-ECDSA-AES → ...ls/testdata/Server-TLSv10-ECDHE-ECDSA-AES
diff --git a/...rypto/tls/testdata/Server-TLSv10-RSA-3DES → ...rypto/tls/testdata/Server-TLSv10-RSA-3DES b/...rypto/tls/testdata/Server-TLSv10-RSA-3DES → ...rypto/tls/testdata/Server-TLSv10-RSA-3DES
diff --git a/...crypto/tls/testdata/Server-TLSv10-RSA-AES → ...crypto/tls/testdata/Server-TLSv10-RSA-AES b/...crypto/tls/testdata/Server-TLSv10-RSA-AES → ...crypto/tls/testdata/Server-TLSv10-RSA-AES
diff --git a/...crypto/tls/testdata/Server-TLSv10-RSA-RC4 → ...crypto/tls/testdata/Server-TLSv10-RSA-RC4 b/...crypto/tls/testdata/Server-TLSv10-RSA-RC4 → ...crypto/tls/testdata/Server-TLSv10-RSA-RC4
diff --git a/...o/tls/testdata/Server-TLSv11-FallbackSCSV → ...o/tls/testdata/Server-TLSv11-FallbackSCSV b/...o/tls/testdata/Server-TLSv11-FallbackSCSV → ...o/tls/testdata/Server-TLSv11-FallbackSCSV
diff --git a/...crypto/tls/testdata/Server-TLSv11-RSA-RC4 → ...crypto/tls/testdata/Server-TLSv11-RSA-RC4 b/...crypto/tls/testdata/Server-TLSv11-RSA-RC4 → ...crypto/tls/testdata/Server-TLSv11-RSA-RC4
diff --git a/...or/crypto/tls/testdata/Server-TLSv12-ALPN → scan/crypto/tls/testdata/Server-TLSv12-ALPN b/...or/crypto/tls/testdata/Server-TLSv12-ALPN → scan/crypto/tls/testdata/Server-TLSv12-ALPN
diff --git a/...o/tls/testdata/Server-TLSv12-ALPN-NoMatch → ...o/tls/testdata/Server-TLSv12-ALPN-NoMatch b/...o/tls/testdata/Server-TLSv12-ALPN-NoMatch → ...o/tls/testdata/Server-TLSv12-ALPN-NoMatch
diff --git a/...ver-TLSv12-CipherSuiteCertPreferenceECDSA → ...ver-TLSv12-CipherSuiteCertPreferenceECDSA b/...ver-TLSv12-CipherSuiteCertPreferenceECDSA → ...ver-TLSv12-CipherSuiteCertPreferenceECDSA
diff --git a/...erver-TLSv12-CipherSuiteCertPreferenceRSA → ...erver-TLSv12-CipherSuiteCertPreferenceRSA b/...erver-TLSv12-CipherSuiteCertPreferenceRSA → ...erver-TLSv12-CipherSuiteCertPreferenceRSA
diff --git a/...r-TLSv12-ClientAuthRequestedAndECDSAGiven → ...r-TLSv12-ClientAuthRequestedAndECDSAGiven b/...r-TLSv12-ClientAuthRequestedAndECDSAGiven → ...r-TLSv12-ClientAuthRequestedAndECDSAGiven
diff --git a/...Server-TLSv12-ClientAuthRequestedAndGiven → ...Server-TLSv12-ClientAuthRequestedAndGiven b/...Server-TLSv12-ClientAuthRequestedAndGiven → ...Server-TLSv12-ClientAuthRequestedAndGiven
diff --git a/...Server-TLSv12-ClientAuthRequestedNotGiven → ...Server-TLSv12-ClientAuthRequestedNotGiven b/...Server-TLSv12-ClientAuthRequestedNotGiven → ...Server-TLSv12-ClientAuthRequestedNotGiven
diff --git a/...ls/testdata/Server-TLSv12-ECDHE-ECDSA-AES → ...ls/testdata/Server-TLSv12-ECDHE-ECDSA-AES b/...ls/testdata/Server-TLSv12-ECDHE-ECDSA-AES → ...ls/testdata/Server-TLSv12-ECDHE-ECDSA-AES
diff --git a/...to/tls/testdata/Server-TLSv12-IssueTicket → ...to/tls/testdata/Server-TLSv12-IssueTicket b/...to/tls/testdata/Server-TLSv12-IssueTicket → ...to/tls/testdata/Server-TLSv12-IssueTicket
diff --git a/...tdata/Server-TLSv12-IssueTicketPreDisable → ...tdata/Server-TLSv12-IssueTicketPreDisable b/...tdata/Server-TLSv12-IssueTicketPreDisable → ...tdata/Server-TLSv12-IssueTicketPreDisable
diff --git a/...rypto/tls/testdata/Server-TLSv12-RSA-3DES → ...rypto/tls/testdata/Server-TLSv12-RSA-3DES b/...rypto/tls/testdata/Server-TLSv12-RSA-3DES → ...rypto/tls/testdata/Server-TLSv12-RSA-3DES
diff --git a/...crypto/tls/testdata/Server-TLSv12-RSA-AES → ...crypto/tls/testdata/Server-TLSv12-RSA-AES b/...crypto/tls/testdata/Server-TLSv12-RSA-AES → ...crypto/tls/testdata/Server-TLSv12-RSA-AES
diff --git a/...to/tls/testdata/Server-TLSv12-RSA-AES-GCM → ...to/tls/testdata/Server-TLSv12-RSA-AES-GCM b/...to/tls/testdata/Server-TLSv12-RSA-AES-GCM → ...to/tls/testdata/Server-TLSv12-RSA-AES-GCM
diff --git a/...tdata/Server-TLSv12-RSA-AES256-GCM-SHA384 → ...tdata/Server-TLSv12-RSA-AES256-GCM-SHA384 b/...tdata/Server-TLSv12-RSA-AES256-GCM-SHA384 → ...tdata/Server-TLSv12-RSA-AES256-GCM-SHA384
diff --git a/...crypto/tls/testdata/Server-TLSv12-RSA-RC4 → ...crypto/tls/testdata/Server-TLSv12-RSA-RC4 b/...crypto/tls/testdata/Server-TLSv12-RSA-RC4 → ...crypto/tls/testdata/Server-TLSv12-RSA-RC4
diff --git a/.../crypto/tls/testdata/Server-TLSv12-Resume → .../crypto/tls/testdata/Server-TLSv12-Resume b/.../crypto/tls/testdata/Server-TLSv12-Resume → .../crypto/tls/testdata/Server-TLSv12-Resume
diff --git a/...tls/testdata/Server-TLSv12-ResumeDisabled → ...tls/testdata/Server-TLSv12-ResumeDisabled b/...tls/testdata/Server-TLSv12-ResumeDisabled → ...tls/testdata/Server-TLSv12-ResumeDisabled
diff --git a/...dor/crypto/tls/testdata/Server-TLSv12-SNI → scan/crypto/tls/testdata/Server-TLSv12-SNI b/...dor/crypto/tls/testdata/Server-TLSv12-SNI → scan/crypto/tls/testdata/Server-TLSv12-SNI
diff --git a/...testdata/Server-TLSv12-SNI-GetCertificate → ...testdata/Server-TLSv12-SNI-GetCertificate b/...testdata/Server-TLSv12-SNI-GetCertificate → ...testdata/Server-TLSv12-SNI-GetCertificate
diff --git a/.../Server-TLSv12-SNI-GetCertificateNotFound → .../Server-TLSv12-SNI-GetCertificateNotFound b/.../Server-TLSv12-SNI-GetCertificateNotFound → .../Server-TLSv12-SNI-GetCertificateNotFound
diff --git a/scan/vendor/crypto/tls/ticket.go → scan/crypto/tls/ticket.go b/scan/vendor/crypto/tls/ticket.go → scan/crypto/tls/ticket.go
diff --git a/scan/vendor/crypto/tls/tls.go → scan/crypto/tls/tls.go b/scan/vendor/crypto/tls/tls.go → scan/crypto/tls/tls.go
diff --git a/scan/vendor/crypto/tls/tls_test.go → scan/crypto/tls/tls_test.go b/scan/vendor/crypto/tls/tls_test.go → scan/crypto/tls/tls_test.go
diff --git a/scan/pki.go b/scan/pki.go
@@ -2,13 +2,13 @@ package scan
 
 import (
 	"bytes"
-	"crypto/tls"
 	"crypto/x509"
 	"fmt"
 	"time"
 
 	"github.com/cloudflare/cfssl/helpers"
 	"github.com/cloudflare/cfssl/revoke"
+	"github.com/cloudflare/cfssl/scan/crypto/tls"
 )
 
 // PKI contains scanners for the Public Key Infrastructure.

diff --git a/scan/scan_common.go b/scan/scan_common.go
@@ -1,7 +1,6 @@
 package scan
 
 import (
-	"crypto/tls"
 	"crypto/x509"
 	"net"
 	"net/http"
@@ -11,6 +10,7 @@ import (
 
 	"github.com/cloudflare/cfssl/helpers"
 	"github.com/cloudflare/cfssl/log"
+	"github.com/cloudflare/cfssl/scan/crypto/tls"
 )
 
 var (

diff --git a/scan/tls_handshake.go b/scan/tls_handshake.go
@@ -2,13 +2,13 @@ package scan
 
 import (
 	"bytes"
-	"crypto/tls"
 	"errors"
 	"fmt"
 	"net"
 	"strings"
 
 	"github.com/cloudflare/cfssl/helpers"
+	"github.com/cloudflare/cfssl/scan/crypto/tls"
 )
 
 // Sentinel for failures in sayHello. Should always be caught.

diff --git a/scan/tls_session.go b/scan/tls_session.go
@@ -1,6 +1,6 @@
 package scan
 
-import "crypto/tls"
+import "github.com/cloudflare/cfssl/scan/crypto/tls"
 
 // TLSSession contains tests of host TLS Session Resumption via
 // Session Tickets and Session IDs