Merge branch 'master' into version_negotiation
This commit is contained in:
commit
34e983c301
|
@ -343,9 +343,9 @@ xCCAB TLS_PSK_WITH_CHACHA20_POLY1305_SHA256
|
|||
xCCAC TLS_ECDHE_PSK_WITH_CHACHA20_POLY1305_SHA256
|
||||
xCCAD TLS_DHE_PSK_WITH_CHACHA20_POLY1305_SHA256
|
||||
xCCAE TLS_RSA_PSK_WITH_CHACHA20_POLY1305_SHA256
|
||||
xCC13 TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256_2013
|
||||
xCC14 TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256_2013
|
||||
xCC15 TLS_DHE_RSA_WITH_CHACHA20_POLY1305_SHA256_2013
|
||||
xCC13 TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256_OLD
|
||||
xCC14 TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256_OLD
|
||||
xCC15 TLS_DHE_RSA_WITH_CHACHA20_POLY1305_SHA256_OLD
|
||||
xFEFE SSL_RSA_FIPS_WITH_DES_CBC_SHA
|
||||
xFEFF SSL_RSA_FIPS_WITH_3DES_EDE_CBC_SHA
|
||||
xFFE0 SSL_RSA_FIPS_WITH_3DES_EDE_CBC_SHA
|
||||
|
|
Loading…
Reference in New Issue