pgsqlclient-checkins Mailing List for PostgreSqlClient (Page 33)
Status: Inactive
Brought to you by:
carlosga_fb
You can subscribe to this list here.
2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(120) |
Aug
(95) |
Sep
(95) |
Oct
(213) |
Nov
(114) |
Dec
(64) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2004 |
Jan
(6) |
Feb
(134) |
Mar
(88) |
Apr
(28) |
May
(22) |
Jun
(15) |
Jul
(23) |
Aug
(2) |
Sep
(15) |
Oct
(2) |
Nov
(6) |
Dec
|
2005 |
Jan
(8) |
Feb
(6) |
Mar
|
Apr
(42) |
May
(3) |
Jun
|
Jul
|
Aug
|
Sep
(84) |
Oct
|
Nov
|
Dec
|
2006 |
Jan
|
Feb
|
Mar
(84) |
Apr
(46) |
May
(40) |
Jun
(8) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
From: <car...@us...> - 2003-11-10 12:16:36
|
Update of /cvsroot/pgsqlclient/pgsqlclient_10/Mono.Security.Protocol.Tls In directory sc8-pr-cvs1:/tmp/cvs-serv1657 Modified Files: changelog.txt Log Message: 2003-11-10 Carlos Guzmán Álvarez <car...@te...> * Mono.Security.Protocol.Tls.Alerts/TlsAlert.cs: - Fixed invalid alert message. * Mono.Security.Protocol.Tls/CipherSuite.cs: * Mono.Security.Protocol.Tls/TlsSslCipherSuite.cs: * Mono.Security.Cryptography/HMAC.cs: * Mono.Security.Cryptography/MD5SHA1CryptoServiceProvider.cs: * Mono.Security.Protocol.Tls.Handshake.Client/TlsClientCertificateVerify.cs: - Changed ( Thanks to Sebastién Pouliot for his feedback ) SHA1CryptoServiceProvider sha = new SHA1CryptoServiceProvider(); MD5CryptoServiceProvider sha = new MD5CryptoServiceProvider(); to HashAlgorithm sha = SHA1.Create(); HashAlgorithm md5 = MD5.Create(); Index: changelog.txt =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/Mono.Security.Protocol.Tls/changelog.txt,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** changelog.txt 7 Nov 2003 10:07:16 -0000 1.8 --- changelog.txt 10 Nov 2003 12:16:31 -0000 1.9 *************** *** 2,5 **** --- 2,28 ---- --------------- ----------- ----------------------------------------- + 2003-11-10 Carlos Guzmán Álvarez <car...@te...> + + * Mono.Security.Protocol.Tls.Alerts/TlsAlert.cs: + + - Fixed invalid alert message. + + * Mono.Security.Protocol.Tls/CipherSuite.cs: + * Mono.Security.Protocol.Tls/TlsSslCipherSuite.cs: + * Mono.Security.Cryptography/HMAC.cs: + * Mono.Security.Cryptography/MD5SHA1CryptoServiceProvider.cs: + * Mono.Security.Protocol.Tls.Handshake.Client/TlsClientCertificateVerify.cs: + + - Changed ( Thanks to Sebastién Pouliot for his feedback ) + + SHA1CryptoServiceProvider sha = new SHA1CryptoServiceProvider(); + MD5CryptoServiceProvider sha = new MD5CryptoServiceProvider(); + + to + + HashAlgorithm sha = SHA1.Create(); + HashAlgorithm md5 = MD5.Create(); + + 2003-11-04 Carlos Guzmán Álvarez <car...@te...> |
From: <car...@us...> - 2003-11-10 12:16:07
|
Update of /cvsroot/pgsqlclient/pgsqlclient_10/Mono.Security.Protocol.Tls/Mono.Security.Protocol.Tls/Mono.Security.Protocol.Tls.Alerts In directory sc8-pr-cvs1:/tmp/cvs-serv1526/Mono.Security.Protocol.Tls.Alerts Modified Files: TlsAlert.cs Log Message: 2003-11-10 Carlos Guzmán Álvarez <car...@te...> * Mono.Security.Protocol.Tls.Alerts/TlsAlert.cs: - Fixed invalid alert message. * Mono.Security.Protocol.Tls/CipherSuite.cs: * Mono.Security.Protocol.Tls/TlsSslCipherSuite.cs: * Mono.Security.Cryptography/HMAC.cs: * Mono.Security.Cryptography/MD5SHA1CryptoServiceProvider.cs: * Mono.Security.Protocol.Tls.Handshake.Client/TlsClientCertificateVerify.cs: - Changed ( Thanks to Sebastién Pouliot for his feedback ) SHA1CryptoServiceProvider sha = new SHA1CryptoServiceProvider(); MD5CryptoServiceProvider sha = new MD5CryptoServiceProvider(); to HashAlgorithm sha = SHA1.Create(); HashAlgorithm md5 = MD5.Create(); Index: TlsAlert.cs =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/Mono.Security.Protocol.Tls/Mono.Security.Protocol.Tls/Mono.Security.Protocol.Tls.Alerts/TlsAlert.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** TlsAlert.cs 14 Oct 2003 10:14:39 -0000 1.2 --- TlsAlert.cs 10 Nov 2003 12:16:03 -0000 1.3 *************** *** 179,183 **** case TlsAlertDescription.UnexpectedMessage: ! return "Invalid message receive."; case TlsAlertDescription.UnknownCA: --- 179,183 ---- case TlsAlertDescription.UnexpectedMessage: ! return "Invalid message received."; case TlsAlertDescription.UnknownCA: |
Update of /cvsroot/pgsqlclient/pgsqlclient_10/Mono.Security.Protocol.Tls/Mono.Security.Protocol.Tls/Mono.Security.Protocol.Tls.Handshake/Mono.Security.Protocol.Tls.Handshake.Client In directory sc8-pr-cvs1:/tmp/cvs-serv1526/Mono.Security.Protocol.Tls.Handshake/Mono.Security.Protocol.Tls.Handshake.Client Modified Files: TlsClientCertificateVerify.cs Log Message: 2003-11-10 Carlos Guzmán Álvarez <car...@te...> * Mono.Security.Protocol.Tls.Alerts/TlsAlert.cs: - Fixed invalid alert message. * Mono.Security.Protocol.Tls/CipherSuite.cs: * Mono.Security.Protocol.Tls/TlsSslCipherSuite.cs: * Mono.Security.Cryptography/HMAC.cs: * Mono.Security.Cryptography/MD5SHA1CryptoServiceProvider.cs: * Mono.Security.Protocol.Tls.Handshake.Client/TlsClientCertificateVerify.cs: - Changed ( Thanks to Sebastién Pouliot for his feedback ) SHA1CryptoServiceProvider sha = new SHA1CryptoServiceProvider(); MD5CryptoServiceProvider sha = new MD5CryptoServiceProvider(); to HashAlgorithm sha = SHA1.Create(); HashAlgorithm md5 = MD5.Create(); Index: TlsClientCertificateVerify.cs =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/Mono.Security.Protocol.Tls/Mono.Security.Protocol.Tls/Mono.Security.Protocol.Tls.Handshake/Mono.Security.Protocol.Tls.Handshake.Client/TlsClientCertificateVerify.cs,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** TlsClientCertificateVerify.cs 3 Nov 2003 16:21:25 -0000 1.9 --- TlsClientCertificateVerify.cs 10 Nov 2003 12:16:04 -0000 1.10 *************** *** 63,71 **** foreach (X509Certificate cert in Session.Settings.Certificates) { ! MD5SHA1CryptoServiceProvider hash = new MD5SHA1CryptoServiceProvider(); ! X509.X509Certificate c = new X509.X509Certificate(cert.GetRawCertData()); ! RSA rsa = c.RSA; ! RSAParameters p = rsa.ExportParameters(false); ! TlsStream data = new TlsStream(); data.Write(this.Session.Context.RandomCS); --- 63,71 ---- foreach (X509Certificate cert in Session.Settings.Certificates) { ! MD5SHA1CryptoServiceProvider hash = new MD5SHA1CryptoServiceProvider(); ! X509.X509Certificate c = new X509.X509Certificate(cert.GetRawCertData()); ! RSA rsa = c.RSA; ! RSAParameters p = rsa.ExportParameters(false); ! TlsStream data = new TlsStream(); data.Write(this.Session.Context.RandomCS); |
From: <car...@us...> - 2003-11-10 12:16:06
|
Update of /cvsroot/pgsqlclient/pgsqlclient_10/Mono.Security.Protocol.Tls/Mono.Security.Protocol.Tls In directory sc8-pr-cvs1:/tmp/cvs-serv1526 Modified Files: CipherSuite.cs TlsSslCipherSuite.cs Log Message: 2003-11-10 Carlos Guzmán Álvarez <car...@te...> * Mono.Security.Protocol.Tls.Alerts/TlsAlert.cs: - Fixed invalid alert message. * Mono.Security.Protocol.Tls/CipherSuite.cs: * Mono.Security.Protocol.Tls/TlsSslCipherSuite.cs: * Mono.Security.Cryptography/HMAC.cs: * Mono.Security.Cryptography/MD5SHA1CryptoServiceProvider.cs: * Mono.Security.Protocol.Tls.Handshake.Client/TlsClientCertificateVerify.cs: - Changed ( Thanks to Sebastién Pouliot for his feedback ) SHA1CryptoServiceProvider sha = new SHA1CryptoServiceProvider(); MD5CryptoServiceProvider sha = new MD5CryptoServiceProvider(); to HashAlgorithm sha = SHA1.Create(); HashAlgorithm md5 = MD5.Create(); Index: CipherSuite.cs =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/Mono.Security.Protocol.Tls/Mono.Security.Protocol.Tls/CipherSuite.cs,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** CipherSuite.cs 7 Nov 2003 10:05:35 -0000 1.7 --- CipherSuite.cs 10 Nov 2003 12:16:03 -0000 1.8 *************** *** 343,348 **** public byte[] PRF(byte[] secret, string label, byte[] data, int length) { ! MD5CryptoServiceProvider md5 = new MD5CryptoServiceProvider(); ! SHA1CryptoServiceProvider sha1 = new SHA1CryptoServiceProvider(); int secretLen = secret.Length / 2; --- 343,348 ---- public byte[] PRF(byte[] secret, string label, byte[] data, int length) { ! HashAlgorithm md5 = MD5.Create(); ! HashAlgorithm sha1 = SHA1.Create(); int secretLen = secret.Length / 2; Index: TlsSslCipherSuite.cs =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/Mono.Security.Protocol.Tls/Mono.Security.Protocol.Tls/TlsSslCipherSuite.cs,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** TlsSslCipherSuite.cs 3 Nov 2003 20:34:30 -0000 1.10 --- TlsSslCipherSuite.cs 10 Nov 2003 12:16:03 -0000 1.11 *************** *** 193,197 **** else { ! MD5CryptoServiceProvider md5 = new MD5CryptoServiceProvider(); // Generate final write keys --- 193,197 ---- else { ! HashAlgorithm md5 = MD5.Create(); // Generate final write keys *************** *** 223,228 **** private byte[] prf(byte[] secret, string label, byte[] random) { ! HashAlgorithm md5 = new MD5CryptoServiceProvider(); ! SHA1CryptoServiceProvider sha = new SHA1CryptoServiceProvider(); // Compute SHA hash --- 223,228 ---- private byte[] prf(byte[] secret, string label, byte[] random) { ! HashAlgorithm md5 = MD5.Create(); ! HashAlgorithm sha = SHA1.Create(); // Compute SHA hash |
Update of /cvsroot/pgsqlclient/pgsqlclient_10/Mono.Security.Protocol.Tls/Mono.Security.Protocol.Tls/Mono.Security/Mono.Security.Cryptography In directory sc8-pr-cvs1:/tmp/cvs-serv1526/Mono.Security/Mono.Security.Cryptography Modified Files: HMAC.cs MD5SHA1CryptoServiceProvider.cs Log Message: 2003-11-10 Carlos Guzmán Álvarez <car...@te...> * Mono.Security.Protocol.Tls.Alerts/TlsAlert.cs: - Fixed invalid alert message. * Mono.Security.Protocol.Tls/CipherSuite.cs: * Mono.Security.Protocol.Tls/TlsSslCipherSuite.cs: * Mono.Security.Cryptography/HMAC.cs: * Mono.Security.Cryptography/MD5SHA1CryptoServiceProvider.cs: * Mono.Security.Protocol.Tls.Handshake.Client/TlsClientCertificateVerify.cs: - Changed ( Thanks to Sebastién Pouliot for his feedback ) SHA1CryptoServiceProvider sha = new SHA1CryptoServiceProvider(); MD5CryptoServiceProvider sha = new MD5CryptoServiceProvider(); to HashAlgorithm sha = SHA1.Create(); HashAlgorithm md5 = MD5.Create(); Index: HMAC.cs =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/Mono.Security.Protocol.Tls/Mono.Security.Protocol.Tls/Mono.Security/Mono.Security.Cryptography/HMAC.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** HMAC.cs 3 Nov 2003 18:12:41 -0000 1.2 --- HMAC.cs 10 Nov 2003 12:16:03 -0000 1.3 *************** *** 81,85 **** { // Create the hash ! hash = HashAlgorithm.Create("MD5"); // Set HashSizeValue HashSizeValue = hash.HashSize; --- 81,85 ---- { // Create the hash ! hash = MD5.Create(); // Set HashSizeValue HashSizeValue = hash.HashSize; Index: MD5SHA1CryptoServiceProvider.cs =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/Mono.Security.Protocol.Tls/Mono.Security.Protocol.Tls/Mono.Security/Mono.Security.Cryptography/MD5SHA1CryptoServiceProvider.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** MD5SHA1CryptoServiceProvider.cs 3 Nov 2003 16:21:54 -0000 1.2 --- MD5SHA1CryptoServiceProvider.cs 10 Nov 2003 12:16:03 -0000 1.3 *************** *** 42,47 **** public MD5SHA1CryptoServiceProvider() { ! this.md5 = new MD5CryptoServiceProvider(); ! this.sha = new SHA1CryptoServiceProvider(); // Set HashSizeValue --- 42,47 ---- public MD5SHA1CryptoServiceProvider() { ! this.md5 = MD5.Create(); ! this.sha = SHA1.Create(); // Set HashSizeValue |
From: <car...@us...> - 2003-11-10 12:14:05
|
Update of /cvsroot/pgsqlclient/pgsqlclient_10/Mono.Security.Protocol.Tls/Mono.Security.Protocol.Tls/Mono.Security/Mono.Security.X509 In directory sc8-pr-cvs1:/tmp/cvs-serv1236 Modified Files: X509Chain.cs Log Message: Set visibility to internal Index: X509Chain.cs =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/Mono.Security.Protocol.Tls/Mono.Security.Protocol.Tls/Mono.Security/Mono.Security.X509/X509Chain.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** X509Chain.cs 28 Oct 2003 16:12:07 -0000 1.1 --- X509Chain.cs 10 Nov 2003 12:14:01 -0000 1.2 *************** *** 13,17 **** namespace Mono.Security.X509 { ! public class X509Chain { private X509CertificateCollection roots; --- 13,17 ---- namespace Mono.Security.X509 { ! internal class X509Chain { private X509CertificateCollection roots; |
From: <car...@us...> - 2003-11-10 12:11:27
|
Update of /cvsroot/pgsqlclient/pgsqlclient_10/PostgreSql.Data.PgSqlClient/source In directory sc8-pr-cvs1:/tmp/cvs-serv910 Modified Files: PgCommand.cs Log Message: 2003-11-10 Carlos Guzmán Álvarez <car...@te...> * source/PgCommand.cs: - Fixed connection checking in dispose method. Index: PgCommand.cs =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/PostgreSql.Data.PgSqlClient/source/PgCommand.cs,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** PgCommand.cs 8 Nov 2003 12:55:23 -0000 1.11 --- PgCommand.cs 10 Nov 2003 12:11:25 -0000 1.12 *************** *** 255,264 **** if (disposing) { ! if (this.connection.ActiveCommands != null) { this.connection.ActiveCommands.Remove(this); } ! ! // release any managed resources this.InternalClose(); --- 255,266 ---- if (disposing) { ! // release any managed resources ! ! if (this.connection != null && ! this.connection.ActiveCommands != null) { this.connection.ActiveCommands.Remove(this); } ! this.InternalClose(); |
From: <car...@us...> - 2003-11-10 12:11:10
|
Update of /cvsroot/pgsqlclient/pgsqlclient_10 In directory sc8-pr-cvs1:/tmp/cvs-serv870 Modified Files: changelog.txt Log Message: 2003-11-10 Carlos Guzmán Álvarez <car...@te...> * source/PgCommand.cs: - Fixed connection checking in dispose method. Index: changelog.txt =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/changelog.txt,v retrieving revision 1.69 retrieving revision 1.70 diff -C2 -d -r1.69 -r1.70 *** changelog.txt 6 Nov 2003 16:37:39 -0000 1.69 --- changelog.txt 10 Nov 2003 12:11:07 -0000 1.70 *************** *** 2,5 **** --- 2,24 ---- ------------------------------------------------------- + 2003-11-10 Carlos Guzmán Álvarez <car...@te...> + + * source/PgCommand.cs: + + - Fixed connection checking in dispose method. + + 2003-11-08 Carlos Guzmán Álvarez <car...@te...> + + * source/FbConnection.cs: + * source/FbCommand.cs: + * source/FbdataAdapter.cs: + + - Added ToolboxItem attribute for allow components to be used from #Develop. + + * source/FbDataAdapter.cs: + + - Improved handling of behavior and Close method. + + 2003-11-06 Carlos Guzmán Álvarez <car...@te...> |
Update of /cvsroot/pgsqlclient/pgsqlclient_10/PostgreSql.Data.PgSqlClient/source In directory sc8-pr-cvs1:/tmp/cvs-serv30076 Modified Files: PgCommand.cs PgConnection.cs PgDataAdapter.cs PgDataReader.cs Log Message: 2003-11-08 Carlos Guzmán Álvarez <car...@te...> * source/FbConnection.cs: * source/FbCommand.cs: * source/FbdataAdapter.cs: - Added ToolboxItem attribute for allow components to be used from #Develop. * source/FbDataAdapter.cs: - Improved handling of behavior and Close method. Index: PgCommand.cs =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/PostgreSql.Data.PgSqlClient/source/PgCommand.cs,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** PgCommand.cs 9 Oct 2003 11:31:23 -0000 1.10 --- PgCommand.cs 8 Nov 2003 12:55:23 -0000 1.11 *************** *** 29,33 **** namespace PostgreSql.Data.PgSqlClient { ! [ToolboxBitmap(typeof(PgCommand), "Resources.ToolBox.PgCommand.bmp")] public sealed class PgCommand : Component, IDbCommand, ICloneable { --- 29,34 ---- namespace PostgreSql.Data.PgSqlClient { ! [ToolboxItem(true), ! ToolboxBitmap(typeof(PgCommand), "Resources.ToolBox.PgCommand.bmp")] public sealed class PgCommand : Component, IDbCommand, ICloneable { *************** *** 312,323 **** public int ExecuteNonQuery() { ! checkCommand(); ! InternalPrepare(); ! InternalExecute(); InternalSetOutputParameters(); ! return statement.RecordsAffected; } --- 313,324 ---- public int ExecuteNonQuery() { ! this.checkCommand(); ! this.InternalPrepare(); ! this.InternalExecute(); InternalSetOutputParameters(); ! return this.statement.RecordsAffected; } *************** *** 339,347 **** public PgDataReader ExecuteReader(CommandBehavior behavior) { ! checkCommand(); commandBehavior = behavior; ! InternalPrepare(); if ((commandBehavior & System.Data.CommandBehavior.SequentialAccess) == System.Data.CommandBehavior.SequentialAccess || --- 340,348 ---- public PgDataReader ExecuteReader(CommandBehavior behavior) { ! this.checkCommand(); commandBehavior = behavior; ! this.InternalPrepare(); if ((commandBehavior & System.Data.CommandBehavior.SequentialAccess) == System.Data.CommandBehavior.SequentialAccess || *************** *** 351,372 **** commandBehavior == System.Data.CommandBehavior.Default) { ! InternalExecute(); } ! return new PgDataReader(this); } public object ExecuteScalar() { ! checkCommand(); object returnValue = null; ! InternalPrepare(); ! InternalExecute(); ! if (statement.HasRows) { ! returnValue = ((object[])statement.Rows[0])[0]; } --- 352,373 ---- commandBehavior == System.Data.CommandBehavior.Default) { ! this.InternalExecute(); } ! return new PgDataReader(this, this.connection); } public object ExecuteScalar() { ! this.checkCommand(); object returnValue = null; ! this.InternalPrepare(); ! this.InternalExecute(); ! if (this.statement.HasRows) { ! returnValue = ((object[])this.statement.Rows[0])[0]; } *************** *** 376,383 **** public void Prepare() { ! checkCommand(); ! InternalPrepare(); ! connection.ActiveCommands.Add(this); } --- 377,384 ---- public void Prepare() { ! this.checkCommand(); ! this.InternalPrepare(); ! this.connection.ActiveCommands.Add(this); } *************** *** 386,402 **** string plan; ! checkCommand(); try { ! if (statement == null) { ! statement = connection.DbConnection.DB.CreateStatement(commandText); ! plan = statement.GetPlan(verbose); ! statement = null; } else { ! plan = statement.GetPlan(verbose); } } --- 387,403 ---- string plan; ! this.checkCommand(); try { ! if (this.statement == null) { ! this.statement = this.connection.DbConnection.DB.CreateStatement(commandText); ! plan = this.statement.GetPlan(verbose); ! this.statement = null; } else { ! plan = this.statement.GetPlan(verbose); } } *************** *** 417,423 **** try { ! if (statement == null || ! statement.Status == PgStatementStatus.Initial || ! statement.Status == PgStatementStatus.Error) { if (commandType == CommandType.StoredProcedure) --- 418,424 ---- try { ! if (this.statement == null || ! this.statement.Status == PgStatementStatus.Initial || ! this.statement.Status == PgStatementStatus.Error) { if (commandType == CommandType.StoredProcedure) *************** *** 432,436 **** string portalName = "PR" + getStmtName(); ! statement = connection.DbConnection.DB.CreateStatement( prepareName, portalName, --- 433,437 ---- string portalName = "PR" + getStmtName(); ! this.statement = this.connection.DbConnection.DB.CreateStatement( prepareName, portalName, *************** *** 438,450 **** // Parse the statment ! statement.Parse(); // Describe parameters ! statement.Describe(); } else { // Close existent portal ! statement.ClosePortal(); } } --- 439,451 ---- // Parse the statment ! this.statement.Parse(); // Describe parameters ! this.statement.Describe(); } else { // Close existent portal ! this.statement.ClosePortal(); } } *************** *** 466,473 **** // Bind Statement ! statement.Bind(); // Execute Statement ! statement.Execute(); } catch (PgClientException ex) --- 467,474 ---- // Bind Statement ! this.statement.Bind(); // Execute Statement ! this.statement.Execute(); } catch (PgClientException ex) *************** *** 481,486 **** try { ! statement = connection.DbConnection.DB.CreateStatement(commandText); ! statement.Query(); } catch (PgClientException ex) --- 482,487 ---- try { ! this.statement = this.connection.DbConnection.DB.CreateStatement(commandText); ! this.statement.Query(); } catch (PgClientException ex) *************** *** 492,502 **** internal void InternalClose() { ! if (statement != null) { try { // Closing the prepared statement closes all his portals too. ! statement.Close(); ! statement = null; } catch (PgClientException ex) --- 493,503 ---- internal void InternalClose() { ! if (this.statement != null) { try { // Closing the prepared statement closes all his portals too. ! this.statement.Close(); ! this.statement = null; } catch (PgClientException ex) *************** *** 525,534 **** if (commandText != null && commandText.Trim().Length > 0) { ! statement.Close(); ! statement.ClosePortal(); ! statement = null; ! InternalPrepare(); ! InternalExecute(); returnValue = true; --- 526,535 ---- if (commandText != null && commandText.Trim().Length > 0) { ! this.statement.Close(); ! this.statement.ClosePortal(); ! this.statement = null; ! this.InternalPrepare(); ! this.InternalExecute(); returnValue = true; *************** *** 548,552 **** int i = 0; ! object[] values = (object[])statement.Rows[0]; while (paramEnumerator.MoveNext()) --- 549,553 ---- int i = 0; ! object[] values = (object[])this.statement.Rows[0]; while (paramEnumerator.MoveNext()) *************** *** 605,609 **** { return GetHashCode().ToString() + ! connection.GetHashCode().ToString() + DateTime.Now.Ticks; } --- 606,610 ---- { return GetHashCode().ToString() + ! this.connection.GetHashCode().ToString() + DateTime.Now.Ticks; } *************** *** 628,632 **** if (parameters.Count != 0) { ! for (int i = 0; i < statement.Parameters.Length; i++) { string parameterName = parameters[i].ParameterName; --- 629,633 ---- if (parameters.Count != 0) { ! for (int i = 0; i < this.statement.Parameters.Length; i++) { string parameterName = parameters[i].ParameterName; *************** *** 650,658 **** if (parameters[index].Value == System.DBNull.Value) { ! statement.Parameters[i].Value = null; } else { ! statement.Parameters[i].Value = parameters[index].Value; } } --- 651,659 ---- if (parameters[index].Value == System.DBNull.Value) { ! this.statement.Parameters[i].Value = null; } else { ! this.statement.Parameters[i].Value = parameters[index].Value; } } *************** *** 663,686 **** private void checkCommand() { ! if (connection == null || connection.State != ConnectionState.Open) { throw new InvalidOperationException("Connection must valid and open"); } ! if (connection.DataReader != null) { throw new InvalidOperationException("There is already an open DataReader associated with this Connection which must be closed first."); } ! if (connection.ActiveTransaction != null && ! !connection.ActiveTransaction.IsUpdated && this.Transaction == null) { throw new InvalidOperationException("Execute requires the Command object to have a Transaction object when the Connection object assigned to the command is in a pending local transaction. The Transaction property of the Command has not been initialized."); } ! if (transaction != null && ! !connection.Equals(Transaction.Connection)) { throw new InvalidOperationException("Command Connection is not equal to Transaction Connection"); } ! if (commandText == String.Empty || commandText == null) { throw new InvalidOperationException ("The command text for this Command has not been set."); --- 664,688 ---- private void checkCommand() { ! if (this.connection == null || ! this.connection.State != ConnectionState.Open) { throw new InvalidOperationException("Connection must valid and open"); } ! if (this.connection.DataReader != null) { throw new InvalidOperationException("There is already an open DataReader associated with this Connection which must be closed first."); } ! if (this.connection.ActiveTransaction != null && ! !this.connection.ActiveTransaction.IsUpdated && this.Transaction == null) { throw new InvalidOperationException("Execute requires the Command object to have a Transaction object when the Connection object assigned to the command is in a pending local transaction. The Transaction property of the Command has not been initialized."); } ! if (this.transaction != null && ! !this.connection.Equals(Transaction.Connection)) { throw new InvalidOperationException("Command Connection is not equal to Transaction Connection"); } ! if (this.commandText == String.Empty || this.commandText == null) { throw new InvalidOperationException ("The command text for this Command has not been set."); Index: PgConnection.cs =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/PostgreSql.Data.PgSqlClient/source/PgConnection.cs,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** PgConnection.cs 6 Oct 2003 18:46:59 -0000 1.4 --- PgConnection.cs 8 Nov 2003 12:55:23 -0000 1.5 *************** *** 28,33 **** namespace PostgreSql.Data.PgSqlClient { ! [ToolboxBitmap(typeof(PgConnection), "Resources.ToolBox.PgConnection.bmp")] ! [DefaultEvent("InfoMessage")] public sealed class PgConnection : Component, IDbConnection, ICloneable { --- 28,34 ---- namespace PostgreSql.Data.PgSqlClient { ! [ToolboxItem(true), ! ToolboxBitmap(typeof(PgConnection), "Resources.ToolBox.PgConnection.bmp"), ! DefaultEvent("InfoMessage")] public sealed class PgConnection : Component, IDbConnection, ICloneable { Index: PgDataAdapter.cs =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/PostgreSql.Data.PgSqlClient/source/PgDataAdapter.cs,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** PgDataAdapter.cs 2 Aug 2003 19:43:00 -0000 1.1.1.1 --- PgDataAdapter.cs 8 Nov 2003 12:55:23 -0000 1.2 *************** *** 33,37 **** #endregion ! [ToolboxBitmap(typeof(PgDataAdapter), "Resources.ToolBox.PgDataAdapter.bmp"), DefaultEvent("RowUpdated")] public sealed class PgDataAdapter : DbDataAdapter, IDbDataAdapter --- 33,38 ---- #endregion ! [ToolboxItem(true), ! ToolboxBitmap(typeof(PgDataAdapter), "Resources.ToolBox.PgDataAdapter.bmp"), DefaultEvent("RowUpdated")] public sealed class PgDataAdapter : DbDataAdapter, IDbDataAdapter Index: PgDataReader.cs =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/PostgreSql.Data.PgSqlClient/source/PgDataReader.cs,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** PgDataReader.cs 26 Oct 2003 14:56:38 -0000 1.11 --- PgDataReader.cs 8 Nov 2003 12:55:23 -0000 1.12 *************** *** 35,47 **** #region FIELDS ! private const int STARTPOS = -1; ! private bool disposed; ! private bool open; ! private int position; ! private int recordsAffected; ! private int fieldCount; ! private DataTable schemaTable; ! private PgCommand command; ! private object[] row; #endregion --- 35,49 ---- #region FIELDS ! private const int STARTPOS = -1; ! private bool disposed; ! private bool open; ! private int position; ! private int recordsAffected; ! private int fieldCount; ! private DataTable schemaTable; ! private CommandBehavior behavior; ! private PgCommand command; ! private PgConnection connection; ! private object[] row; #endregion *************** *** 51,65 **** private PgDataReader() { ! open = true; ! position = STARTPOS; ! recordsAffected = -1; ! fieldCount = -1; } ! internal PgDataReader(PgCommand command) : this() { ! command.Connection.DataReader = this; ! ! this.command = command; } --- 53,67 ---- private PgDataReader() { ! this.open = true; ! this.position = STARTPOS; ! this.recordsAffected = -1; ! this.fieldCount = -1; } ! internal PgDataReader(PgCommand command, PgConnection connection) : this() { ! this.command = command; ! this.behavior = this.command.CommandBehavior; ! this.connection = connection; } *************** *** 70,79 **** ~PgDataReader() { ! Dispose(false); } void IDisposable.Dispose() { ! Dispose(true); System.GC.SuppressFinalize(this); } --- 72,81 ---- ~PgDataReader() { ! this.Dispose(false); } void IDisposable.Dispose() { ! this.Dispose(true); System.GC.SuppressFinalize(this); } *************** *** 81,85 **** private void Dispose(bool disposing) { ! if (!disposed) { try --- 83,87 ---- private void Dispose(bool disposing) { ! if (!this.disposed) { try *************** *** 88,92 **** { // release any managed resources ! Close(); } --- 90,99 ---- { // release any managed resources ! this.Close(); ! ! this.command = null; ! this.connection = null; ! this.row = null; ! this.schemaTable= null; } *************** *** 97,101 **** } ! disposed = true; } } --- 104,108 ---- } ! this.disposed = true; } } *************** *** 130,134 **** public void Close() { ! if (!open) { return; --- 137,141 ---- public void Close() { ! if (!this.open) { return; *************** *** 136,180 **** // This will update RecordsAffected property ! updateRecordsAffected(); ! if (command != null && !command.IsDisposed) { ! command.Connection.DataReader = null; ! ! if (command.Statement != null) { // Set values of output parameters ! command.InternalSetOutputParameters(); ! ! if ((command.CommandBehavior & CommandBehavior.CloseConnection) == CommandBehavior.CloseConnection) ! { ! command.Connection.Close(); ! } } } ! open = false; ! position = STARTPOS; } public bool NextResult() { ! if (IsClosed) { throw new InvalidOperationException("The datareader must be opened."); } ! updateRecordsAffected(); ! bool returnValue = command.NextResult(); if (returnValue) { ! fieldCount = command.Statement.RowDescriptor.Fields.Length; ! position = STARTPOS; } else { ! row = null; } --- 143,190 ---- // This will update RecordsAffected property ! this.updateRecordsAffected(); ! if (this.command != null && !this.command.IsDisposed) { ! if (this.command.Statement != null) { // Set values of output parameters ! this.command.InternalSetOutputParameters(); } } ! if (this.connection != null) ! { ! this.connection.DataReader = null; ! ! if ((this.behavior & CommandBehavior.CloseConnection) == CommandBehavior.CloseConnection) ! { ! this.connection.Close(); ! } ! } ! ! this.open = false; ! this.position = STARTPOS; } public bool NextResult() { ! if (this.IsClosed) { throw new InvalidOperationException("The datareader must be opened."); } ! this.updateRecordsAffected(); ! bool returnValue = this.command.NextResult(); if (returnValue) { ! this.fieldCount = this.command.Statement.RowDescriptor.Fields.Length; ! this.position = STARTPOS; } else { ! this.row = null; } *************** *** 186,191 **** bool read = false; ! if ((command.CommandBehavior == CommandBehavior.SingleRow && ! position != STARTPOS) || !command.Statement.HasRows) { } --- 196,202 ---- bool read = false; ! if ((this.behavior == CommandBehavior.SingleRow && ! this.position != STARTPOS) || ! !this.command.Statement.HasRows) { } *************** *** 194,204 **** try { ! fieldCount = command.Statement.RowDescriptor.Fields.Length; ! ++position; row = command.Statement.FetchRow(); ! read = (row == null) ? false : true; } catch (PgClientException ex) --- 205,215 ---- try { ! this.fieldCount = this.command.Statement.RowDescriptor.Fields.Length; ! this.position++; row = command.Statement.FetchRow(); ! read = (this.row == null) ? false : true; } catch (PgClientException ex) |
From: <car...@us...> - 2003-11-07 10:07:19
|
Update of /cvsroot/pgsqlclient/pgsqlclient_10/Mono.Security.Protocol.Tls In directory sc8-pr-cvs1:/tmp/cvs-serv29139 Modified Files: changelog.txt Log Message: Updated CHANGELOG.TXT Index: changelog.txt =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/Mono.Security.Protocol.Tls/changelog.txt,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** changelog.txt 3 Nov 2003 19:43:22 -0000 1.7 --- changelog.txt 7 Nov 2003 10:07:16 -0000 1.8 *************** *** 2,20 **** --------------- ----------- ----------------------------------------- 2003-11-03 Carlos Guzmán Álvarez <car...@te...> ! * TlsHandshakeMessages.cs: - Removed file. ! * TlsSslHandshakeHash.cs: - New class for handshake hashes calculation on SSL3 protocol. ! * TlsSessionContext.cs: - Fixed mac keys clearing for SSL3 protocol. ! * TlsSslCipherSuite.cs: * Mono.Security.Protocol.Tls.Handshake.Client/TlsClientFinished.cs: --- 2,42 ---- --------------- ----------- ----------------------------------------- + 2003-11-04 Carlos Guzmán Álvarez <car...@te...> + + * Mono.Security.Protocol.Tls.Handshake.Client/TlsServerCertificate.cs: + + - Commented server certificate signature verification. + + * Mono.Security.Protocol.Tls/TlsServerSettings.cs: + + - Renamed ServerCertificates property to Certificates. + + + ----------------- Updated Mono Sources ------------------------------- + + + + 2003-11-04 Carlos Guzmán Álvarez <car...@te...> + + * CipherSuite.cs: + + - Added custom padding for record encryption. + + 2003-11-03 Carlos Guzmán Álvarez <car...@te...> ! * Mono.Security.Protocol.Tls.Handshake/TlsHandshakeMessages.cs: - Removed file. ! * Mono.Security.Protocol.Tls/TlsSslHandshakeHash.cs: - New class for handshake hashes calculation on SSL3 protocol. ! * Mono.Security.Protocol.Tls/TlsSessionContext.cs: - Fixed mac keys clearing for SSL3 protocol. ! * Mono.Security.Protocol.Tls/TlsSslCipherSuite.cs: * Mono.Security.Protocol.Tls.Handshake.Client/TlsClientFinished.cs: *************** *** 46,50 **** - Changed verify method name to verifySignature. ! * TlsSessionContext.cs: - Changed handshakeHashes member to be an TlsStream. --- 68,72 ---- - Changed verify method name to verifySignature. ! * Mono.Security.Protocol.Tls/TlsSessionContext.cs: - Changed handshakeHashes member to be an TlsStream. *************** *** 52,58 **** 2003-10-28 Carlos Guzmán Álvarez <car...@te...> ! * CipherSuite.cs: ! * TlsSessionSettings.cs: ! * TlsServerSettings.cs: * Mono.Security.Protocol.Tls.Handshake.Client/TlsClientCertificateVerify.cs: * Mono.Security.Protocol.Tls.Handshake.Client/TlsClientKeyExchange.cs: --- 74,80 ---- 2003-10-28 Carlos Guzmán Álvarez <car...@te...> ! * Mono.Security.Protocol.Tls/CipherSuite.cs: ! * Mono.Security.Protocol.Tls/TlsSessionSettings.cs: ! * Mono.Security.Protocol.Tls/TlsServerSettings.cs: * Mono.Security.Protocol.Tls.Handshake.Client/TlsClientCertificateVerify.cs: * Mono.Security.Protocol.Tls.Handshake.Client/TlsClientKeyExchange.cs: *************** *** 66,70 **** - New files from mono for allow basic certificate validation. - --- 88,91 ---- |
Update of /cvsroot/pgsqlclient/pgsqlclient_10/Mono.Security.Protocol.Tls/Mono.Security.Protocol.Tls/Mono.Security.Protocol.Tls.Handshake/Mono.Security.Protocol.Tls.Handshake.Client In directory sc8-pr-cvs1:/tmp/cvs-serv29040 Modified Files: TlsServerKeyExchange.cs Log Message: 2003-11-04 Carlos Guzmán Álvarez <car...@te...> * Mono.Security.Protocol.Tls.Handshake.Client/TlsServerCertificate.cs: - Commented server certificate signature verification. Index: TlsServerKeyExchange.cs =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/Mono.Security.Protocol.Tls/Mono.Security.Protocol.Tls/Mono.Security.Protocol.Tls.Handshake/Mono.Security.Protocol.Tls.Handshake.Client/TlsServerKeyExchange.cs,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** TlsServerKeyExchange.cs 3 Nov 2003 16:21:25 -0000 1.10 --- TlsServerKeyExchange.cs 7 Nov 2003 10:06:23 -0000 1.11 *************** *** 106,110 **** // Verify Signature ! X509Certificate certificate = this.Session.Context.ServerSettings.ServerCertificates[0]; RSACryptoServiceProvider rsa = new RSACryptoServiceProvider(rsaParams.Modulus.Length << 3); --- 106,110 ---- // Verify Signature ! X509Certificate certificate = this.Session.Context.ServerSettings.Certificates[0]; RSACryptoServiceProvider rsa = new RSACryptoServiceProvider(rsaParams.Modulus.Length << 3); |
Update of /cvsroot/pgsqlclient/pgsqlclient_10/Mono.Security.Protocol.Tls/Mono.Security.Protocol.Tls/Mono.Security.Protocol.Tls.Handshake/Mono.Security.Protocol.Tls.Handshake.Client In directory sc8-pr-cvs1:/tmp/cvs-serv28975 Modified Files: TlsServerCertificate.cs Log Message: 2003-11-04 Carlos Guzmán Álvarez <car...@te...> * Mono.Security.Protocol.Tls.Handshake.Client/TlsServerCertificate.cs: - Commented server certificate signature verification. Index: TlsServerCertificate.cs =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/Mono.Security.Protocol.Tls/Mono.Security.Protocol.Tls/Mono.Security.Protocol.Tls.Handshake/Mono.Security.Protocol.Tls.Handshake.Client/TlsServerCertificate.cs,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** TlsServerCertificate.cs 3 Nov 2003 11:51:03 -0000 1.8 --- TlsServerCertificate.cs 7 Nov 2003 10:05:51 -0000 1.9 *************** *** 39,51 **** #endregion - #region PROPERTIES - - public X509CertificateCollection Certificates - { - get { return certificates; } - } - - #endregion - #region CONSTRUCTORS --- 39,42 ---- *************** *** 62,66 **** { base.UpdateSession(); ! this.Session.Context.ServerSettings.ServerCertificates = certificates; } --- 53,57 ---- { base.UpdateSession(); ! this.Session.Context.ServerSettings.Certificates = certificates; } *************** *** 120,127 **** --- 111,120 ---- // 3 step: Validate digital sign + /* if (!certificate.VerifySignature(certificate.RSA)) { throw Session.CreateException("Certificate received from the server has invalid signature."); } + */ // 4 step: Validate domain name |
Update of /cvsroot/pgsqlclient/pgsqlclient_10/Mono.Security.Protocol.Tls/Mono.Security.Protocol.Tls In directory sc8-pr-cvs1:/tmp/cvs-serv28953 Modified Files: CipherSuite.cs TlsCipherSuiteFactory.cs TlsServerSettings.cs Log Message: Updated files Index: CipherSuite.cs =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/Mono.Security.Protocol.Tls/Mono.Security.Protocol.Tls/CipherSuite.cs,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** CipherSuite.cs 4 Nov 2003 09:18:46 -0000 1.6 --- CipherSuite.cs 7 Nov 2003 10:05:35 -0000 1.7 *************** *** 196,200 **** else { ! rsa = this.Context.ServerSettings.ServerCertificates[0].RSA; } --- 196,200 ---- else { ! rsa = this.Context.ServerSettings.Certificates[0].RSA; } Index: TlsCipherSuiteFactory.cs =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/Mono.Security.Protocol.Tls/Mono.Security.Protocol.Tls/TlsCipherSuiteFactory.cs,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** TlsCipherSuiteFactory.cs 3 Nov 2003 20:34:30 -0000 1.8 --- TlsCipherSuiteFactory.cs 7 Nov 2003 10:05:35 -0000 1.9 *************** *** 50,57 **** TlsCipherSuiteCollection scs = new TlsCipherSuiteCollection(TlsProtocol.Tls1); ! // Supported ciphers ! // scs.Add((0x00 << 0x08) | 0x06, "TLS_RSA_EXPORT_WITH_RC2_CBC_40_MD5", "RC2", "MD5", true, true, 5, 16, 40, 8, 8); ! scs.Add((0x00 << 0x08) | 0x35, "TLS_RSA_WITH_AES_256_CBC_SHA", "Rijndael", "SHA1", false, true, 32, 32, 256, 16, 16); ! scs.Add((0x00 << 0x08) | 0x2F, "TLS_RSA_WITH_AES_128_CBC_SHA", "Rijndael", "SHA1", false, true, 16, 16, 128, 16, 16); scs.Add((0x00 << 0x08) | 0x0A, "TLS_RSA_WITH_3DES_EDE_CBC_SHA", "3DES", "SHA1", false, true, 24, 24, 168, 8, 8); scs.Add((0x00 << 0x08) | 0x09, "TLS_RSA_WITH_DES_CBC_SHA", "DES", "SHA1", false, true, 8, 8, 56, 8, 8); --- 50,56 ---- TlsCipherSuiteCollection scs = new TlsCipherSuiteCollection(TlsProtocol.Tls1); ! // Supported ciphers ! // scs.Add((0x00 << 0x08) | 0x35, "TLS_RSA_WITH_AES_256_CBC_SHA", "Rijndael", "SHA1", false, true, 32, 32, 256, 16, 16); ! // scs.Add((0x00 << 0x08) | 0x2F, "TLS_RSA_WITH_AES_128_CBC_SHA", "Rijndael", "SHA1", false, true, 16, 16, 128, 16, 16); scs.Add((0x00 << 0x08) | 0x0A, "TLS_RSA_WITH_3DES_EDE_CBC_SHA", "3DES", "SHA1", false, true, 24, 24, 168, 8, 8); scs.Add((0x00 << 0x08) | 0x09, "TLS_RSA_WITH_DES_CBC_SHA", "DES", "SHA1", false, true, 8, 8, 56, 8, 8); Index: TlsServerSettings.cs =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/Mono.Security.Protocol.Tls/Mono.Security.Protocol.Tls/TlsServerSettings.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** TlsServerSettings.cs 28 Oct 2003 16:13:16 -0000 1.2 --- TlsServerSettings.cs 7 Nov 2003 10:05:35 -0000 1.3 *************** *** 35,39 **** #region FIELDS ! private X509CertificateCollection serverCertificates; private bool serverKeyExchange; private bool certificateRequest; --- 35,39 ---- #region FIELDS ! private X509CertificateCollection certificates; private bool serverKeyExchange; private bool certificateRequest; *************** *** 83,90 **** } ! public X509CertificateCollection ServerCertificates { ! get { return serverCertificates; } ! set { serverCertificates = value; } } --- 83,90 ---- } ! public X509CertificateCollection Certificates { ! get { return certificates; } ! set { certificates = value; } } |
From: <car...@us...> - 2003-11-06 16:37:42
|
Update of /cvsroot/pgsqlclient/pgsqlclient_10 In directory sc8-pr-cvs1:/tmp/cvs-serv13220 Modified Files: changelog.txt Log Message: 2003-11-06 Carlos Guzmán Álvarez <car...@te...> * source/NPgClient/PgResponsePacket.cs: - Added more precise handling of float values that sometimes have a offset of 0.5 ( Thanks to Jesus for his feedback ) Index: changelog.txt =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/changelog.txt,v retrieving revision 1.68 retrieving revision 1.69 diff -C2 -d -r1.68 -r1.69 *** changelog.txt 1 Nov 2003 10:31:29 -0000 1.68 --- changelog.txt 6 Nov 2003 16:37:39 -0000 1.69 *************** *** 2,8 **** ------------------------------------------------------- ! 2003-11-01 Alban Colley <albancolley at users.sourceforge.net> * source/NPgClient/PgStatement.cs: --- 2,14 ---- ------------------------------------------------------- + 2003-11-06 Carlos Guzmán Álvarez <car...@te...> ! * source/NPgClient/PgResponsePacket.cs: ! ! - Added more precise handling of float values that sometimes have a offset of ! 0.5 ( Thanks to Jesus for his feedback ) + + 2003-11-01 Alban Colley <albancolley at users.sourceforge.net> * source/NPgClient/PgStatement.cs: |
From: <car...@us...> - 2003-11-06 16:37:25
|
Update of /cvsroot/pgsqlclient/pgsqlclient_10/PostgreSql.Data.PgSqlClient/source/NPgClient In directory sc8-pr-cvs1:/tmp/cvs-serv13179 Modified Files: PgResponsePacket.cs Log Message: 2003-11-06 Carlos Guzmán Álvarez <car...@te...> * source/NPgClient/PgResponsePacket.cs: - Added more precise handling of float values that sometimes have a offset of 0.5 ( Thanks to Jesus for his feedback ) Index: PgResponsePacket.cs =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/PostgreSql.Data.PgSqlClient/source/NPgClient/PgResponsePacket.cs,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** PgResponsePacket.cs 28 Oct 2003 10:44:55 -0000 1.18 --- PgResponsePacket.cs 6 Nov 2003 16:37:22 -0000 1.19 *************** *** 175,181 **** { FloatLayout floatValue = new FloatLayout(); ! ! floatValue.f = base.ReadSingle(); ! floatValue.i0 = IPAddress.HostToNetworkOrder(floatValue.i0); return floatValue.f; --- 175,179 ---- { FloatLayout floatValue = new FloatLayout(); ! floatValue.i0 = IPAddress.HostToNetworkOrder(base.ReadInt32()); return floatValue.f; |
From: <car...@us...> - 2003-11-04 09:18:49
|
Update of /cvsroot/pgsqlclient/pgsqlclient_10/Mono.Security.Protocol.Tls/Mono.Security.Protocol.Tls In directory sc8-pr-cvs1:/tmp/cvs-serv22688 Modified Files: CipherSuite.cs Log Message: 2003-11-04 Carlos Guzmán Álvarez <car...@te...> * CipherSuite.cs: - Added custom padding for record encryption. Index: CipherSuite.cs =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/Mono.Security.Protocol.Tls/Mono.Security.Protocol.Tls/CipherSuite.cs,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** CipherSuite.cs 3 Nov 2003 20:34:30 -0000 1.5 --- CipherSuite.cs 4 Nov 2003 09:18:46 -0000 1.6 *************** *** 250,257 **** // Calculate padding_length int fragmentLength = fragment.Length + mac.Length + 1; ! int paddingLength = (((fragmentLength/this.BlockSize)*this.BlockSize) + this.BlockSize) - fragmentLength; // Write padding length byte ! cs.WriteByte((byte)paddingLength); } // cs.FlushFinalBlock(); --- 250,264 ---- // Calculate padding_length int fragmentLength = fragment.Length + mac.Length + 1; ! int paddingLength = this.blockSize - fragmentLength % this.blockSize; ! if (paddingLength == this.blockSize) ! { ! paddingLength = 0; ! } // Write padding length byte ! for (int i = 0; i < (paddingLength + 1); i++) ! { ! cs.WriteByte((byte)paddingLength); ! } } // cs.FlushFinalBlock(); *************** *** 449,453 **** // Configure encrypt algorithm encryptionAlgorithm.Mode = this.cipherMode; ! encryptionAlgorithm.Padding = PaddingMode.PKCS7; encryptionAlgorithm.KeySize = this.keyMaterialSize * 8; encryptionAlgorithm.BlockSize = this.blockSize * 8; --- 456,460 ---- // Configure encrypt algorithm encryptionAlgorithm.Mode = this.cipherMode; ! encryptionAlgorithm.Padding = PaddingMode.None; encryptionAlgorithm.KeySize = this.keyMaterialSize * 8; encryptionAlgorithm.BlockSize = this.blockSize * 8; |
Update of /cvsroot/pgsqlclient/pgsqlclient_10/Mono.Security.Protocol.Tls/Mono.Security.Protocol.Tls In directory sc8-pr-cvs1:/tmp/cvs-serv25276 Modified Files: CipherSuite.cs TlsCipherSuiteFactory.cs TlsSslCipherSuite.cs Log Message: no message Index: CipherSuite.cs =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/Mono.Security.Protocol.Tls/Mono.Security.Protocol.Tls/CipherSuite.cs,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** CipherSuite.cs 28 Oct 2003 16:13:16 -0000 1.4 --- CipherSuite.cs 3 Nov 2003 20:34:30 -0000 1.5 *************** *** 255,259 **** cs.WriteByte((byte)paddingLength); } ! //cs.FlushFinalBlock(); cs.Close(); --- 255,259 ---- cs.WriteByte((byte)paddingLength); } ! // cs.FlushFinalBlock(); cs.Close(); *************** *** 275,278 **** --- 275,280 ---- // Calculate padding_length paddingLength = buffer[buffer.Length - 1]; + + /* Review this that is valid way for TLS1 but not for SSL3 for (int i = (buffer.Length - 1); i > (buffer.Length - (paddingLength + 1)); i--) { *************** *** 283,286 **** --- 285,289 ---- } } + */ fragmentSize = (buffer.Length - (paddingLength + 1)) - HashSize; Index: TlsCipherSuiteFactory.cs =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/Mono.Security.Protocol.Tls/Mono.Security.Protocol.Tls/TlsCipherSuiteFactory.cs,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** TlsCipherSuiteFactory.cs 3 Nov 2003 19:41:34 -0000 1.7 --- TlsCipherSuiteFactory.cs 3 Nov 2003 20:34:30 -0000 1.8 *************** *** 121,126 **** // Supported ciphers ! // scs.Add((0x00 << 0x08) | 0x0A, "SSL_RSA_WITH_3DES_EDE_CBC_SHA", "3DES", "SHA1", false, true, 24, 24, 168, 8, 8); ! // scs.Add((0x00 << 0x08) | 0x09, "SSL_RSA_WITH_DES_CBC_SHA", "DES", "SHA1", false, true, 8, 8, 56, 8, 8); scs.Add((0x00 << 0x08) | 0x05, "SSL_RSA_WITH_RC4_128_SHA", "RC4", "SHA1", false, false, 16, 16, 128, 0, 0); scs.Add((0x00 << 0x08) | 0x04, "SSL_RSA_WITH_RC4_128_MD5", "RC4", "MD5", false, false, 16, 16, 128, 0, 0); --- 121,126 ---- // Supported ciphers ! scs.Add((0x00 << 0x08) | 0x0A, "SSL_RSA_WITH_3DES_EDE_CBC_SHA", "3DES", "SHA1", false, true, 24, 24, 168, 8, 8); ! scs.Add((0x00 << 0x08) | 0x09, "SSL_RSA_WITH_DES_CBC_SHA", "DES", "SHA1", false, true, 8, 8, 56, 8, 8); scs.Add((0x00 << 0x08) | 0x05, "SSL_RSA_WITH_RC4_128_SHA", "RC4", "SHA1", false, false, 16, 16, 128, 0, 0); scs.Add((0x00 << 0x08) | 0x04, "SSL_RSA_WITH_RC4_128_MD5", "RC4", "MD5", false, false, 16, 16, 128, 0, 0); Index: TlsSslCipherSuite.cs =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/Mono.Security.Protocol.Tls/Mono.Security.Protocol.Tls/TlsSslCipherSuite.cs,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** TlsSslCipherSuite.cs 3 Nov 2003 18:11:54 -0000 1.9 --- TlsSslCipherSuite.cs 3 Nov 2003 20:34:30 -0000 1.10 *************** *** 112,116 **** block.Write(fragment); ! byte[] blockHash = hash.ComputeHash(block.ToArray(), 0, (int)block.Length); block.Reset(); --- 112,118 ---- block.Write(fragment); ! hash.ComputeHash(block.ToArray(), 0, (int)block.Length); ! ! byte[] blockHash = hash.Hash; block.Reset(); *************** *** 120,128 **** block.Write(blockHash); ! blockHash = hash.ComputeHash(block.ToArray(), 0, (int)block.Length); block.Reset(); ! return blockHash; } --- 122,130 ---- block.Write(blockHash); ! hash.ComputeHash(block.ToArray(), 0, (int)block.Length); block.Reset(); ! return hash.Hash; } |
From: <car...@us...> - 2003-11-03 19:43:25
|
Update of /cvsroot/pgsqlclient/pgsqlclient_10/Mono.Security.Protocol.Tls In directory sc8-pr-cvs1:/tmp/cvs-serv14644 Modified Files: changelog.txt Log Message: Updated CHANGELOG.TXT Index: changelog.txt =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/Mono.Security.Protocol.Tls/changelog.txt,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** changelog.txt 3 Nov 2003 18:13:52 -0000 1.6 --- changelog.txt 3 Nov 2003 19:43:22 -0000 1.7 *************** *** 12,15 **** --- 12,19 ---- - New class for handshake hashes calculation on SSL3 protocol. + * TlsSessionContext.cs: + + - Fixed mac keys clearing for SSL3 protocol. + * TlsSslCipherSuite.cs: * Mono.Security.Protocol.Tls.Handshake.Client/TlsClientFinished.cs: |
From: <car...@us...> - 2003-11-03 19:42:36
|
Update of /cvsroot/pgsqlclient/pgsqlclient_10/Mono.Security.Protocol.Tls/Mono.Security.Protocol.Tls/Mono.Security.Protocol.Tls.Handshake In directory sc8-pr-cvs1:/tmp/cvs-serv14496 Modified Files: TlsHandshakeMessage.cs Log Message: * TlsSessionContext.cs: - Fixed mac keys clearing for SSL3 protocol. Index: TlsHandshakeMessage.cs =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/Mono.Security.Protocol.Tls/Mono.Security.Protocol.Tls/Mono.Security.Protocol.Tls.Handshake/TlsHandshakeMessage.cs,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** TlsHandshakeMessage.cs 3 Nov 2003 18:13:00 -0000 1.9 --- TlsHandshakeMessage.cs 3 Nov 2003 19:42:31 -0000 1.10 *************** *** 125,130 **** c.Write((byte)HandshakeType); ! c.WriteInt24((int)Length); ! c.Write(ToArray()); result = c.ToArray(); --- 125,130 ---- c.Write((byte)HandshakeType); ! c.WriteInt24((int)this.Length); ! c.Write(this.ToArray()); result = c.ToArray(); |
From: <car...@us...> - 2003-11-03 19:41:37
|
Update of /cvsroot/pgsqlclient/pgsqlclient_10/Mono.Security.Protocol.Tls/Mono.Security.Protocol.Tls In directory sc8-pr-cvs1:/tmp/cvs-serv14297 Modified Files: TlsCipherSuiteFactory.cs TlsSessionContext.cs Log Message: * TlsSessionContext.cs: - Fixed mac keys clearing for SSL3 protocol. Index: TlsCipherSuiteFactory.cs =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/Mono.Security.Protocol.Tls/Mono.Security.Protocol.Tls/TlsCipherSuiteFactory.cs,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** TlsCipherSuiteFactory.cs 3 Nov 2003 18:11:54 -0000 1.6 --- TlsCipherSuiteFactory.cs 3 Nov 2003 19:41:34 -0000 1.7 *************** *** 121,126 **** // Supported ciphers ! scs.Add((0x00 << 0x08) | 0x0A, "SSL_RSA_WITH_3DES_EDE_CBC_SHA", "3DES", "SHA1", false, true, 24, 24, 168, 8, 8); ! scs.Add((0x00 << 0x08) | 0x09, "SSL_RSA_WITH_DES_CBC_SHA", "DES", "SHA1", false, true, 8, 8, 56, 8, 8); scs.Add((0x00 << 0x08) | 0x05, "SSL_RSA_WITH_RC4_128_SHA", "RC4", "SHA1", false, false, 16, 16, 128, 0, 0); scs.Add((0x00 << 0x08) | 0x04, "SSL_RSA_WITH_RC4_128_MD5", "RC4", "MD5", false, false, 16, 16, 128, 0, 0); --- 121,126 ---- // Supported ciphers ! // scs.Add((0x00 << 0x08) | 0x0A, "SSL_RSA_WITH_3DES_EDE_CBC_SHA", "3DES", "SHA1", false, true, 24, 24, 168, 8, 8); ! // scs.Add((0x00 << 0x08) | 0x09, "SSL_RSA_WITH_DES_CBC_SHA", "DES", "SHA1", false, true, 8, 8, 56, 8, 8); scs.Add((0x00 << 0x08) | 0x05, "SSL_RSA_WITH_RC4_128_SHA", "RC4", "SHA1", false, false, 16, 16, 128, 0, 0); scs.Add((0x00 << 0x08) | 0x04, "SSL_RSA_WITH_RC4_128_MD5", "RC4", "MD5", false, false, 16, 16, 128, 0, 0); Index: TlsSessionContext.cs =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/Mono.Security.Protocol.Tls/Mono.Security.Protocol.Tls/TlsSessionContext.cs,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** TlsSessionContext.cs 3 Nov 2003 18:11:54 -0000 1.11 --- TlsSessionContext.cs 3 Nov 2003 19:41:34 -0000 1.12 *************** *** 272,281 **** this.clientWriteKey = null; this.clientWriteIV = null; ! this.clientWriteMAC = null; ! // Clear server keys this.serverWriteKey = null; this.serverWriteIV = null; ! this.serverWriteMAC = null; } --- 272,286 ---- this.clientWriteKey = null; this.clientWriteIV = null; ! // Clear server keys this.serverWriteKey = null; this.serverWriteIV = null; ! ! // Clear MAC keys if protocol is different than Ssl3 ! if (this.protocol != TlsProtocol.Ssl3) ! { ! this.clientWriteMAC = null; ! this.serverWriteMAC = null; ! } } |
From: <car...@us...> - 2003-11-03 18:13:55
|
Update of /cvsroot/pgsqlclient/pgsqlclient_10/Mono.Security.Protocol.Tls In directory sc8-pr-cvs1:/tmp/cvs-serv29080 Modified Files: changelog.txt Log Message: * TlsSslCipherSuite.cs: * Mono.Security.Protocol.Tls.Handshake.Client/TlsClientFinished.cs: - Added changes for make use of new TlsSslHandshakeHash class. * Mono.Security.Protocol.Tls.Handshake.Client/TlsServerFinished.cs: - Added initial implementation for SSL3 protocol. Index: changelog.txt =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/Mono.Security.Protocol.Tls/changelog.txt,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** changelog.txt 3 Nov 2003 10:34:19 -0000 1.5 --- changelog.txt 3 Nov 2003 18:13:52 -0000 1.6 *************** *** 7,15 **** - Removed file. ! * Mono.Security.Cryptography/MD5SHA1CryptoServiceProvider.cs: - New class for md5-sha hash calculation. ! * Mono.Security.Protocol.Tls.Handshake.Client/TlsClientFinished.cs: * Mono.Security.Protocol.Tls.Handshake.Client/TlsServerFinished.cs: --- 7,28 ---- - Removed file. ! ! * TlsSslHandshakeHash.cs: ! ! - New class for handshake hashes calculation on SSL3 protocol. ! ! * TlsSslCipherSuite.cs: ! * Mono.Security.Protocol.Tls.Handshake.Client/TlsClientFinished.cs: ! ! - Added changes for make use of new TlsSslHandshakeHash class. ! ! * Mono.Security.Protocol.Tls.Handshake.Client/TlsServerFinished.cs: ! ! - Added initial implementation for SSL3 protocol. ! * Mono.Security.Cryptography/MD5SHA1CryptoServiceProvider.cs: - New class for md5-sha hash calculation. ! * Mono.Security.Protocol.Tls.Handshake.Client/TlsClientFinished.cs: * Mono.Security.Protocol.Tls.Handshake.Client/TlsServerFinished.cs: |
Update of /cvsroot/pgsqlclient/pgsqlclient_10/Mono.Security.Protocol.Tls/Mono.Security.Protocol.Tls/Mono.Security.Protocol.Tls.Handshake/Mono.Security.Protocol.Tls.Handshake.Client In directory sc8-pr-cvs1:/tmp/cvs-serv28905 Modified Files: TlsClientFinished.cs TlsServerFinished.cs Log Message: * TlsSslCipherSuite.cs: * Mono.Security.Protocol.Tls.Handshake.Client/TlsClientFinished.cs: - Added changes for make use of new TlsSslHandshakeHash class. * Mono.Security.Protocol.Tls.Handshake.Client/TlsServerFinished.cs: - Added initial implementation for SSL3 protocol. Index: TlsClientFinished.cs =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/Mono.Security.Protocol.Tls/Mono.Security.Protocol.Tls/Mono.Security.Protocol.Tls.Handshake/Mono.Security.Protocol.Tls.Handshake.Client/TlsClientFinished.cs,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** TlsClientFinished.cs 3 Nov 2003 10:33:50 -0000 1.9 --- TlsClientFinished.cs 3 Nov 2003 18:13:20 -0000 1.10 *************** *** 55,60 **** protected override void ProcessAsSsl3() { ! this.Write(computeSslHash("MD5", Session.Context.HandshakeHashes.ToArray(), 0x434C4E54)); ! this.Write(computeSslHash("SHA1", Session.Context.HandshakeHashes.ToArray(), 0x434C4E54)); } --- 55,70 ---- protected override void ProcessAsSsl3() { ! // Compute handshake messages hashes ! HashAlgorithm hash = new TlsSslHandshakeHash(this.Session.Context.MasterSecret); ! ! TlsStream data = new TlsStream(); ! data.Write(this.Session.Context.HandshakeMessages.ToArray()); ! data.Write((int)0x434C4E54); ! ! hash.TransformFinalBlock(data.ToArray(), 0, (int)data.Length); ! ! this.Write(hash.Hash); ! ! data.Reset(); } *************** *** 64,107 **** HashAlgorithm hash = new MD5SHA1CryptoServiceProvider(); hash.ComputeHash( ! Session.Context.HandshakeHashes.ToArray(), 0, ! (int)Session.Context.HandshakeHashes.Length); // Write message Write(Session.Context.Cipher.PRF(Session.Context.MasterSecret, "client finished", hash.Hash, 12)); - } - - #endregion - - #region PRIVATE_METHODS - - private byte[] computeSslHash(string hashName, byte[] hashes, int sender) - { - HashAlgorithm hash = HashAlgorithm.Create(hashName); - TlsStream block = new TlsStream(); - TlsSslCipherSuite cipher = (TlsSslCipherSuite)this.Session.Context.Cipher; - byte[] pad1 = null; - byte[] pad2 = null; - - cipher.GeneratePad(hashName, ref pad1, ref pad2); - - block.Write(hashes); - block.Write(sender); - block.Write(this.Session.Context.MasterSecret); - block.Write(cipher.Pad1); - - byte[] blockHash = hash.ComputeHash(block.ToArray(), 0, (int)block.Length); - - block.Reset(); - - block.Write(this.Session.Context.MasterSecret); - block.Write(cipher.Pad2); - block.Write(blockHash); - - blockHash = hash.ComputeHash(block.ToArray(), 0, (int)block.Length); - - block.Reset(); - - return blockHash; } --- 74,83 ---- HashAlgorithm hash = new MD5SHA1CryptoServiceProvider(); hash.ComputeHash( ! Session.Context.HandshakeMessages.ToArray(), 0, ! (int)Session.Context.HandshakeMessages.Length); // Write message Write(Session.Context.Cipher.PRF(Session.Context.MasterSecret, "client finished", hash.Hash, 12)); } Index: TlsServerFinished.cs =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/Mono.Security.Protocol.Tls/Mono.Security.Protocol.Tls/Mono.Security.Protocol.Tls.Handshake/Mono.Security.Protocol.Tls.Handshake.Client/TlsServerFinished.cs,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** TlsServerFinished.cs 3 Nov 2003 08:53:20 -0000 1.9 --- TlsServerFinished.cs 3 Nov 2003 18:13:20 -0000 1.10 *************** *** 47,50 **** --- 47,54 ---- base.UpdateSession(); + // Reset Hahdshake messages information + this.Session.Context.HandshakeMessages.Reset(); + + // Hahdshake is finished this.Session.Context.HandshakeFinished = true; } *************** *** 56,60 **** protected override void ProcessAsSsl3() { ! throw new NotSupportedException(); } --- 60,89 ---- protected override void ProcessAsSsl3() { ! // Compute handshake messages hashes ! HashAlgorithm hash = new TlsSslHandshakeHash(this.Session.Context.MasterSecret); ! ! TlsStream data = new TlsStream(); ! data.Write(this.Session.Context.HandshakeMessages.ToArray()); ! data.Write((int)0x53525652); ! ! hash.TransformFinalBlock(data.ToArray(), 0, (int)data.Length); ! ! data.Reset(); ! ! byte[] serverHash = this.ReadBytes((int)Length); ! byte[] clientHash = hash.Hash; ! ! // Check server prf against client prf ! if (clientHash.Length != serverHash.Length) ! { ! throw new TlsException("Invalid ServerFinished message received."); ! } ! for (int i = 0; i < serverHash.Length; i++) ! { ! if (clientHash[i] != serverHash[i]) ! { ! throw new TlsException("Invalid ServerFinished message received."); ! } ! } } *************** *** 65,71 **** hash.ComputeHash( ! Session.Context.HandshakeHashes.ToArray(), 0, ! (int)Session.Context.HandshakeHashes.Length); byte[] clientPRF = this.Session.Context.Cipher.PRF(this.Session.Context.MasterSecret, "server finished", hash.Hash, 12); --- 94,100 ---- hash.ComputeHash( ! Session.Context.HandshakeMessages.ToArray(), 0, ! (int)Session.Context.HandshakeMessages.Length); byte[] clientPRF = this.Session.Context.Cipher.PRF(this.Session.Context.MasterSecret, "server finished", hash.Hash, 12); *************** *** 74,78 **** if (clientPRF.Length != serverPRF.Length) { ! throw new TlsException("Invalid finished message received from server."); } for (int i = 0; i < serverPRF.Length; i++) --- 103,107 ---- if (clientPRF.Length != serverPRF.Length) { ! throw new TlsException("Invalid ServerFinished message received."); } for (int i = 0; i < serverPRF.Length; i++) *************** *** 80,89 **** if (clientPRF[i] != serverPRF[i]) { ! throw new TlsException("Invalid finished message received from server."); } } - - // Reset Hahdshake messages information - this.Session.Context.HandshakeHashes.Reset(); } --- 109,115 ---- if (clientPRF[i] != serverPRF[i]) { ! throw new TlsException("Invalid ServerFinished message received."); } } } |
From: <car...@us...> - 2003-11-03 18:13:04
|
Update of /cvsroot/pgsqlclient/pgsqlclient_10/Mono.Security.Protocol.Tls/Mono.Security.Protocol.Tls/Mono.Security.Protocol.Tls.Handshake In directory sc8-pr-cvs1:/tmp/cvs-serv28769 Modified Files: TlsHandshakeMessage.cs Log Message: * TlsSslCipherSuite.cs: * Mono.Security.Protocol.Tls.Handshake.Client/TlsClientFinished.cs: - Added changes for make use of new TlsSslHandshakeHash class. * Mono.Security.Protocol.Tls.Handshake.Client/TlsServerFinished.cs: - Added initial implementation for SSL3 protocol. Index: TlsHandshakeMessage.cs =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/Mono.Security.Protocol.Tls/Mono.Security.Protocol.Tls/Mono.Security.Protocol.Tls.Handshake/TlsHandshakeMessage.cs,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** TlsHandshakeMessage.cs 3 Nov 2003 08:53:20 -0000 1.8 --- TlsHandshakeMessage.cs 3 Nov 2003 18:13:00 -0000 1.9 *************** *** 111,115 **** if (CanWrite) { ! this.session.Context.HandshakeHashes.Write(this.EncodeMessage()); this.Reset(); } --- 111,115 ---- if (CanWrite) { ! this.session.Context.HandshakeMessages.Write(this.EncodeMessage()); this.Reset(); } |
From: <car...@us...> - 2003-11-03 18:12:44
|
Update of /cvsroot/pgsqlclient/pgsqlclient_10/Mono.Security.Protocol.Tls/Mono.Security.Protocol.Tls/Mono.Security/Mono.Security.Cryptography In directory sc8-pr-cvs1:/tmp/cvs-serv28427 Modified Files: HMAC.cs Log Message: * TlsSslCipherSuite.cs: * Mono.Security.Protocol.Tls.Handshake.Client/TlsClientFinished.cs: - Added changes for make use of new TlsSslHandshakeHash class. * Mono.Security.Protocol.Tls.Handshake.Client/TlsServerFinished.cs: - Added initial implementation for SSL3 protocol. Index: HMAC.cs =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/Mono.Security.Protocol.Tls/Mono.Security.Protocol.Tls/Mono.Security/Mono.Security.Cryptography/HMAC.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** HMAC.cs 11 Oct 2003 10:07:38 -0000 1.1 --- HMAC.cs 3 Nov 2003 18:12:41 -0000 1.2 *************** *** 92,96 **** KeyValue = (byte[])rgbKey.Clone(); ! initializePad(); } --- 92,96 ---- KeyValue = (byte[])rgbKey.Clone(); ! this.Initialize(); } *************** *** 116,120 **** } ! initializePad(); } --- 116,120 ---- } ! this.Initialize(); } |
Update of /cvsroot/pgsqlclient/pgsqlclient_10/Mono.Security.Protocol.Tls/Mono.Security.Protocol.Tls In directory sc8-pr-cvs1:/tmp/cvs-serv27879 Modified Files: TlsCipherSuiteFactory.cs TlsSessionContext.cs TlsSocket.cs TlsSslCipherSuite.cs Added Files: TlsSslHandshakeHash.cs Log Message: * TlsSslCipherSuite.cs: * Mono.Security.Protocol.Tls.Handshake.Client/TlsClientFinished.cs: - Added changes for make use of new TlsSslHandshakeHash class. * Mono.Security.Protocol.Tls.Handshake.Client/TlsServerFinished.cs: - Added initial implementation for SSL3 protocol. --- NEW FILE: TlsSslHandshakeHash.cs --- (This appears to be a binary file; contents omitted.) Index: TlsCipherSuiteFactory.cs =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/Mono.Security.Protocol.Tls/Mono.Security.Protocol.Tls/TlsCipherSuiteFactory.cs,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** TlsCipherSuiteFactory.cs 24 Oct 2003 09:39:21 -0000 1.5 --- TlsCipherSuiteFactory.cs 3 Nov 2003 18:11:54 -0000 1.6 *************** *** 51,59 **** // Supported ciphers ! scs.Add((0x00 << 0x08) | 0x35, "TLS_RSA_WITH_AES_256_CBC_SHA", "Rijndael", "SHA", false, true, 32, 32, 256, 16, 16); ! scs.Add((0x00 << 0x08) | 0x2F, "TLS_RSA_WITH_AES_128_CBC_SHA", "Rijndael", "SHA", false, true, 16, 16, 128, 16, 16); ! scs.Add((0x00 << 0x08) | 0x0A, "TLS_RSA_WITH_3DES_EDE_CBC_SHA", "3DES", "SHA", false, true, 24, 24, 168, 8, 8); ! scs.Add((0x00 << 0x08) | 0x09, "TLS_RSA_WITH_DES_CBC_SHA", "DES", "SHA", false, true, 8, 8, 56, 8, 8); ! scs.Add((0x00 << 0x08) | 0x05, "TLS_RSA_WITH_RC4_128_SHA", "RC4", "SHA", false, false, 16, 16, 128, 0, 0); scs.Add((0x00 << 0x08) | 0x04, "TLS_RSA_WITH_RC4_128_MD5", "RC4", "MD5", false, false, 16, 16, 128, 0, 0); --- 51,60 ---- // Supported ciphers ! // scs.Add((0x00 << 0x08) | 0x06, "TLS_RSA_EXPORT_WITH_RC2_CBC_40_MD5", "RC2", "MD5", true, true, 5, 16, 40, 8, 8); ! scs.Add((0x00 << 0x08) | 0x35, "TLS_RSA_WITH_AES_256_CBC_SHA", "Rijndael", "SHA1", false, true, 32, 32, 256, 16, 16); ! scs.Add((0x00 << 0x08) | 0x2F, "TLS_RSA_WITH_AES_128_CBC_SHA", "Rijndael", "SHA1", false, true, 16, 16, 128, 16, 16); ! scs.Add((0x00 << 0x08) | 0x0A, "TLS_RSA_WITH_3DES_EDE_CBC_SHA", "3DES", "SHA1", false, true, 24, 24, 168, 8, 8); ! scs.Add((0x00 << 0x08) | 0x09, "TLS_RSA_WITH_DES_CBC_SHA", "DES", "SHA1", false, true, 8, 8, 56, 8, 8); ! scs.Add((0x00 << 0x08) | 0x05, "TLS_RSA_WITH_RC4_128_SHA", "RC4", "SHA1", false, false, 16, 16, 128, 0, 0); scs.Add((0x00 << 0x08) | 0x04, "TLS_RSA_WITH_RC4_128_MD5", "RC4", "MD5", false, false, 16, 16, 128, 0, 0); *************** *** 63,96 **** // RSA Cipher Suites // scs.Add((0x00 << 0x08) | 0x01, "TLS_RSA_WITH_NULL_MD5", "", "MD5", true, false, 0, 0, 0, 0, 0); ! // scs.Add((0x00 << 0x08) | 0x02, "TLS_RSA_WITH_NULL_SHA", "", "SHA", true, false, 0, 0, 0, 0, 0); // scs.Add((0x00 << 0x08) | 0x03, "TLS_RSA_EXPORT_WITH_RC4_40_MD5", "RC4", "MD5", true, false, 5, 16, 40, 0, 0); ! // scs.Add((0x00 << 0x08) | 0x05, "TLS_RSA_WITH_RC4_128_SHA", "RC4", "SHA", false, false, 16, 16, 128, 0, 0); // scs.Add((0x00 << 0x08) | 0x04, "TLS_RSA_WITH_RC4_128_MD5", "RC4", "MD5", false, false, 16, 16, 128, 0, 0); // scs.Add((0x00 << 0x08) | 0x06, "TLS_RSA_EXPORT_WITH_RC2_CBC_40_MD5", "RC2", "MD5", true, true, 5, 16, 40, 8, 8); ! // scs.Add((0x00 << 0x08) | 0x07, "TLS_RSA_WITH_IDEA_CBC_SHA", "IDEA", "SHA", false, true, 16, 16, 128, 8, 8); ! // scs.Add((0x00 << 0x08) | 0x08, "TLS_RSA_EXPORT_WITH_DES40_CBC_SHA", "DES", "SHA", true, true, 5, 8, 40, 8, 8); ! // scs.Add((0x00 << 0x08) | 0x09, "TLS_RSA_WITH_DES_CBC_SHA", "DES", "SHA", false, true, 8, 8, 56, 8, 8); ! // scs.Add((0x00 << 0x08) | 0x0A, "TLS_RSA_WITH_3DES_EDE_CBC_SHA", "3DES", "SHA", false, true, 24, 24, 168, 8, 8); // Diffie-Hellman Cipher Suites ! // scs.Add((0x00 << 0x08) | 0x0B, "TLS_DH_DSS_EXPORT_WITH_DES40_CBC_SHA", "DES", "SHA", true, true, 5, 8, 40, 8, 8); ! // scs.Add((0x00 << 0x08) | 0x0C, "TLS_DH_DSS_WITH_DES_CBC_SHA", "DES", "SHA", false, true, 8, 8, 56, 8, 8); ! // scs.Add((0x00 << 0x08) | 0x0D, "TLS_DH_DSS_WITH_3DES_EDE_CBC_SHA", "3DES", "SHA", false, true, 24, 24, 168, 8, 8); ! // scs.Add((0x00 << 0x08) | 0x0E, "TLS_DH_RSA_EXPORT_WITH_DES40_CBC_SHA", "DES", "SHA", true, true, 5, 8, 40, 8, 8); ! // scs.Add((0x00 << 0x08) | 0x0F, "TLS_DH_RSA_WITH_DES_CBC_SHA", "DES", "SHA", false, true, 8, 8, 56, 8, 8); ! // scs.Add((0x00 << 0x08) | 0x10, "TLS_DH_RSA_WITH_3DES_EDE_CBC_SHA", "3DES", "SHA", false, true, 24, 24, 168, 8, 8); ! // scs.Add((0x00 << 0x08) | 0x11, "TLS_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA", "DES", "SHA", true, true, 5, 8, 40, 8, 8); ! // scs.Add((0x00 << 0x08) | 0x12, "TLS_DHE_DSS_WITH_DES_CBC_SHA", "DES", "SHA", false, true, 8, 8, 56, 8, 8); ! // scs.Add((0x00 << 0x08) | 0x13, "TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA", "3DES", "SHA", false, true, 24, 24, 168, 8, 8); ! // scs.Add((0x00 << 0x08) | 0x14, "TLS_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA", "DES", "SHA", true, true, 5, 8, 40, 8, 8); ! // scs.Add((0x00 << 0x08) | 0x15, "TLS_DHE_RSA_WITH_DES_CBC_SHA", "SHA", "DES", false, true, 8, 8, 56, 8, 8); ! // scs.Add((0x00 << 0x08) | 0x16, "TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA", "3DES", "SHA", false, true, 24, 24, 168, 8, 8); // Anonymous Diffie-Hellman Cipher Suites // scs.Add((0x00 << 0x08) | 0x17, "TLS_DH_anon_EXPORT_WITH_RC4_40_MD5", "RC4", "MD5", true, false, 5, 16, 40, 0, 0); // scs.Add((0x00 << 0x08) | 0x18, "TLS_DH_anon_WITH_RC4_128_MD5", "RC4", "MD5", false, false, 16, 16, 128, 0, 0); ! // scs.Add((0x00 << 0x08) | 0x19, "TLS_DH_anon_EXPORT_WITH_DES40_CBC_SHA", "DES", "SHA", false, true, 5, 8, 40, 8, 8); ! // scs.Add((0x00 << 0x08) | 0x1A, "TLS_DH_anon_WITH_DES_CBC_SHA", "DES4", "SHA", false, true, 8, 8, 56, 8, 8); ! // scs.Add((0x00 << 0x08) | 0x1B, "TLS_DH_anon_WITH_3DES_EDE_CBC_SHA", "3DES", "SHA", false, true, 24, 24, 168, 8, 8); // AES CipherSuites --- 64,97 ---- // RSA Cipher Suites // scs.Add((0x00 << 0x08) | 0x01, "TLS_RSA_WITH_NULL_MD5", "", "MD5", true, false, 0, 0, 0, 0, 0); ! // scs.Add((0x00 << 0x08) | 0x02, "TLS_RSA_WITH_NULL_SHA", "", "SHA1", true, false, 0, 0, 0, 0, 0); // scs.Add((0x00 << 0x08) | 0x03, "TLS_RSA_EXPORT_WITH_RC4_40_MD5", "RC4", "MD5", true, false, 5, 16, 40, 0, 0); ! // scs.Add((0x00 << 0x08) | 0x05, "TLS_RSA_WITH_RC4_128_SHA", "RC4", "SHA1", false, false, 16, 16, 128, 0, 0); // scs.Add((0x00 << 0x08) | 0x04, "TLS_RSA_WITH_RC4_128_MD5", "RC4", "MD5", false, false, 16, 16, 128, 0, 0); // scs.Add((0x00 << 0x08) | 0x06, "TLS_RSA_EXPORT_WITH_RC2_CBC_40_MD5", "RC2", "MD5", true, true, 5, 16, 40, 8, 8); ! // scs.Add((0x00 << 0x08) | 0x07, "TLS_RSA_WITH_IDEA_CBC_SHA", "IDEA", "SHA1", false, true, 16, 16, 128, 8, 8); ! // scs.Add((0x00 << 0x08) | 0x08, "TLS_RSA_EXPORT_WITH_DES40_CBC_SHA", "DES", "SHA1", true, true, 5, 8, 40, 8, 8); ! // scs.Add((0x00 << 0x08) | 0x09, "TLS_RSA_WITH_DES_CBC_SHA", "DES", "SHA1", false, true, 8, 8, 56, 8, 8); ! // scs.Add((0x00 << 0x08) | 0x0A, "TLS_RSA_WITH_3DES_EDE_CBC_SHA", "3DES", "SHA1", false, true, 24, 24, 168, 8, 8); // Diffie-Hellman Cipher Suites ! // scs.Add((0x00 << 0x08) | 0x0B, "TLS_DH_DSS_EXPORT_WITH_DES40_CBC_SHA", "DES", "SHA1", true, true, 5, 8, 40, 8, 8); ! // scs.Add((0x00 << 0x08) | 0x0C, "TLS_DH_DSS_WITH_DES_CBC_SHA", "DES", "SHA1", false, true, 8, 8, 56, 8, 8); ! // scs.Add((0x00 << 0x08) | 0x0D, "TLS_DH_DSS_WITH_3DES_EDE_CBC_SHA", "3DES", "SHA1", false, true, 24, 24, 168, 8, 8); ! // scs.Add((0x00 << 0x08) | 0x0E, "TLS_DH_RSA_EXPORT_WITH_DES40_CBC_SHA", "DES", "SHA1", true, true, 5, 8, 40, 8, 8); ! // scs.Add((0x00 << 0x08) | 0x0F, "TLS_DH_RSA_WITH_DES_CBC_SHA", "DES", "SHA1", false, true, 8, 8, 56, 8, 8); ! // scs.Add((0x00 << 0x08) | 0x10, "TLS_DH_RSA_WITH_3DES_EDE_CBC_SHA", "3DES", "SHA1", false, true, 24, 24, 168, 8, 8); ! // scs.Add((0x00 << 0x08) | 0x11, "TLS_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA", "DES", "SHA1", true, true, 5, 8, 40, 8, 8); ! // scs.Add((0x00 << 0x08) | 0x12, "TLS_DHE_DSS_WITH_DES_CBC_SHA", "DES", "SHA1", false, true, 8, 8, 56, 8, 8); ! // scs.Add((0x00 << 0x08) | 0x13, "TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA", "3DES", "SHA1", false, true, 24, 24, 168, 8, 8); ! // scs.Add((0x00 << 0x08) | 0x14, "TLS_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA", "DES", "SHA1", true, true, 5, 8, 40, 8, 8); ! // scs.Add((0x00 << 0x08) | 0x15, "TLS_DHE_RSA_WITH_DES_CBC_SHA", "SHA1", "DES", false, true, 8, 8, 56, 8, 8); ! // scs.Add((0x00 << 0x08) | 0x16, "TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA", "3DES", "SHA1", false, true, 24, 24, 168, 8, 8); // Anonymous Diffie-Hellman Cipher Suites // scs.Add((0x00 << 0x08) | 0x17, "TLS_DH_anon_EXPORT_WITH_RC4_40_MD5", "RC4", "MD5", true, false, 5, 16, 40, 0, 0); // scs.Add((0x00 << 0x08) | 0x18, "TLS_DH_anon_WITH_RC4_128_MD5", "RC4", "MD5", false, false, 16, 16, 128, 0, 0); ! // scs.Add((0x00 << 0x08) | 0x19, "TLS_DH_anon_EXPORT_WITH_DES40_CBC_SHA", "DES", "SHA1", false, true, 5, 8, 40, 8, 8); ! // scs.Add((0x00 << 0x08) | 0x1A, "TLS_DH_anon_WITH_DES_CBC_SHA", "DES4", "SHA1", false, true, 8, 8, 56, 8, 8); ! // scs.Add((0x00 << 0x08) | 0x1B, "TLS_DH_anon_WITH_3DES_EDE_CBC_SHA", "3DES", "SHA1", false, true, 24, 24, 168, 8, 8); // AES CipherSuites *************** *** 98,114 **** // Ref: RFC3268 - (http://www.ietf.org/rfc/rfc3268.txt) ! // scs.Add((0x00 << 0x08) | 0x2F, "TLS_RSA_WITH_AES_128_CBC_SHA", "Rijndael", "SHA", false, true, 16, 16, 128, 16, 16); ! // scs.Add((0x00 << 0x08) | 0x30, "TLS_DH_DSS_WITH_AES_128_CBC_SHA", "Rijndael", "SHA", false, true, 16, 16, 128, 8, 8); ! // scs.Add((0x00 << 0x08) | 0x31, "TLS_DH_RSA_WITH_AES_128_CBC_SHA", "Rijndael", "SHA", false, true, 16, 16, 128, 8, 8); ! // scs.Add((0x00 << 0x08) | 0x32, "TLS_DHE_DSS_WITH_AES_128_CBC_SHA", "Rijndael", "SHA", false, true, 16, 16, 128, 8, 8); ! // scs.Add((0x00 << 0x08) | 0x33, "TLS_DHE_RSA_WITH_AES_128_CBC_SHA", "Rijndael", "SHA", false, true, 16, 16, 128, 8, 8); ! // scs.Add((0x00 << 0x08) | 0x34, "TLS_DH_anon_WITH_AES_128_CBC_SHA", "Rijndael", "SHA", false, true, 16, 16, 128, 8, 8); ! // scs.Add((0x00 << 0x08) | 0x35, "TLS_RSA_WITH_AES_256_CBC_SHA", "Rijndael", "SHA", false, true, 32, 32, 256, 16, 16); ! // scs.Add((0x00 << 0x08) | 0x36, "TLS_DH_DSS_WITH_AES_256_CBC_SHA", "Rijndael", "SHA", false, true, 32, 32, 256, 16, 16); ! // scs.Add((0x00 << 0x08) | 0x37, "TLS_DH_RSA_WITH_AES_256_CBC_SHA", "Rijndael", "SHA", false, true, 32, 32, 256, 16, 16); ! // scs.Add((0x00 << 0x08) | 0x38, "TLS_DHE_DSS_WITH_AES_256_CBC_SHA", "Rijndael", "SHA", false, true, 32, 32, 256, 16, 16); ! // scs.Add((0x00 << 0x08) | 0x39, "TLS_DHE_RSA_WITH_AES_256_CBC_SHA", "Rijndael", "SHA", false, true, 32, 32, 256, 16, 16); ! // scs.Add((0x00 << 0x08) | 0x3A, "TLS_DH_anon_WITH_AES_256_CBC_SHA", "Rijndael", "SHA", false, true, 32, 32, 256, 16, 16); return scs; --- 99,115 ---- // Ref: RFC3268 - (http://www.ietf.org/rfc/rfc3268.txt) ! // scs.Add((0x00 << 0x08) | 0x2F, "TLS_RSA_WITH_AES_128_CBC_SHA", "Rijndael", "SHA1", false, true, 16, 16, 128, 16, 16); ! // scs.Add((0x00 << 0x08) | 0x30, "TLS_DH_DSS_WITH_AES_128_CBC_SHA", "Rijndael", "SHA1", false, true, 16, 16, 128, 8, 8); ! // scs.Add((0x00 << 0x08) | 0x31, "TLS_DH_RSA_WITH_AES_128_CBC_SHA", "Rijndael", "SHA1", false, true, 16, 16, 128, 8, 8); ! // scs.Add((0x00 << 0x08) | 0x32, "TLS_DHE_DSS_WITH_AES_128_CBC_SHA", "Rijndael", "SHA1", false, true, 16, 16, 128, 8, 8); ! // scs.Add((0x00 << 0x08) | 0x33, "TLS_DHE_RSA_WITH_AES_128_CBC_SHA", "Rijndael", "SHA1", false, true, 16, 16, 128, 8, 8); ! // scs.Add((0x00 << 0x08) | 0x34, "TLS_DH_anon_WITH_AES_128_CBC_SHA", "Rijndael", "SHA1", false, true, 16, 16, 128, 8, 8); ! // scs.Add((0x00 << 0x08) | 0x35, "TLS_RSA_WITH_AES_256_CBC_SHA", "Rijndael", "SHA1", false, true, 32, 32, 256, 16, 16); ! // scs.Add((0x00 << 0x08) | 0x36, "TLS_DH_DSS_WITH_AES_256_CBC_SHA", "Rijndael", "SHA1", false, true, 32, 32, 256, 16, 16); ! // scs.Add((0x00 << 0x08) | 0x37, "TLS_DH_RSA_WITH_AES_256_CBC_SHA", "Rijndael", "SHA1", false, true, 32, 32, 256, 16, 16); ! // scs.Add((0x00 << 0x08) | 0x38, "TLS_DHE_DSS_WITH_AES_256_CBC_SHA", "Rijndael", "SHA1", false, true, 32, 32, 256, 16, 16); ! // scs.Add((0x00 << 0x08) | 0x39, "TLS_DHE_RSA_WITH_AES_256_CBC_SHA", "Rijndael", "SHA1", false, true, 32, 32, 256, 16, 16); ! // scs.Add((0x00 << 0x08) | 0x3A, "TLS_DH_anon_WITH_AES_256_CBC_SHA", "Rijndael", "SHA1", false, true, 32, 32, 256, 16, 16); return scs; *************** *** 120,126 **** // Supported ciphers ! scs.Add((0x00 << 0x08) | 0x0A, "SSL_RSA_WITH_3DES_EDE_CBC_SHA", "3DES", "SHA", false, true, 24, 24, 168, 8, 8); ! scs.Add((0x00 << 0x08) | 0x09, "SSL_RSA_WITH_DES_CBC_SHA", "DES", "SHA", false, true, 8, 8, 56, 8, 8); ! scs.Add((0x00 << 0x08) | 0x05, "SSL_RSA_WITH_RC4_128_SHA", "RC4", "SHA", false, false, 16, 16, 128, 0, 0); scs.Add((0x00 << 0x08) | 0x04, "SSL_RSA_WITH_RC4_128_MD5", "RC4", "MD5", false, false, 16, 16, 128, 0, 0); --- 121,127 ---- // Supported ciphers ! scs.Add((0x00 << 0x08) | 0x0A, "SSL_RSA_WITH_3DES_EDE_CBC_SHA", "3DES", "SHA1", false, true, 24, 24, 168, 8, 8); ! scs.Add((0x00 << 0x08) | 0x09, "SSL_RSA_WITH_DES_CBC_SHA", "DES", "SHA1", false, true, 8, 8, 56, 8, 8); ! scs.Add((0x00 << 0x08) | 0x05, "SSL_RSA_WITH_RC4_128_SHA", "RC4", "SHA1", false, false, 16, 16, 128, 0, 0); scs.Add((0x00 << 0x08) | 0x04, "SSL_RSA_WITH_RC4_128_MD5", "RC4", "MD5", false, false, 16, 16, 128, 0, 0); *************** *** 130,163 **** // RSA Cipher Suites // scs.Add((0x00 << 0x08) | 0x01, "SSL_RSA_WITH_NULL_MD5", "", "MD5", true, false, 0, 0, 0, 0, 0); ! // scs.Add((0x00 << 0x08) | 0x02, "SSL_RSA_WITH_NULL_SHA", "", "SHA", true, false, 0, 0, 0, 0, 0); // scs.Add((0x00 << 0x08) | 0x03, "SSL_RSA_EXPORT_WITH_RC4_40_MD5", "RC4", "MD5", true, false, 5, 16, 40, 0, 0); ! // scs.Add((0x00 << 0x08) | 0x05, "SSL_RSA_WITH_RC4_128_SHA", "RC4", "SHA", false, false, 16, 16, 128, 0, 0); // scs.Add((0x00 << 0x08) | 0x04, "SSL_RSA_WITH_RC4_128_MD5", "RC4", "MD5", false, false, 16, 16, 128, 0, 0); // scs.Add((0x00 << 0x08) | 0x06, "SSL_RSA_EXPORT_WITH_RC2_CBC_40_MD5", "RC2", "MD5", true, true, 5, 16, 40, 8, 8); ! // scs.Add((0x00 << 0x08) | 0x07, "SSL_RSA_WITH_IDEA_CBC_SHA", "IDEA", "SHA", false, true, 16, 16, 128, 8, 8); ! // scs.Add((0x00 << 0x08) | 0x08, "SSL_RSA_EXPORT_WITH_DES40_CBC_SHA", "DES", "SHA", true, true, 5, 8, 40, 8, 8); ! // scs.Add((0x00 << 0x08) | 0x09, "SSL_RSA_WITH_DES_CBC_SHA", "DES", "SHA", false, true, 8, 8, 56, 8, 8); ! // scs.Add((0x00 << 0x08) | 0x0A, "SSL_RSA_WITH_3DES_EDE_CBC_SHA", "3DES", "SHA", false, true, 24, 24, 168, 8, 8); // Diffie-Hellman Cipher Suites ! // scs.Add((0x00 << 0x08) | 0x0B, "SSL_DH_DSS_EXPORT_WITH_DES40_CBC_SHA", "DES", "SHA", true, true, 5, 8, 40, 8, 8); ! // scs.Add((0x00 << 0x08) | 0x0C, "SSL_DH_DSS_WITH_DES_CBC_SHA", "DES", "SHA", false, true, 8, 8, 56, 8, 8); ! // scs.Add((0x00 << 0x08) | 0x0D, "SSL_DH_DSS_WITH_3DES_EDE_CBC_SHA", "3DES", "SHA", false, true, 24, 24, 168, 8, 8); ! // scs.Add((0x00 << 0x08) | 0x0E, "SSL_DH_RSA_EXPORT_WITH_DES40_CBC_SHA", "DES", "SHA", true, true, 5, 8, 40, 8, 8); ! // scs.Add((0x00 << 0x08) | 0x0F, "SSL_DH_RSA_WITH_DES_CBC_SHA", "DES", "SHA", false, true, 8, 8, 56, 8, 8); ! // scs.Add((0x00 << 0x08) | 0x10, "SSL_DH_RSA_WITH_3DES_EDE_CBC_SHA", "3DES", "SHA", false, true, 24, 24, 168, 8, 8); ! // scs.Add((0x00 << 0x08) | 0x11, "SSL_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA", "DES", "SHA", true, true, 5, 8, 40, 8, 8); ! // scs.Add((0x00 << 0x08) | 0x12, "SSL_DHE_DSS_WITH_DES_CBC_SHA", "DES", "SHA", false, true, 8, 8, 56, 8, 8); ! // scs.Add((0x00 << 0x08) | 0x13, "SSL_DHE_DSS_WITH_3DES_EDE_CBC_SHA", "3DES", "SHA", false, true, 24, 24, 168, 8, 8); ! // scs.Add((0x00 << 0x08) | 0x14, "SSL_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA", "DES", "SHA", true, true, 5, 8, 40, 8, 8); ! // scs.Add((0x00 << 0x08) | 0x15, "SSL_DHE_RSA_WITH_DES_CBC_SHA", "SHA", "DES", false, true, 8, 8, 56, 8, 8); ! // scs.Add((0x00 << 0x08) | 0x16, "SSL_DHE_RSA_WITH_3DES_EDE_CBC_SHA", "3DES", "SHA", false, true, 24, 24, 168, 8, 8); // Anonymous Diffie-Hellman Cipher Suites // scs.Add((0x00 << 0x08) | 0x17, "SSL_DH_anon_EXPORT_WITH_RC4_40_MD5", "RC4", "MD5", true, false, 5, 16, 40, 0, 0); // scs.Add((0x00 << 0x08) | 0x18, "SSL_DH_anon_WITH_RC4_128_MD5", "RC4", "MD5", false, false, 16, 16, 128, 0, 0); ! // scs.Add((0x00 << 0x08) | 0x19, "SSL_DH_anon_EXPORT_WITH_DES40_CBC_SHA", "DES", "SHA", false, true, 5, 8, 40, 8, 8); ! // scs.Add((0x00 << 0x08) | 0x1A, "SSL_DH_anon_WITH_DES_CBC_SHA", "DES4", "SHA", false, true, 8, 8, 56, 8, 8); ! // scs.Add((0x00 << 0x08) | 0x1B, "SSL_DH_anon_WITH_3DES_EDE_CBC_SHA", "3DES", "SHA", false, true, 24, 24, 168, 8, 8); return scs; --- 131,164 ---- // RSA Cipher Suites // scs.Add((0x00 << 0x08) | 0x01, "SSL_RSA_WITH_NULL_MD5", "", "MD5", true, false, 0, 0, 0, 0, 0); ! // scs.Add((0x00 << 0x08) | 0x02, "SSL_RSA_WITH_NULL_SHA", "", "SHA1", true, false, 0, 0, 0, 0, 0); // scs.Add((0x00 << 0x08) | 0x03, "SSL_RSA_EXPORT_WITH_RC4_40_MD5", "RC4", "MD5", true, false, 5, 16, 40, 0, 0); ! // scs.Add((0x00 << 0x08) | 0x05, "SSL_RSA_WITH_RC4_128_SHA", "RC4", "SHA1", false, false, 16, 16, 128, 0, 0); // scs.Add((0x00 << 0x08) | 0x04, "SSL_RSA_WITH_RC4_128_MD5", "RC4", "MD5", false, false, 16, 16, 128, 0, 0); // scs.Add((0x00 << 0x08) | 0x06, "SSL_RSA_EXPORT_WITH_RC2_CBC_40_MD5", "RC2", "MD5", true, true, 5, 16, 40, 8, 8); ! // scs.Add((0x00 << 0x08) | 0x07, "SSL_RSA_WITH_IDEA_CBC_SHA", "IDEA", "SHA1", false, true, 16, 16, 128, 8, 8); ! // scs.Add((0x00 << 0x08) | 0x08, "SSL_RSA_EXPORT_WITH_DES40_CBC_SHA", "DES", "SHA1", true, true, 5, 8, 40, 8, 8); ! // scs.Add((0x00 << 0x08) | 0x09, "SSL_RSA_WITH_DES_CBC_SHA", "DES", "SHA1", false, true, 8, 8, 56, 8, 8); ! // scs.Add((0x00 << 0x08) | 0x0A, "SSL_RSA_WITH_3DES_EDE_CBC_SHA", "3DES", "SHA1", false, true, 24, 24, 168, 8, 8); // Diffie-Hellman Cipher Suites ! // scs.Add((0x00 << 0x08) | 0x0B, "SSL_DH_DSS_EXPORT_WITH_DES40_CBC_SHA", "DES", "SHA1", true, true, 5, 8, 40, 8, 8); ! // scs.Add((0x00 << 0x08) | 0x0C, "SSL_DH_DSS_WITH_DES_CBC_SHA", "DES", "SHA1", false, true, 8, 8, 56, 8, 8); ! // scs.Add((0x00 << 0x08) | 0x0D, "SSL_DH_DSS_WITH_3DES_EDE_CBC_SHA", "3DES", "SHA1", false, true, 24, 24, 168, 8, 8); ! // scs.Add((0x00 << 0x08) | 0x0E, "SSL_DH_RSA_EXPORT_WITH_DES40_CBC_SHA", "DES", "SHA1", true, true, 5, 8, 40, 8, 8); ! // scs.Add((0x00 << 0x08) | 0x0F, "SSL_DH_RSA_WITH_DES_CBC_SHA", "DES", "SHA1", false, true, 8, 8, 56, 8, 8); ! // scs.Add((0x00 << 0x08) | 0x10, "SSL_DH_RSA_WITH_3DES_EDE_CBC_SHA", "3DES", "SHA1", false, true, 24, 24, 168, 8, 8); ! // scs.Add((0x00 << 0x08) | 0x11, "SSL_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA", "DES", "SHA1", true, true, 5, 8, 40, 8, 8); ! // scs.Add((0x00 << 0x08) | 0x12, "SSL_DHE_DSS_WITH_DES_CBC_SHA", "DES", "SHA1", false, true, 8, 8, 56, 8, 8); ! // scs.Add((0x00 << 0x08) | 0x13, "SSL_DHE_DSS_WITH_3DES_EDE_CBC_SHA", "3DES", "SHA1", false, true, 24, 24, 168, 8, 8); ! // scs.Add((0x00 << 0x08) | 0x14, "SSL_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA", "DES", "SHA1", true, true, 5, 8, 40, 8, 8); ! // scs.Add((0x00 << 0x08) | 0x15, "SSL_DHE_RSA_WITH_DES_CBC_SHA", "SHA1", "DES", false, true, 8, 8, 56, 8, 8); ! // scs.Add((0x00 << 0x08) | 0x16, "SSL_DHE_RSA_WITH_3DES_EDE_CBC_SHA", "3DES", "SHA1", false, true, 24, 24, 168, 8, 8); // Anonymous Diffie-Hellman Cipher Suites // scs.Add((0x00 << 0x08) | 0x17, "SSL_DH_anon_EXPORT_WITH_RC4_40_MD5", "RC4", "MD5", true, false, 5, 16, 40, 0, 0); // scs.Add((0x00 << 0x08) | 0x18, "SSL_DH_anon_WITH_RC4_128_MD5", "RC4", "MD5", false, false, 16, 16, 128, 0, 0); ! // scs.Add((0x00 << 0x08) | 0x19, "SSL_DH_anon_EXPORT_WITH_DES40_CBC_SHA", "DES", "SHA1", false, true, 5, 8, 40, 8, 8); ! // scs.Add((0x00 << 0x08) | 0x1A, "SSL_DH_anon_WITH_DES_CBC_SHA", "DES4", "SHA1", false, true, 8, 8, 56, 8, 8); ! // scs.Add((0x00 << 0x08) | 0x1B, "SSL_DH_anon_WITH_3DES_EDE_CBC_SHA", "3DES", "SHA1", false, true, 24, 24, 168, 8, 8); return scs; Index: TlsSessionContext.cs =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/Mono.Security.Protocol.Tls/Mono.Security.Protocol.Tls/TlsSessionContext.cs,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** TlsSessionContext.cs 3 Nov 2003 08:56:46 -0000 1.10 --- TlsSessionContext.cs 3 Nov 2003 18:11:54 -0000 1.11 *************** *** 75,79 **** // Handshake hashes ! private TlsStream handshakeHashes; #endregion --- 75,79 ---- // Handshake hashes ! private TlsStream handshakeMessages; #endregion *************** *** 141,147 **** } ! public TlsStream HandshakeHashes { ! get { return this.handshakeHashes; } } --- 141,147 ---- } ! public TlsStream HandshakeMessages { ! get { return this.handshakeMessages; } } *************** *** 233,237 **** this.compressionMethod = TlsCompressionMethod.None; this.serverSettings = new TlsServerSettings(); ! this.handshakeHashes = new TlsStream(); } --- 233,237 ---- this.compressionMethod = TlsCompressionMethod.None; this.serverSettings = new TlsServerSettings(); ! this.handshakeMessages = new TlsStream(); } Index: TlsSocket.cs =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/Mono.Security.Protocol.Tls/Mono.Security.Protocol.Tls/TlsSocket.cs,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** TlsSocket.cs 3 Nov 2003 08:56:46 -0000 1.11 --- TlsSocket.cs 3 Nov 2003 18:11:54 -0000 1.12 *************** *** 252,256 **** } // Update handshakes of current messages ! this.session.Context.HandshakeHashes.Write(message.ToArray()); break; --- 252,256 ---- } // Update handshakes of current messages ! this.session.Context.HandshakeMessages.Write(message.ToArray()); break; Index: TlsSslCipherSuite.cs =================================================================== RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/Mono.Security.Protocol.Tls/Mono.Security.Protocol.Tls/TlsSslCipherSuite.cs,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** TlsSslCipherSuite.cs 24 Oct 2003 09:39:21 -0000 1.8 --- TlsSslCipherSuite.cs 3 Nov 2003 18:11:54 -0000 1.9 *************** *** 43,60 **** #endregion - #region PROPERTIES - - public byte[] Pad1 - { - get { return pad1; } - } - - public byte[] Pad2 - { - get { return pad2; } - } - - #endregion - #region CONSTRUCTORS --- 43,46 ---- *************** *** 67,71 **** ivSize, blockSize) { ! this.GeneratePad(hashName, ref this.pad1, ref this.pad2); } --- 53,68 ---- ivSize, blockSize) { ! int padLength = (hashName == "MD5") ? 48 : 40; ! ! // Fill pad arrays ! this.pad1 = new byte[padLength]; ! this.pad2 = new byte[padLength]; ! ! /* Pad the key for inner and outer digest */ ! for (int i = 0; i < padLength; ++i) ! { ! pad1[i] = 0x36; ! pad2[i] = 0x5C; ! } } *************** *** 86,90 **** block.Write(fragment); ! byte[] blockHash = hash.ComputeHash(block.ToArray(), 0, (int)block.Length); block.Reset(); --- 83,89 ---- block.Write(fragment); ! hash.ComputeHash(block.ToArray(), 0, (int)block.Length); ! ! byte[] blockHash = hash.Hash; block.Reset(); *************** *** 94,102 **** block.Write(blockHash); ! blockHash = hash.ComputeHash(block.ToArray(), 0, (int)block.Length); block.Reset(); ! return blockHash; } --- 93,101 ---- block.Write(blockHash); ! hash.ComputeHash(block.ToArray(), 0, (int)block.Length); block.Reset(); ! return hash.Hash; } *************** *** 128,154 **** } - public void GeneratePad(string hashName, ref byte[] pad1, ref byte[] pad2) - { - switch (hashName) - { - case "MD5": - pad1 = new byte[48]; - pad2 = new byte[48]; - break; - - case "SHA": - case "SHA1": - pad1 = new byte[40]; - pad2 = new byte[40]; - break; - } - - for (int i = 0; i < pad1.Length; i++) - { - pad1[i] = (byte)0x36; - pad2[i] = (byte)0x5C; - } - } - #endregion --- 127,130 ---- *************** *** 245,249 **** private byte[] prf(byte[] secret, string label, byte[] random) { ! MD5CryptoServiceProvider md5 = new MD5CryptoServiceProvider(); SHA1CryptoServiceProvider sha = new SHA1CryptoServiceProvider(); --- 221,225 ---- private byte[] prf(byte[] secret, string label, byte[] random) { ! HashAlgorithm md5 = new MD5CryptoServiceProvider(); SHA1CryptoServiceProvider sha = new SHA1CryptoServiceProvider(); |