Update of /cvsroot/pgsqlclient/pgsqlclient_10/Mono.Security.Protocol.Tls/Mono.Security.Protocol.Tls
In directory sc8-pr-cvs1:/tmp/cvs-serv29810
Modified Files:
TlsSession.cs TlsSessionContext.cs TlsSessionSettings.cs
Log Message:
Added new TlsCompressionMethod enumeration
Index: TlsSession.cs
===================================================================
RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/Mono.Security.Protocol.Tls/Mono.Security.Protocol.Tls/TlsSession.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TlsSession.cs 20 Oct 2003 09:58:29 -0000 1.3
--- TlsSession.cs 20 Oct 2003 18:21:43 -0000 1.4
***************
*** 167,173 ****
try
{
! this.context.Protocol = settings.Protocol;
! this.state = TlsSessionState.OpeningSecure;
! this.supportedCiphers = TlsCipherSuiteFactory.GetSupportedCiphers(context.Protocol);
this.socket.DoHandshake();
this.state = TlsSessionState.OpenSecure;
--- 167,174 ----
try
{
! this.context.Protocol = settings.Protocol;
! this.context.CompressionMethod = settings.CompressionMethod;
! this.state = TlsSessionState.OpeningSecure;
! this.supportedCiphers = TlsCipherSuiteFactory.GetSupportedCiphers(context.Protocol);
this.socket.DoHandshake();
this.state = TlsSessionState.OpenSecure;
Index: TlsSessionContext.cs
===================================================================
RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/Mono.Security.Protocol.Tls/Mono.Security.Protocol.Tls/TlsSessionContext.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** TlsSessionContext.cs 20 Oct 2003 09:58:29 -0000 1.5
--- TlsSessionContext.cs 20 Oct 2003 18:21:43 -0000 1.6
***************
*** 39,42 ****
--- 39,45 ----
private TlsProtocol protocol;
+ // Compression method
+ private TlsCompressionMethod compressionMethod;
+
// Information sent and request by the server in the Handshake protocol
private TlsServerSettings serverSettings;
***************
*** 46,50 ****
private bool connectionEnd;
private TlsCipherSuite cipher;
- private int compressionMethod;
// Sequence numbers
--- 49,52 ----
***************
*** 78,81 ****
--- 80,89 ----
}
+ public TlsCompressionMethod CompressionMethod
+ {
+ get { return compressionMethod; }
+ set { compressionMethod = value; }
+ }
+
public TlsServerSettings ServerSettings
{
***************
*** 102,111 ****
}
- public int CompressionMethod
- {
- get { return compressionMethod; }
- set { compressionMethod = value; }
- }
-
public TlsHandshakeHashes HandshakeHashes
{
--- 110,113 ----
***************
*** 186,189 ****
--- 188,192 ----
{
this.protocol = TlsProtocol.Tls1;
+ this.compressionMethod = TlsCompressionMethod.None;
this.serverSettings = new TlsServerSettings();
this.handshakeHashes = new TlsHandshakeHashes();
Index: TlsSessionSettings.cs
===================================================================
RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/Mono.Security.Protocol.Tls/Mono.Security.Protocol.Tls/TlsSessionSettings.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TlsSessionSettings.cs 11 Oct 2003 10:04:20 -0000 1.1
--- TlsSessionSettings.cs 20 Oct 2003 18:21:43 -0000 1.2
***************
*** 37,40 ****
--- 37,41 ----
private Encoding encoding;
private TlsProtocol protocol;
+ private TlsCompressionMethod compressionMethod;
private X509CertificateCollection certificates;
***************
*** 74,77 ****
--- 75,91 ----
}
+ public TlsCompressionMethod CompressionMethod
+ {
+ get { return compressionMethod; }
+ set
+ {
+ if (value != TlsCompressionMethod.None)
+ {
+ throw new NotSupportedException("Specified compression method is not supported");
+ }
+ compressionMethod = value;
+ }
+ }
+
public X509CertificateCollection Certificates
{
***************
*** 87,90 ****
--- 101,105 ----
{
this.protocol = TlsProtocol.Tls1;
+ this.compressionMethod = TlsCompressionMethod.None;
this.certificates = new X509CertificateCollection();
this.serverName = "localhost";
|