Commitbe48805

committed

Added more SSL options

Signed-off-by: chandr-andr (Kiselev Aleksandr) <chandr@chandr.net>

1 parent918c100 commitbe48805Copy full SHA for be48805

File tree

+22

-1

lines changed

+22

-1

lines changed

Lines changed: 14 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -44,10 +44,21 @@ pub enum TargetSessionAttrs {`
`44`	`44`	`pubenumSslMode{`
`45`	`45`	`/// Do not use TLS.`
`46`	`46`	`Disable,`
	`47`	`+/// Pay the overhead of encryption if the server insists on it.`
	`48`	`+Allow,`
`47`	`49`	`/// Attempt to connect with TLS but allow sessions without.`
`48`	`50`	`Prefer,`
`49`	`51`	`/// Require the use of TLS.`
`50`	`52`	`Require,`
	`53`	`+/// I want my data encrypted,`
	`54`	`+/// and I accept the overhead.`
	`55`	`+/// I want to be sure that I connect to a server that I trust.`
	`56`	`+VerifyCa,`
	`57`	`+/// I want my data encrypted,`
	`58`	`+/// and I accept the overhead.`
	`59`	`+/// I want to be sure that I connect to a server I trust,`
	`60`	`+/// and that it's the one I specify.`
	`61`	`+VerifyFull,`
`51`	`62`	`}`
`52`	`63`
`53`	`64`	`/// Channel binding configuration.`
`@@ -542,8 +553,11 @@ impl Config {`
`542`	`553`	`"sslmode" =>{`
`543`	`554`	`let mode =match value{`
`544`	`555`	`"disable" =>SslMode::Disable,`
	`556`	`+"allow" =>SslMode::Allow,`
`545`	`557`	`"prefer" =>SslMode::Prefer,`
`546`	`558`	`"require" =>SslMode::Require,`
	`559`	`+"verify-ca" =>SslMode::VerifyCa,`
	`560`	`+"verify-full" =>SslMode::VerifyFull,`
`547`	`561`	`_ =>returnErr(Error::config_parse(Box::new(InvalidValue("sslmode")))),`
`548`	`562`	`};`
`549`	`563`	`self.ssl_mode(mode);`

Lines changed: 8 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -19,10 +19,17 @@ where`
`19`	`19`	`{`
`20`	`20`	`match mode{`
`21`	`21`	`SslMode::Disable =>returnOk(MaybeTlsStream::Raw(stream)),`
	`22`	`+SslMode::Allowif !tls.can_connect(ForcePrivateApi) =>{`
	`23`	`+returnOk(MaybeTlsStream::Raw(stream))`
	`24`	`+}`
`22`	`25`	`SslMode::Preferif !tls.can_connect(ForcePrivateApi) =>{`
`23`	`26`	`returnOk(MaybeTlsStream::Raw(stream))`
`24`	`27`	`}`
`25`		`-SslMode::Prefer \|SslMode::Require =>{}`
	`28`	`+SslMode::Allow`
	`29`	`+ \|SslMode::Prefer`
	`30`	`+ \|SslMode::Require`
	`31`	`+ \|SslMode::VerifyCa`
	`32`	`+ \|SslMode::VerifyFull =>{}`
`26`	`33`	`}`
`27`	`34`
`28`	`35`	`letmut buf =BytesMut::new();`

Comments

(0)