Support tls1.3 and ShangMi cipher suit #33
Closed
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
dongbeiouba
requested changes
Oct 10, 2024
| @@ -38,12 +38,27 @@ func main() { | |||
| flag.StringVar(&caFile, "CAfile", "test/certs/sm2/chain-ca.crt", "CA certificate file") | |||
| flag.StringVar(&serverName, "servername", "", "server name") | |||
| flag.Var((*stringSlice)(&alpnProtocols), "alpn", "ALPN protocols") | |||
|
|
|||
| flag.StringVar(&tlsVersion, "tls_version", "NTLS", "TLS version") | |||
| version = ts.TLSv1_1 | ||
| case "TLSv1": | ||
| version = ts.TLSv1 | ||
| case "NTLS": |
There was a problem hiding this comment.
default是NTLS，跟flag.StringVar(&tlsVersion，保持一致吧
| ctx, err := ts.NewCtxWithVersion(ts.NTLS) | ||
| func newNTLSServer(acceptAddr string, certKeyPairs map[string]crypto.GMDoubleCertKey, cafile string, alpnProtocols []string, tlsVersion string) (net.Listener, error) { | ||
| var version ts.SSLVersion | ||
| switch tlsVersion { |
There was a problem hiding this comment.
newNTLSServer()为啥会有多个非NTLS version？
There was a problem hiding this comment.
原意为想要让Server可以支持多个TLS versions，因此加了多个非NTLS version，但是与函数的命名有所冲突，现将函数名称由newNTLSServer改为newTLSServer
| @@ -294,7 +315,7 @@ func main() { | |||
| flag.StringVar(&encKeyFile, "enc_key", "test/certs/sm2/server_enc.key", "encrypt private key file") | |||
| flag.StringVar(&caFile, "CAfile", "test/certs/sm2/chain-ca.crt", "CA certificate file") | |||
| flag.Var((*stringSlice)(&alpnProtocols), "alpn", "ALPN protocols") | |||
|
|
|||
| flag.StringVar(&tlsVersion, "tls_version", "NTLS", "TLS version") | |||
| return | ||
| } | ||
|
|
||
| certPEM, err := os.ReadFile("test/certs/sm2/client_enc.crt") |
| return nil, err | ||
| } | ||
|
|
||
| encCertPEM, err := os.ReadFile(filepath.Join(testDir, "server_enc.crt")) |
| return nil, err | ||
| } | ||
|
|
||
| KeyPEM, err := os.ReadFile(filepath.Join(testDir, "server_enc.key")) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
No description provided.