mirror of
https://github.com/BepInEx/mono.git
synced 2026-11-16 11:21:08 -10:00
Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
1bae594373 |
No files matched your search
+1
-1
@@ -1,7 +1,7 @@
|
||||
AC_INIT(README)
|
||||
AC_CANONICAL_SYSTEM
|
||||
AM_CONFIG_HEADER(config.h)
|
||||
AM_INIT_AUTOMAKE(mono,1.0.1)
|
||||
AM_INIT_AUTOMAKE(mono,1.0.2)
|
||||
AM_MAINTAINER_MODE
|
||||
|
||||
AC_PROG_LN_S
|
||||
|
||||
@@ -1,8 +1,3 @@
|
||||
2004-07-22 Jambunathan K <[email protected]>
|
||||
|
||||
* Constants.cs: Fixed definitions of vbCr, vbLf, vbCrLf and
|
||||
vbNewLine
|
||||
|
||||
2004-06-24 Jambunathan K <[email protected]>
|
||||
* RandomVBFile.cs: Fixed FileGet() for Date and Decimal types
|
||||
* FileSystem.cs: Fixed ChDir, FileCopy
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
//
|
||||
// Constants.cs
|
||||
//
|
||||
// Author:
|
||||
// Chris J Breisch ([email protected])
|
||||
//
|
||||
// (C) 2002 Chris J Breisch
|
||||
//
|
||||
//
|
||||
// Constants.cs
|
||||
//
|
||||
// Author:
|
||||
// Chris J Breisch ([email protected])
|
||||
//
|
||||
// (C) 2002 Chris J Breisch
|
||||
//
|
||||
|
||||
//
|
||||
// Copyright (c) 2002-2003 Mainsoft Corporation.
|
||||
@@ -30,131 +30,131 @@
|
||||
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
//
|
||||
|
||||
using System;
|
||||
|
||||
namespace Microsoft.VisualBasic {
|
||||
[Microsoft.VisualBasic.CompilerServices.StandardModuleAttribute]
|
||||
sealed public class Constants {
|
||||
// Declarations
|
||||
public const System.Int32 vbObjectError = (System.Int32)(-2147221504);
|
||||
public const System.String vbCrLf = "\r\n";
|
||||
public const System.String vbNewLine = "\r\n";
|
||||
public const System.String vbCr = "\r";
|
||||
public const System.String vbLf = "\n";
|
||||
public const System.String vbBack = "\b";
|
||||
public const System.String vbFormFeed = "\f";
|
||||
public const System.String vbTab = "\t";
|
||||
public const System.String vbVerticalTab = "\v";
|
||||
public const System.String vbNullChar = "\0";
|
||||
public const System.String vbNullString = "";
|
||||
|
||||
public const AppWinStyle vbHide = AppWinStyle.Hide;
|
||||
public const AppWinStyle vbNormalFocus = AppWinStyle.NormalFocus;
|
||||
public const AppWinStyle vbMinimizedFocus = AppWinStyle.MinimizedFocus;
|
||||
public const AppWinStyle vbMaximizedFocus = AppWinStyle.MaximizedFocus;
|
||||
public const AppWinStyle vbNormalNoFocus = AppWinStyle.NormalNoFocus;
|
||||
public const AppWinStyle vbMinimizedNoFocus = AppWinStyle.MinimizedNoFocus;
|
||||
|
||||
public const CallType vbMethod = CallType.Method;
|
||||
public const CallType vbGet = CallType.Get;
|
||||
public const CallType vbLet = CallType.Let;
|
||||
public const CallType vbSet = CallType.Set;
|
||||
|
||||
public const CompareMethod vbBinaryCompare = CompareMethod.Binary;
|
||||
public const CompareMethod vbTextCompare = CompareMethod.Text;
|
||||
|
||||
public const DateFormat vbGeneralDate = DateFormat.GeneralDate;
|
||||
public const DateFormat vbLongDate = DateFormat.LongDate;
|
||||
public const DateFormat vbShortDate = DateFormat.ShortDate;
|
||||
public const DateFormat vbLongTime = DateFormat.LongTime;
|
||||
public const DateFormat vbShortTime = DateFormat.ShortTime;
|
||||
|
||||
public const FirstDayOfWeek vbUseSystemDayOfWeek = FirstDayOfWeek.System;
|
||||
public const FirstDayOfWeek vbSunday = FirstDayOfWeek.Sunday;
|
||||
public const FirstDayOfWeek vbMonday = FirstDayOfWeek.Monday;
|
||||
public const FirstDayOfWeek vbTuesday = FirstDayOfWeek.Tuesday;
|
||||
public const FirstDayOfWeek vbWednesday = FirstDayOfWeek.Wednesday;
|
||||
public const FirstDayOfWeek vbThursday = FirstDayOfWeek.Thursday;
|
||||
public const FirstDayOfWeek vbFriday = FirstDayOfWeek.Friday;
|
||||
public const FirstDayOfWeek vbSaturday = FirstDayOfWeek.Saturday;
|
||||
|
||||
public const FileAttribute vbNormal = FileAttribute.Normal;
|
||||
public const FileAttribute vbReadOnly = FileAttribute.ReadOnly;
|
||||
public const FileAttribute vbHidden = FileAttribute.Hidden;
|
||||
public const FileAttribute vbSystem = FileAttribute.System;
|
||||
public const FileAttribute vbVolume = FileAttribute.Volume;
|
||||
public const FileAttribute vbDirectory = FileAttribute.Directory;
|
||||
public const FileAttribute vbArchive = FileAttribute.Archive;
|
||||
|
||||
public const FirstWeekOfYear vbUseSystem = FirstWeekOfYear.System;
|
||||
public const FirstWeekOfYear vbFirstJan1 = FirstWeekOfYear.Jan1;
|
||||
public const FirstWeekOfYear vbFirstFourDays = FirstWeekOfYear.FirstFourDays;
|
||||
public const FirstWeekOfYear vbFirstFullWeek = FirstWeekOfYear.FirstFullWeek;
|
||||
|
||||
public const VbStrConv vbUpperCase = VbStrConv.UpperCase;
|
||||
public const VbStrConv vbLowerCase = VbStrConv.LowerCase;
|
||||
public const VbStrConv vbProperCase = VbStrConv.ProperCase;
|
||||
public const VbStrConv vbWide = VbStrConv.Wide;
|
||||
public const VbStrConv vbNarrow = VbStrConv.Narrow;
|
||||
public const VbStrConv vbKatakana = VbStrConv.Katakana;
|
||||
public const VbStrConv vbHiragana = VbStrConv.Hiragana;
|
||||
public const VbStrConv vbSimplifiedChinese = VbStrConv.SimplifiedChinese;
|
||||
public const VbStrConv vbTraditionalChinese = VbStrConv.TraditionalChinese;
|
||||
public const VbStrConv vbLinguisticCasing = VbStrConv.LinguisticCasing;
|
||||
|
||||
public const TriState vbUseDefault = TriState.UseDefault;
|
||||
public const TriState vbTrue = TriState.True;
|
||||
public const TriState vbFalse = TriState.False;
|
||||
|
||||
public const VariantType vbEmpty = VariantType.Empty;
|
||||
public const VariantType vbNull = VariantType.Null;
|
||||
public const VariantType vbInteger = VariantType.Integer;
|
||||
public const VariantType vbLong = VariantType.Long;
|
||||
public const VariantType vbSingle = VariantType.Single;
|
||||
public const VariantType vbDouble = VariantType.Double;
|
||||
public const VariantType vbCurrency = VariantType.Currency;
|
||||
public const VariantType vbDate = VariantType.Date;
|
||||
public const VariantType vbString = VariantType.String;
|
||||
public const VariantType vbObject = VariantType.Object;
|
||||
public const VariantType vbBoolean = VariantType.Boolean;
|
||||
public const VariantType vbVariant = VariantType.Variant;
|
||||
public const VariantType vbDecimal = VariantType.Decimal;
|
||||
public const VariantType vbByte = VariantType.Byte;
|
||||
public const VariantType vbUserDefinedType = VariantType.UserDefinedType;
|
||||
public const VariantType vbArray = VariantType.Array;
|
||||
|
||||
public const MsgBoxResult vbOK = MsgBoxResult.OK;
|
||||
public const MsgBoxResult vbCancel = MsgBoxResult.Cancel;
|
||||
public const MsgBoxResult vbAbort = MsgBoxResult.Abort;
|
||||
public const MsgBoxResult vbRetry = MsgBoxResult.Retry;
|
||||
public const MsgBoxResult vbIgnore = MsgBoxResult.Ignore;
|
||||
public const MsgBoxResult vbYes = MsgBoxResult.Yes;
|
||||
public const MsgBoxResult vbNo = MsgBoxResult.No;
|
||||
|
||||
public const MsgBoxStyle vbOKOnly = MsgBoxStyle.OKOnly;
|
||||
public const MsgBoxStyle vbOKCancel = MsgBoxStyle.OKCancel;
|
||||
public const MsgBoxStyle vbAbortRetryIgnore = MsgBoxStyle.AbortRetryIgnore;
|
||||
public const MsgBoxStyle vbYesNoCancel = MsgBoxStyle.YesNoCancel;
|
||||
public const MsgBoxStyle vbYesNo = MsgBoxStyle.YesNo;
|
||||
public const MsgBoxStyle vbRetryCancel = MsgBoxStyle.RetryCancel;
|
||||
public const MsgBoxStyle vbCritical = MsgBoxStyle.Critical;
|
||||
public const MsgBoxStyle vbQuestion = MsgBoxStyle.Question;
|
||||
public const MsgBoxStyle vbExclamation = MsgBoxStyle.Exclamation;
|
||||
public const MsgBoxStyle vbInformation = MsgBoxStyle.Information;
|
||||
public const MsgBoxStyle vbDefaultButton1 = MsgBoxStyle.DefaultButton1;
|
||||
public const MsgBoxStyle vbDefaultButton2 = MsgBoxStyle.DefaultButton2;
|
||||
public const MsgBoxStyle vbDefaultButton3 = MsgBoxStyle.DefaultButton3;
|
||||
public const MsgBoxStyle vbApplicationModal = MsgBoxStyle.ApplicationModal;
|
||||
public const MsgBoxStyle vbSystemModal = MsgBoxStyle.SystemModal;
|
||||
public const MsgBoxStyle vbMsgBoxHelp = MsgBoxStyle.MsgBoxHelp;
|
||||
public const MsgBoxStyle vbMsgBoxRight = MsgBoxStyle.MsgBoxRight;
|
||||
public const MsgBoxStyle vbMsgBoxRtlReading = MsgBoxStyle.MsgBoxRtlReading;
|
||||
public const MsgBoxStyle vbMsgBoxSetForeground = MsgBoxStyle.MsgBoxSetForeground;
|
||||
|
||||
// Constructors
|
||||
// Properties
|
||||
// Methods
|
||||
// Events
|
||||
};
|
||||
}
|
||||
|
||||
using System;
|
||||
|
||||
namespace Microsoft.VisualBasic {
|
||||
[Microsoft.VisualBasic.CompilerServices.StandardModuleAttribute]
|
||||
sealed public class Constants {
|
||||
// Declarations
|
||||
public const System.Int32 vbObjectError = (System.Int32)(-2147221504);
|
||||
public const System.String vbCrLf = "\n\r";
|
||||
public const System.String vbNewLine = "\n\r";
|
||||
public const System.String vbCr = "\n";
|
||||
public const System.String vbLf = "\r";
|
||||
public const System.String vbBack = "\b";
|
||||
public const System.String vbFormFeed = "\f";
|
||||
public const System.String vbTab = "\t";
|
||||
public const System.String vbVerticalTab = "\v";
|
||||
public const System.String vbNullChar = "\0";
|
||||
public const System.String vbNullString = "";
|
||||
|
||||
public const AppWinStyle vbHide = AppWinStyle.Hide;
|
||||
public const AppWinStyle vbNormalFocus = AppWinStyle.NormalFocus;
|
||||
public const AppWinStyle vbMinimizedFocus = AppWinStyle.MinimizedFocus;
|
||||
public const AppWinStyle vbMaximizedFocus = AppWinStyle.MaximizedFocus;
|
||||
public const AppWinStyle vbNormalNoFocus = AppWinStyle.NormalNoFocus;
|
||||
public const AppWinStyle vbMinimizedNoFocus = AppWinStyle.MinimizedNoFocus;
|
||||
|
||||
public const CallType vbMethod = CallType.Method;
|
||||
public const CallType vbGet = CallType.Get;
|
||||
public const CallType vbLet = CallType.Let;
|
||||
public const CallType vbSet = CallType.Set;
|
||||
|
||||
public const CompareMethod vbBinaryCompare = CompareMethod.Binary;
|
||||
public const CompareMethod vbTextCompare = CompareMethod.Text;
|
||||
|
||||
public const DateFormat vbGeneralDate = DateFormat.GeneralDate;
|
||||
public const DateFormat vbLongDate = DateFormat.LongDate;
|
||||
public const DateFormat vbShortDate = DateFormat.ShortDate;
|
||||
public const DateFormat vbLongTime = DateFormat.LongTime;
|
||||
public const DateFormat vbShortTime = DateFormat.ShortTime;
|
||||
|
||||
public const FirstDayOfWeek vbUseSystemDayOfWeek = FirstDayOfWeek.System;
|
||||
public const FirstDayOfWeek vbSunday = FirstDayOfWeek.Sunday;
|
||||
public const FirstDayOfWeek vbMonday = FirstDayOfWeek.Monday;
|
||||
public const FirstDayOfWeek vbTuesday = FirstDayOfWeek.Tuesday;
|
||||
public const FirstDayOfWeek vbWednesday = FirstDayOfWeek.Wednesday;
|
||||
public const FirstDayOfWeek vbThursday = FirstDayOfWeek.Thursday;
|
||||
public const FirstDayOfWeek vbFriday = FirstDayOfWeek.Friday;
|
||||
public const FirstDayOfWeek vbSaturday = FirstDayOfWeek.Saturday;
|
||||
|
||||
public const FileAttribute vbNormal = FileAttribute.Normal;
|
||||
public const FileAttribute vbReadOnly = FileAttribute.ReadOnly;
|
||||
public const FileAttribute vbHidden = FileAttribute.Hidden;
|
||||
public const FileAttribute vbSystem = FileAttribute.System;
|
||||
public const FileAttribute vbVolume = FileAttribute.Volume;
|
||||
public const FileAttribute vbDirectory = FileAttribute.Directory;
|
||||
public const FileAttribute vbArchive = FileAttribute.Archive;
|
||||
|
||||
public const FirstWeekOfYear vbUseSystem = FirstWeekOfYear.System;
|
||||
public const FirstWeekOfYear vbFirstJan1 = FirstWeekOfYear.Jan1;
|
||||
public const FirstWeekOfYear vbFirstFourDays = FirstWeekOfYear.FirstFourDays;
|
||||
public const FirstWeekOfYear vbFirstFullWeek = FirstWeekOfYear.FirstFullWeek;
|
||||
|
||||
public const VbStrConv vbUpperCase = VbStrConv.UpperCase;
|
||||
public const VbStrConv vbLowerCase = VbStrConv.LowerCase;
|
||||
public const VbStrConv vbProperCase = VbStrConv.ProperCase;
|
||||
public const VbStrConv vbWide = VbStrConv.Wide;
|
||||
public const VbStrConv vbNarrow = VbStrConv.Narrow;
|
||||
public const VbStrConv vbKatakana = VbStrConv.Katakana;
|
||||
public const VbStrConv vbHiragana = VbStrConv.Hiragana;
|
||||
public const VbStrConv vbSimplifiedChinese = VbStrConv.SimplifiedChinese;
|
||||
public const VbStrConv vbTraditionalChinese = VbStrConv.TraditionalChinese;
|
||||
public const VbStrConv vbLinguisticCasing = VbStrConv.LinguisticCasing;
|
||||
|
||||
public const TriState vbUseDefault = TriState.UseDefault;
|
||||
public const TriState vbTrue = TriState.True;
|
||||
public const TriState vbFalse = TriState.False;
|
||||
|
||||
public const VariantType vbEmpty = VariantType.Empty;
|
||||
public const VariantType vbNull = VariantType.Null;
|
||||
public const VariantType vbInteger = VariantType.Integer;
|
||||
public const VariantType vbLong = VariantType.Long;
|
||||
public const VariantType vbSingle = VariantType.Single;
|
||||
public const VariantType vbDouble = VariantType.Double;
|
||||
public const VariantType vbCurrency = VariantType.Currency;
|
||||
public const VariantType vbDate = VariantType.Date;
|
||||
public const VariantType vbString = VariantType.String;
|
||||
public const VariantType vbObject = VariantType.Object;
|
||||
public const VariantType vbBoolean = VariantType.Boolean;
|
||||
public const VariantType vbVariant = VariantType.Variant;
|
||||
public const VariantType vbDecimal = VariantType.Decimal;
|
||||
public const VariantType vbByte = VariantType.Byte;
|
||||
public const VariantType vbUserDefinedType = VariantType.UserDefinedType;
|
||||
public const VariantType vbArray = VariantType.Array;
|
||||
|
||||
public const MsgBoxResult vbOK = MsgBoxResult.OK;
|
||||
public const MsgBoxResult vbCancel = MsgBoxResult.Cancel;
|
||||
public const MsgBoxResult vbAbort = MsgBoxResult.Abort;
|
||||
public const MsgBoxResult vbRetry = MsgBoxResult.Retry;
|
||||
public const MsgBoxResult vbIgnore = MsgBoxResult.Ignore;
|
||||
public const MsgBoxResult vbYes = MsgBoxResult.Yes;
|
||||
public const MsgBoxResult vbNo = MsgBoxResult.No;
|
||||
|
||||
public const MsgBoxStyle vbOKOnly = MsgBoxStyle.OKOnly;
|
||||
public const MsgBoxStyle vbOKCancel = MsgBoxStyle.OKCancel;
|
||||
public const MsgBoxStyle vbAbortRetryIgnore = MsgBoxStyle.AbortRetryIgnore;
|
||||
public const MsgBoxStyle vbYesNoCancel = MsgBoxStyle.YesNoCancel;
|
||||
public const MsgBoxStyle vbYesNo = MsgBoxStyle.YesNo;
|
||||
public const MsgBoxStyle vbRetryCancel = MsgBoxStyle.RetryCancel;
|
||||
public const MsgBoxStyle vbCritical = MsgBoxStyle.Critical;
|
||||
public const MsgBoxStyle vbQuestion = MsgBoxStyle.Question;
|
||||
public const MsgBoxStyle vbExclamation = MsgBoxStyle.Exclamation;
|
||||
public const MsgBoxStyle vbInformation = MsgBoxStyle.Information;
|
||||
public const MsgBoxStyle vbDefaultButton1 = MsgBoxStyle.DefaultButton1;
|
||||
public const MsgBoxStyle vbDefaultButton2 = MsgBoxStyle.DefaultButton2;
|
||||
public const MsgBoxStyle vbDefaultButton3 = MsgBoxStyle.DefaultButton3;
|
||||
public const MsgBoxStyle vbApplicationModal = MsgBoxStyle.ApplicationModal;
|
||||
public const MsgBoxStyle vbSystemModal = MsgBoxStyle.SystemModal;
|
||||
public const MsgBoxStyle vbMsgBoxHelp = MsgBoxStyle.MsgBoxHelp;
|
||||
public const MsgBoxStyle vbMsgBoxRight = MsgBoxStyle.MsgBoxRight;
|
||||
public const MsgBoxStyle vbMsgBoxRtlReading = MsgBoxStyle.MsgBoxRtlReading;
|
||||
public const MsgBoxStyle vbMsgBoxSetForeground = MsgBoxStyle.MsgBoxSetForeground;
|
||||
|
||||
// Constructors
|
||||
// Properties
|
||||
// Methods
|
||||
// Events
|
||||
};
|
||||
}
|
||||
@@ -1,5 +1,6 @@
|
||||
2004-08-09 Sureshkumar T <tsureshkumar@novell.com>
|
||||
* Tds70.cs - Prepare Method stored procedure handle read problem fixed.
|
||||
2004-06-30 Umadevi S <sumadevi@novell.com>
|
||||
* Tds.cs - In the NextResult method handling TdsPacketSubType. TableName.
|
||||
|
||||
|
||||
2004-04-22 Sebastien Pouliot <[email protected]>
|
||||
|
||||
|
||||
@@ -293,6 +293,12 @@ namespace Mono.Data.Tds.Protocol {
|
||||
|
||||
break;
|
||||
case TdsPacketSubType.TableName:
|
||||
// done = true;
|
||||
peek = Comm.Peek ();
|
||||
done = (peek != (byte) TdsPacketSubType.ColumnDetail);
|
||||
|
||||
break;
|
||||
case TdsPacketSubType.ColumnDetail:
|
||||
done = true;
|
||||
break;
|
||||
default:
|
||||
|
||||
@@ -457,9 +457,9 @@ namespace Mono.Data.Tds.Protocol {
|
||||
parms.Add (new TdsMetaParameter ("@P3", "nvarchar", commandText));
|
||||
|
||||
ExecProc ("sp_prepare", parms, 0, true);
|
||||
SkipToEnd ();
|
||||
if (ColumnValues [0] == null || ColumnValues [0] == DBNull.Value)
|
||||
if (!NextResult () || !NextRow () || ColumnValues [0] == null || ColumnValues [0] == DBNull.Value)
|
||||
throw new TdsInternalException ();
|
||||
SkipToEnd ();
|
||||
return ColumnValues [0].ToString ();
|
||||
}
|
||||
|
||||
|
||||
@@ -4,5 +4,4 @@
|
||||
./Mono.Posix/Syscall.cs
|
||||
./Mono.Posix/MapAttribute.cs
|
||||
./Mono.Posix/IncludeAttribute.cs
|
||||
./Mono.Posix/Catalog.cs
|
||||
./Mono.Posix/PeerCred.cs
|
||||
./Mono.Posix/Catalog.cs
|
||||
@@ -1,7 +1,3 @@
|
||||
2004-07-09 Dick Porter <[email protected]>
|
||||
|
||||
* PeerCred.cs: Get the unix socket peer credentials.
|
||||
|
||||
2004-05-26 Miguel de Icaza <[email protected]>
|
||||
|
||||
* Syscall.cs: Do not let the runtime handle strings, as we do not
|
||||
|
||||
@@ -1,78 +0,0 @@
|
||||
//
|
||||
// Mono.Posix.PeerCred: Peer credentials class for AF_UNIX sockets
|
||||
//
|
||||
// Authors:
|
||||
// Dick Porter ([email protected])
|
||||
//
|
||||
// (C) 2004 Novell, Inc (http://www.novell.com)
|
||||
//
|
||||
|
||||
//
|
||||
// Permission is hereby granted, free of charge, to any person obtaining
|
||||
// a copy of this software and associated documentation files (the
|
||||
// "Software"), to deal in the Software without restriction, including
|
||||
// without limitation the rights to use, copy, modify, merge, publish,
|
||||
// distribute, sublicense, and/or sell copies of the Software, and to
|
||||
// permit persons to whom the Software is furnished to do so, subject to
|
||||
// the following conditions:
|
||||
//
|
||||
// The above copyright notice and this permission notice shall be
|
||||
// included in all copies or substantial portions of the Software.
|
||||
//
|
||||
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
|
||||
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
||||
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
//
|
||||
|
||||
using System;
|
||||
using System.Net.Sockets;
|
||||
|
||||
namespace Mono.Posix
|
||||
{
|
||||
public class PeerCred
|
||||
{
|
||||
private struct PeerCredData {
|
||||
public int pid;
|
||||
public int uid;
|
||||
public int gid;
|
||||
}
|
||||
|
||||
/* Make sure this doesn't clash with anything in
|
||||
* SocketOptionName, and keep it synchronised with the
|
||||
* runtime
|
||||
*/
|
||||
private const int so_peercred=10001;
|
||||
private PeerCredData data;
|
||||
|
||||
public PeerCred (Socket sock) {
|
||||
if (sock.AddressFamily != AddressFamily.Unix) {
|
||||
throw new ArgumentException ("Only Unix sockets are supported", "sock");
|
||||
}
|
||||
|
||||
data = (PeerCredData)sock.GetSocketOption (SocketOptionLevel.Socket, (SocketOptionName)so_peercred);
|
||||
}
|
||||
|
||||
public int ProcessID {
|
||||
get {
|
||||
return(data.pid);
|
||||
}
|
||||
}
|
||||
|
||||
public int UserID {
|
||||
get {
|
||||
return(data.uid);
|
||||
}
|
||||
}
|
||||
|
||||
public int GroupID {
|
||||
get {
|
||||
return(data.gid);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,7 +1,3 @@
|
||||
2004-09-07 Sebastien Pouliot <[email protected]>
|
||||
|
||||
* Mono.Security_test.dll.sources: Merge new unit tests from HEAD.
|
||||
|
||||
2004-05-11 Carlos Guzman Alvarez <[email protected]>
|
||||
|
||||
* Mono.Security.Protocol.Tls.Handshake.Client/TlsServerCertificate.cs:
|
||||
|
||||
@@ -5,7 +5,9 @@
|
||||
// Sebastien Pouliot <[email protected]>
|
||||
//
|
||||
// (C) 2003 Motus Technologies Inc. (http://www.motus.com)
|
||||
// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
|
||||
// (C) 2004 Novell (http://www.novell.com)
|
||||
//
|
||||
|
||||
//
|
||||
// Permission is hereby granted, free of charge, to any person obtaining
|
||||
// a copy of this software and associated documentation files (the
|
||||
@@ -56,167 +58,63 @@ namespace Mono.Security.Authenticode {
|
||||
|
||||
public const string spcIndirectDataContext = "1.3.6.1.4.1.311.2.1.4";
|
||||
|
||||
private byte[] fileblock;
|
||||
private FileStream fs;
|
||||
private int blockNo;
|
||||
private int blockLength;
|
||||
private int peOffset;
|
||||
private int dirSecurityOffset;
|
||||
private int dirSecuritySize;
|
||||
internal byte[] rawData;
|
||||
|
||||
public AuthenticodeBase ()
|
||||
{
|
||||
fileblock = new byte [4096];
|
||||
}
|
||||
|
||||
internal void Open (string filename)
|
||||
{
|
||||
if (fs != null)
|
||||
Close ();
|
||||
fs = new FileStream (filename, FileMode.Open, FileAccess.Read, FileShare.Read);
|
||||
}
|
||||
|
||||
internal void Close ()
|
||||
{
|
||||
if (fs != null) {
|
||||
fs.Close ();
|
||||
fs = null;
|
||||
blockNo = 0;
|
||||
}
|
||||
}
|
||||
|
||||
internal bool ReadFirstBlock ()
|
||||
{
|
||||
if (fs == null)
|
||||
return false;
|
||||
|
||||
fs.Position = 0;
|
||||
// read first block - it will include (100% sure)
|
||||
// the MZ header and (99.9% sure) the PE header
|
||||
blockLength = fs.Read (fileblock, 0, fileblock.Length);
|
||||
blockNo = 1;
|
||||
if (blockLength < 64)
|
||||
return false; // invalid PE file
|
||||
|
||||
// 1. Validate the MZ header informations
|
||||
// 1.1. Check for magic MZ at start of header
|
||||
if (BitConverterLE.ToUInt16 (fileblock, 0) != 0x5A4D)
|
||||
return false;
|
||||
|
||||
// 1.2. Find the offset of the PE header
|
||||
peOffset = BitConverterLE.ToInt32 (fileblock, 60);
|
||||
if (peOffset > fileblock.Length) {
|
||||
// just in case (0.1%) this can actually happen
|
||||
string msg = String.Format (Locale.GetText (
|
||||
"Header size too big (> {0} bytes)."),
|
||||
fileblock.Length);
|
||||
throw new NotSupportedException (msg);
|
||||
}
|
||||
if (peOffset > fs.Length)
|
||||
return false;
|
||||
|
||||
// 2. Read between DOS header and first part of PE header
|
||||
// 2.1. Check for magic PE at start of header
|
||||
if (BitConverterLE.ToUInt16 (fileblock, peOffset) != 0x4550)
|
||||
return false;
|
||||
|
||||
// 2.2. Locate IMAGE_DIRECTORY_ENTRY_SECURITY (offset and size)
|
||||
dirSecurityOffset = BitConverterLE.ToInt32 (fileblock, peOffset + 152);
|
||||
dirSecuritySize = BitConverterLE.ToInt32 (fileblock, peOffset + 156);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
internal byte[] GetSecurityEntry ()
|
||||
{
|
||||
if (blockNo < 1)
|
||||
ReadFirstBlock ();
|
||||
|
||||
if (dirSecuritySize > 8) {
|
||||
// remove header from size (not ASN.1 based)
|
||||
byte[] secEntry = new byte [dirSecuritySize - 8];
|
||||
// position after header and read entry
|
||||
fs.Position = dirSecurityOffset + 8;
|
||||
fs.Read (secEntry, 0, secEntry.Length);
|
||||
return secEntry;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
// returns null if the file isn't signed
|
||||
internal byte[] GetHash (HashAlgorithm hash)
|
||||
{
|
||||
if (blockNo < 1)
|
||||
ReadFirstBlock ();
|
||||
fs.Position = blockLength;
|
||||
|
||||
// hash the rest of the file
|
||||
long n = fs.Length - blockLength;
|
||||
// minus any authenticode signature (with 8 bytes header)
|
||||
if (dirSecurityOffset > 0) {
|
||||
// it is also possible that the signature block
|
||||
// starts within the block in memory (small EXE)
|
||||
if (dirSecurityOffset < blockLength) {
|
||||
blockLength = dirSecurityOffset;
|
||||
n = 0;
|
||||
}
|
||||
else
|
||||
n -= (dirSecuritySize);
|
||||
}
|
||||
|
||||
// Authenticode(r) gymnastics
|
||||
// Hash from (generally) 0 to 215 (216 bytes)
|
||||
int pe = peOffset + 88;
|
||||
hash.TransformBlock (fileblock, 0, pe, fileblock, 0);
|
||||
// then skip 4 for checksum
|
||||
pe += 4;
|
||||
// Continue hashing from (generally) 220 to 279 (60 bytes)
|
||||
hash.TransformBlock (fileblock, pe, 60, fileblock, pe);
|
||||
// then skip 8 bytes for IMAGE_DIRECTORY_ENTRY_SECURITY
|
||||
pe += 68;
|
||||
|
||||
// everything is present so start the hashing
|
||||
if (n == 0) {
|
||||
// hash the (only) block
|
||||
hash.TransformFinalBlock (fileblock, pe, blockLength - pe);
|
||||
}
|
||||
else {
|
||||
// hash the last part of the first (already in memory) block
|
||||
hash.TransformBlock (fileblock, pe, blockLength - pe, fileblock, 0);
|
||||
|
||||
// hash by blocks of 4096 bytes
|
||||
long blocks = (n >> 12);
|
||||
int remainder = (int)(n - (blocks << 12));
|
||||
if (remainder == 0) {
|
||||
blocks--;
|
||||
remainder = 4096;
|
||||
}
|
||||
// blocks
|
||||
while (blocks-- > 0) {
|
||||
fs.Read (fileblock, 0, fileblock.Length);
|
||||
hash.TransformBlock (fileblock, 0, fileblock.Length, fileblock, 0);
|
||||
}
|
||||
// remainder
|
||||
if (fs.Read (fileblock, 0, remainder) != remainder)
|
||||
return null;
|
||||
hash.TransformFinalBlock (fileblock, 0, remainder);
|
||||
}
|
||||
return hash.Hash;
|
||||
}
|
||||
|
||||
// for compatibility only
|
||||
protected byte[] HashFile (string fileName, string hashName)
|
||||
{
|
||||
try {
|
||||
Open (fileName);
|
||||
HashAlgorithm hash = HashAlgorithm.Create (hashName);
|
||||
byte[] result = GetHash (hash);
|
||||
Close ();
|
||||
return result;
|
||||
}
|
||||
catch {
|
||||
FileStream fs = new FileStream (fileName, FileMode.Open, FileAccess.Read, FileShare.Read);
|
||||
byte[] file = new byte [fs.Length];
|
||||
fs.Read (file, 0, file.Length);
|
||||
fs.Close ();
|
||||
|
||||
// MZ - DOS header
|
||||
if (BitConverterLE.ToUInt16 (file, 0) != 0x5A4D)
|
||||
return null;
|
||||
|
||||
// find offset of PE header
|
||||
int peOffset = BitConverterLE.ToInt32 (file, 60);
|
||||
if (peOffset > file.Length)
|
||||
return null;
|
||||
|
||||
// PE - NT header
|
||||
if (BitConverterLE.ToUInt16 (file, peOffset) != 0x4550)
|
||||
return null;
|
||||
|
||||
// IMAGE_DIRECTORY_ENTRY_SECURITY
|
||||
int dirSecurityOffset = BitConverterLE.ToInt32 (file, peOffset + 152);
|
||||
int dirSecuritySize = BitConverterLE.ToInt32 (file, peOffset + 156);
|
||||
|
||||
if (dirSecuritySize > 8) {
|
||||
rawData = new byte [dirSecuritySize - 8];
|
||||
Buffer.BlockCopy (file, dirSecurityOffset + 8, rawData, 0, rawData.Length);
|
||||
/* DEBUG
|
||||
FileStream debug = new FileStream (fileName + ".sig", FileMode.Create, FileAccess.Write);
|
||||
debug.Write (rawData, 0, rawData.Length);
|
||||
debug.Close ();*/
|
||||
}
|
||||
else
|
||||
rawData = null;
|
||||
|
||||
HashAlgorithm hash = HashAlgorithm.Create (hashName);
|
||||
// 0 to 215 (216) then skip 4 (checksum)
|
||||
int pe = peOffset + 88;
|
||||
hash.TransformBlock (file, 0, pe, file, 0);
|
||||
pe += 4;
|
||||
// 220 to 279 (60) then skip 8 (IMAGE_DIRECTORY_ENTRY_SECURITY)
|
||||
hash.TransformBlock (file, pe, 60, file, pe);
|
||||
pe += 68;
|
||||
// 288 to end of file
|
||||
int n = file.Length - pe;
|
||||
// minus any authenticode signature (with 8 bytes header)
|
||||
if (dirSecurityOffset != 0)
|
||||
n -= (dirSecuritySize);
|
||||
hash.TransformFinalBlock (file, pe, n);
|
||||
|
||||
return hash.Hash;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -5,7 +5,9 @@
|
||||
// Sebastien Pouliot <[email protected]>
|
||||
//
|
||||
// (C) 2003 Motus Technologies Inc. (http://www.motus.com)
|
||||
// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
|
||||
// (C) 2004 Novell (http://www.novell.com)
|
||||
//
|
||||
|
||||
//
|
||||
// Permission is hereby granted, free of charge, to any person obtaining
|
||||
// a copy of this software and associated documentation files (the
|
||||
@@ -54,9 +56,6 @@ namespace Mono.Security.Authenticode {
|
||||
private DateTime timestamp;
|
||||
private X509Certificate signingCertificate;
|
||||
private int reason;
|
||||
private bool trustedRoot;
|
||||
private bool trustedTimestampRoot;
|
||||
private byte[] entry;
|
||||
|
||||
private X509Chain signerChain;
|
||||
private X509Chain timestampChain;
|
||||
@@ -70,20 +69,17 @@ namespace Mono.Security.Authenticode {
|
||||
|
||||
public AuthenticodeDeformatter (string fileName) : this ()
|
||||
{
|
||||
FileName = fileName;
|
||||
if (!CheckSignature (fileName)) {
|
||||
// invalid or no signature
|
||||
if (signedHash != null)
|
||||
throw new COMException ("Invalid signature");
|
||||
// no exception is thrown when there's no signature in the PE file
|
||||
}
|
||||
}
|
||||
|
||||
public string FileName {
|
||||
get { return filename; }
|
||||
set {
|
||||
Reset ();
|
||||
try {
|
||||
CheckSignature (value);
|
||||
}
|
||||
catch {
|
||||
reason = 1;
|
||||
}
|
||||
}
|
||||
set { CheckSignature (value); }
|
||||
}
|
||||
|
||||
public byte[] Hash {
|
||||
@@ -104,7 +100,7 @@ namespace Mono.Security.Authenticode {
|
||||
|
||||
public bool IsTrusted ()
|
||||
{
|
||||
if (entry == null) {
|
||||
if (rawData == null) {
|
||||
reason = 1;
|
||||
return false;
|
||||
}
|
||||
@@ -114,13 +110,13 @@ namespace Mono.Security.Authenticode {
|
||||
return false;
|
||||
}
|
||||
|
||||
if ((signerChain.Root == null) || !trustedRoot) {
|
||||
if (signerChain.Root == null) {
|
||||
reason = 6;
|
||||
return false;
|
||||
}
|
||||
|
||||
if (timestamp != DateTime.MinValue) {
|
||||
if ((timestampChain.Root == null) || !trustedTimestampRoot) {
|
||||
if (timestampChain.Root == null) {
|
||||
reason = 6;
|
||||
return false;
|
||||
}
|
||||
@@ -142,11 +138,7 @@ namespace Mono.Security.Authenticode {
|
||||
}
|
||||
|
||||
public byte[] Signature {
|
||||
get {
|
||||
if (entry == null)
|
||||
return null;
|
||||
return (byte[]) entry.Clone ();
|
||||
}
|
||||
get { return (byte[]) rawData.Clone (); }
|
||||
}
|
||||
|
||||
public DateTime Timestamp {
|
||||
@@ -164,58 +156,43 @@ namespace Mono.Security.Authenticode {
|
||||
private bool CheckSignature (string fileName)
|
||||
{
|
||||
filename = fileName;
|
||||
base.Open (filename);
|
||||
entry = base.GetSecurityEntry ();
|
||||
if (entry == null) {
|
||||
// no signature is present
|
||||
reason = 1;
|
||||
base.Close ();
|
||||
return false;
|
||||
}
|
||||
|
||||
PKCS7.ContentInfo ci = new PKCS7.ContentInfo (entry);
|
||||
if (ci.ContentType != PKCS7.Oid.signedData) {
|
||||
base.Close ();
|
||||
// by default we try with MD5
|
||||
string hashName = "MD5";
|
||||
// compare the signature's hash with the hash of the file
|
||||
hash = HashFile (filename, hashName);
|
||||
|
||||
// is a signature present ?
|
||||
if (rawData == null)
|
||||
return false;
|
||||
|
||||
PKCS7.ContentInfo ci = new PKCS7.ContentInfo (rawData);
|
||||
if (ci.ContentType != PKCS7.Oid.signedData)
|
||||
return false;
|
||||
}
|
||||
|
||||
PKCS7.SignedData sd = new PKCS7.SignedData (ci.Content);
|
||||
if (sd.ContentInfo.ContentType != spcIndirectDataContext) {
|
||||
base.Close ();
|
||||
if (sd.ContentInfo.ContentType != spcIndirectDataContext)
|
||||
return false;
|
||||
}
|
||||
|
||||
coll = sd.Certificates;
|
||||
|
||||
ASN1 spc = sd.ContentInfo.Content;
|
||||
signedHash = spc [0][1][1];
|
||||
|
||||
HashAlgorithm ha = null;
|
||||
switch (signedHash.Length) {
|
||||
case 16:
|
||||
ha = HashAlgorithm.Create ("MD5");
|
||||
hash = GetHash (ha);
|
||||
break;
|
||||
case 20:
|
||||
ha = HashAlgorithm.Create ("SHA1");
|
||||
hash = GetHash (ha);
|
||||
break;
|
||||
default:
|
||||
reason = 5;
|
||||
base.Close ();
|
||||
return false;
|
||||
if (signedHash.Length == 20) {
|
||||
// seems to be SHA-1, restart hashing
|
||||
hashName = "SHA1";
|
||||
hash = HashFile (filename, hashName);
|
||||
}
|
||||
base.Close ();
|
||||
|
||||
if (!signedHash.CompareValue (hash))
|
||||
return false;
|
||||
|
||||
// messageDigest is a hash of spcIndirectDataContext (which includes the file hash)
|
||||
byte[] spcIDC = spc [0].Value;
|
||||
ha.Initialize (); // re-using hash instance
|
||||
HashAlgorithm ha = HashAlgorithm.Create (hashName);
|
||||
byte[] messageDigest = ha.ComputeHash (spcIDC);
|
||||
|
||||
return VerifySignature (sd, messageDigest, ha);
|
||||
return VerifySignature (sd, messageDigest, hashName);
|
||||
}
|
||||
|
||||
private bool CompareIssuerSerial (string issuer, byte[] serial, X509Certificate x509)
|
||||
@@ -235,7 +212,7 @@ namespace Mono.Security.Authenticode {
|
||||
}
|
||||
|
||||
//private bool VerifySignature (ASN1 cs, byte[] calculatedMessageDigest, string hashName)
|
||||
private bool VerifySignature (PKCS7.SignedData sd, byte[] calculatedMessageDigest, HashAlgorithm ha)
|
||||
private bool VerifySignature (PKCS7.SignedData sd, byte[] calculatedMessageDigest, string hashName)
|
||||
{
|
||||
string contentType = null;
|
||||
ASN1 messageDigest = null;
|
||||
@@ -264,7 +241,7 @@ namespace Mono.Security.Authenticode {
|
||||
case "1.3.6.1.4.1.311.2.1.12":
|
||||
// spcSpOpusInfo (Microsoft code signing)
|
||||
try {
|
||||
spcSpOpusInfo = System.Text.Encoding.UTF8.GetString (attr[1][0][0][0].Value);
|
||||
spcSpOpusInfo = System.Text.Encoding.UTF8.GetString (attr[1][0][1][0].Value);
|
||||
}
|
||||
catch (NullReferenceException) {
|
||||
spcSpOpusInfo = null;
|
||||
@@ -284,13 +261,13 @@ namespace Mono.Security.Authenticode {
|
||||
return false;
|
||||
|
||||
// verify signature
|
||||
string hashOID = CryptoConfig.MapNameToOID (ha.ToString ());
|
||||
string hashOID = CryptoConfig.MapNameToOID (hashName);
|
||||
|
||||
// change to SET OF (not [0]) as per PKCS #7 1.5
|
||||
ASN1 aa = new ASN1 (0x31);
|
||||
foreach (ASN1 a in sd.SignerInfo.AuthenticatedAttributes)
|
||||
aa.Add (a);
|
||||
ha.Initialize ();
|
||||
HashAlgorithm ha = HashAlgorithm.Create (hashName);
|
||||
byte[] p7hash = ha.ComputeHash (aa.GetBytes ());
|
||||
|
||||
byte[] signature = sd.SignerInfo.Signature;
|
||||
@@ -304,9 +281,10 @@ namespace Mono.Security.Authenticode {
|
||||
RSACryptoServiceProvider rsa = (RSACryptoServiceProvider) x509.RSA;
|
||||
if (rsa.VerifyHash (p7hash, hashOID, signature)) {
|
||||
signerChain.LoadCertificates (coll);
|
||||
trustedRoot = signerChain.Build (x509);
|
||||
signingCertificate = x509;
|
||||
break;
|
||||
if (signerChain.Build (x509))
|
||||
signingCertificate = x509;
|
||||
else
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -322,18 +300,17 @@ namespace Mono.Security.Authenticode {
|
||||
// countersignature (1 2 840 113549 1 9 6)
|
||||
// SET {
|
||||
PKCS7.SignerInfo cs = new PKCS7.SignerInfo (attr [1]);
|
||||
trustedTimestampRoot = VerifyCounterSignature (cs, signature);
|
||||
break;
|
||||
return VerifyCounterSignature (cs, signature, hashName);
|
||||
default:
|
||||
// we don't support other unauthenticated attributes
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
return (trustedRoot && trustedTimestampRoot);
|
||||
return true;
|
||||
}
|
||||
|
||||
private bool VerifyCounterSignature (PKCS7.SignerInfo cs, byte[] signature)
|
||||
private bool VerifyCounterSignature (PKCS7.SignerInfo cs, byte[] signature, string hashName)
|
||||
{
|
||||
// SEQUENCE {
|
||||
// INTEGER 1
|
||||
@@ -380,7 +357,6 @@ namespace Mono.Security.Authenticode {
|
||||
if (messageDigest == null)
|
||||
return false;
|
||||
// TODO: must be read from the ASN.1 structure
|
||||
string hashName = null;
|
||||
switch (messageDigest.Length) {
|
||||
case 16:
|
||||
hashName = "MD5";
|
||||
@@ -421,20 +397,5 @@ namespace Mono.Security.Authenticode {
|
||||
// no certificate can verify this signature!
|
||||
return false;
|
||||
}
|
||||
|
||||
private void Reset ()
|
||||
{
|
||||
filename = null;
|
||||
entry = null;
|
||||
hash = null;
|
||||
signedHash = null;
|
||||
signingCertificate = null;
|
||||
reason = -1;
|
||||
trustedRoot = false;
|
||||
trustedTimestampRoot = false;
|
||||
signerChain.Reset ();
|
||||
timestampChain.Reset ();
|
||||
timestamp = DateTime.MinValue;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -5,7 +5,9 @@
|
||||
// Sebastien Pouliot <[email protected]>
|
||||
//
|
||||
// (C) 2003 Motus Technologies Inc. (http://www.motus.com)
|
||||
// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
|
||||
// (C) 2004 Novell (http://www.novell.com)
|
||||
//
|
||||
|
||||
//
|
||||
// Permission is hereby granted, free of charge, to any person obtaining
|
||||
// a copy of this software and associated documentation files (the
|
||||
@@ -52,7 +54,6 @@ namespace Mono.Security.Authenticode {
|
||||
private PKCS7.SignedData pkcs7;
|
||||
private string description;
|
||||
private Uri url;
|
||||
private byte [] entry;
|
||||
|
||||
public AuthenticodeFormatter () : base ()
|
||||
{
|
||||
@@ -241,11 +242,11 @@ namespace Mono.Security.Authenticode {
|
||||
int dirSecuritySize = BitConverter.ToInt32 (file, peOffset + 156);
|
||||
|
||||
if (dirSecuritySize > 8) {
|
||||
entry = new byte [dirSecuritySize - 8];
|
||||
Buffer.BlockCopy (file, dirSecurityOffset + 8, entry, 0, entry.Length);
|
||||
rawData = new byte [dirSecuritySize - 8];
|
||||
Buffer.BlockCopy (file, dirSecurityOffset + 8, rawData, 0, rawData.Length);
|
||||
}
|
||||
else
|
||||
entry = null;
|
||||
rawData = null;
|
||||
|
||||
HashAlgorithm hash = HashAlgorithm.Create (hashAlgorithm);
|
||||
// 0 to 215 (216) then skip 4 (checksum)
|
||||
|
||||
@@ -1,9 +1,3 @@
|
||||
2004-09-07 Sebastien Pouliot <[email protected]>
|
||||
|
||||
* AuthenticodeBase.cs: Merge optimizations from HEAD.
|
||||
* AuthenticodeDeformatter.cs: Merge optimizations from HEAD.
|
||||
* AuthenticodeFormatter.cs: Merge optimizations from HEAD.
|
||||
|
||||
2004-05-11 Sebastien Pouliot <[email protected]>
|
||||
|
||||
* PrivateKey.cs: Better exception reporting. Added globalization to
|
||||
|
||||
@@ -1,15 +1,3 @@
|
||||
2004-07-14 Sebastien Pouliot <[email protected]>
|
||||
|
||||
* SslClientStream.cs: Changed lock to "new object()" and not
|
||||
String.Empty (as the read/write locks points becomes the same).
|
||||
* SslServerStream.cs: Changed lock to "new object()" and not
|
||||
String.Empty (as the read/write locks points becomes the same).
|
||||
|
||||
2004-07-14 Gonzalo Paniagua Javier <[email protected]>
|
||||
|
||||
* HttpsClientStream.cs: get an HttpWebRequest so that we can use the
|
||||
ServicePoint it has. No need to get the host now.
|
||||
|
||||
2004-05-09 Carlos Guzman Alvarez <[email protected]>
|
||||
|
||||
* Mono.Security.Protocol.Tls/Alert.cs:
|
||||
|
||||
@@ -40,13 +40,14 @@ namespace Mono.Security.Protocol.Tls {
|
||||
|
||||
internal class HttpsClientStream : SslClientStream {
|
||||
|
||||
private HttpWebRequest _request;
|
||||
private string _host;
|
||||
private WebRequest _request;
|
||||
|
||||
|
||||
public HttpsClientStream (Stream stream, X509CertificateCollection clientCertificates,
|
||||
HttpWebRequest request)
|
||||
: base (stream, request.RequestUri.Host, false, SecurityProtocolType.Default, clientCertificates)
|
||||
public HttpsClientStream (Stream stream, string targetHost, X509CertificateCollection clientCertificates, WebRequest request)
|
||||
: base (stream, targetHost, false, SecurityProtocolType.Default, clientCertificates)
|
||||
{
|
||||
_host = targetHost;
|
||||
// this constructor permit access to the WebRequest to call
|
||||
// ICertificatePolicy.CheckValidationResult
|
||||
_request = request;
|
||||
@@ -60,7 +61,8 @@ namespace Mono.Security.Protocol.Tls {
|
||||
{
|
||||
bool failed = (certificateErrors.Length > 0);
|
||||
if (ServicePointManager.CertificatePolicy != null) {
|
||||
ServicePoint sp = _request.ServicePoint;
|
||||
Uri target = new Uri ("https://" + _host);
|
||||
ServicePoint sp = ServicePointManager.FindServicePoint (target);
|
||||
|
||||
// only one problem can be reported by this interface
|
||||
int problem = ((failed) ? certificateErrors [0] : 0);
|
||||
|
||||
@@ -349,8 +349,8 @@ namespace Mono.Security.Protocol.Tls
|
||||
this.inputBuffer = new BufferedStream(new MemoryStream());
|
||||
this.innerStream = stream;
|
||||
this.ownsStream = ownsStream;
|
||||
this.read = new object ();
|
||||
this.write = new object ();
|
||||
this.read = String.Empty;
|
||||
this.write = String.Empty;
|
||||
this.protocol = new ClientRecordProtocol(innerStream, context);
|
||||
}
|
||||
|
||||
@@ -821,4 +821,4 @@ namespace Mono.Security.Protocol.Tls
|
||||
|
||||
#endregion
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -306,8 +306,8 @@ namespace Mono.Security.Protocol.Tls
|
||||
this.inputBuffer = new BufferedStream(new MemoryStream());
|
||||
this.innerStream = stream;
|
||||
this.ownsStream = ownsStream;
|
||||
this.read = new object ();
|
||||
this.write = new object ();
|
||||
this.read = String.Empty;
|
||||
this.write = String.Empty;
|
||||
this.protocol = new ServerRecordProtocol(innerStream, context);
|
||||
}
|
||||
|
||||
|
||||
@@ -1,8 +1,3 @@
|
||||
2004-07-15 Sebastien Pouliot <[email protected]>
|
||||
|
||||
* KeyUsageExtension.cs: Added Encode to extension so it can be used
|
||||
by makecert. Fix bug # 61240. Patch provided by Ianier Munoz.
|
||||
|
||||
2004-04-28 Sebastien Pouliot <[email protected]>
|
||||
|
||||
* KeyUsageExtension.cs: Added missing INSIDE_CORLIB to enum.
|
||||
|
||||
@@ -86,11 +86,6 @@ namespace Mono.Security.X509.Extensions {
|
||||
|
||||
public KeyUsageExtension (X509Extension extension) : base (extension) {}
|
||||
|
||||
public KeyUsageExtension () : base ()
|
||||
{
|
||||
extnOid = "2.5.29.15";
|
||||
}
|
||||
|
||||
protected override void Decode ()
|
||||
{
|
||||
ASN1 bitString = new ASN1 (extnValue.Value);
|
||||
@@ -101,18 +96,6 @@ namespace Mono.Security.X509.Extensions {
|
||||
kubits = (kubits << 8) + bitString.Value [i++];
|
||||
}
|
||||
|
||||
protected override void Encode ()
|
||||
{
|
||||
if (extnValue == null) {
|
||||
extnValue = new ASN1 (0x03, new byte[] { 0x00, (byte)kubits });
|
||||
}
|
||||
}
|
||||
|
||||
public KeyUsages KeyUsage {
|
||||
get { return (KeyUsages) kubits; }
|
||||
set { kubits = Convert.ToInt32 (value, CultureInfo.InvariantCulture); }
|
||||
}
|
||||
|
||||
public override string Name {
|
||||
get { return "Key Usage"; }
|
||||
}
|
||||
|
||||
@@ -1,14 +1,3 @@
|
||||
2004-09-07 Sebastien Pouliot <[email protected]>
|
||||
|
||||
* X509Chain.cs: Merge bug fixes from HEAD.
|
||||
* X509Store.cs: Merge enhancements from HEAD.
|
||||
|
||||
2004-07-15 Sebastien Pouliot <[email protected]>
|
||||
|
||||
* X501Name.cs: Support for E (email) in FromString.
|
||||
* X520Attributes.cs: Added X520.EmailAddress.
|
||||
Both patches fix bug #61241 and were contributed by Ianier Munoz.
|
||||
|
||||
2004-05-27 Sebastien Pouliot <[email protected]>
|
||||
|
||||
* X509Certificate.cs: Rethrow original exception when parsing X.509
|
||||
|
||||
@@ -162,8 +162,6 @@ namespace Mono.Security.X509 {
|
||||
case "S": // Microsoft
|
||||
case "ST": // RFC2253
|
||||
return new X520.StateOrProvinceName ();
|
||||
case "E": // NOTE: Not part of RFC2253
|
||||
return new X520.EmailAddress ();
|
||||
case "DC":
|
||||
// return streetAddress;
|
||||
case "UID":
|
||||
|
||||
@@ -9,7 +9,9 @@
|
||||
// Sebastien Pouliot <[email protected]>
|
||||
//
|
||||
// (C) 2003 Motus Technologies Inc. (http://www.motus.com)
|
||||
// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
|
||||
// (C) 2004 Novell (http://www.novell.com)
|
||||
//
|
||||
|
||||
//
|
||||
// Permission is hereby granted, free of charge, to any person obtaining
|
||||
// a copy of this software and associated documentation files (the
|
||||
@@ -132,7 +134,7 @@ namespace Mono.Security.X509 {
|
||||
tmp = FindCertificateParent (x);
|
||||
if (x != null) {
|
||||
_chain.Add (x);
|
||||
x = tmp; // last valid
|
||||
tmp = x; // last valid
|
||||
}
|
||||
}
|
||||
// find a trusted root
|
||||
@@ -189,8 +191,7 @@ namespace Mono.Security.X509 {
|
||||
_status = X509ChainStatusFlags.NoError;
|
||||
roots = null; // this force a reload
|
||||
certs.Clear ();
|
||||
if (_chain != null)
|
||||
_chain.Clear ();
|
||||
_chain.Clear ();
|
||||
}
|
||||
|
||||
// private stuff
|
||||
|
||||
@@ -4,7 +4,9 @@
|
||||
// Author:
|
||||
// Sebastien Pouliot <[email protected]>
|
||||
//
|
||||
// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
|
||||
// (C) 2004 Novell (http://www.novell.com)
|
||||
//
|
||||
|
||||
//
|
||||
// Permission is hereby granted, free of charge, to any person obtaining
|
||||
// a copy of this software and associated documentation files (the
|
||||
@@ -104,7 +106,9 @@ namespace Mono.Security.X509 {
|
||||
|
||||
public void Import (X509Certificate certificate)
|
||||
{
|
||||
CheckStore (_storePath, true);
|
||||
if (!Directory.Exists (_storePath)) {
|
||||
Directory.CreateDirectory (_storePath);
|
||||
}
|
||||
|
||||
string filename = Path.Combine (_storePath, GetUniqueName (certificate));
|
||||
if (!File.Exists (filename)) {
|
||||
@@ -179,28 +183,14 @@ namespace Mono.Security.X509 {
|
||||
return crl;
|
||||
}
|
||||
|
||||
private bool CheckStore (string path, bool throwException)
|
||||
{
|
||||
try {
|
||||
if (Directory.Exists (path))
|
||||
return true;
|
||||
Directory.CreateDirectory (path);
|
||||
return Directory.Exists (path);
|
||||
}
|
||||
catch {
|
||||
if (throwException)
|
||||
throw;
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
private X509CertificateCollection BuildCertificatesCollection (string storeName)
|
||||
{
|
||||
X509CertificateCollection coll = new X509CertificateCollection ();
|
||||
string path = Path.Combine (_storePath, storeName);
|
||||
if (!CheckStore (path, false))
|
||||
return coll; // empty collection
|
||||
if (!Directory.Exists (path)) {
|
||||
Directory.CreateDirectory (path);
|
||||
}
|
||||
|
||||
X509CertificateCollection coll = new X509CertificateCollection ();
|
||||
string[] files = Directory.GetFiles (path, "*.cer");
|
||||
if ((files != null) && (files.Length > 0)) {
|
||||
foreach (string file in files) {
|
||||
@@ -223,9 +213,6 @@ namespace Mono.Security.X509 {
|
||||
{
|
||||
ArrayList list = new ArrayList ();
|
||||
string path = Path.Combine (_storePath, storeName);
|
||||
if (!CheckStore (path, false))
|
||||
return list; // empty list
|
||||
|
||||
string[] files = Directory.GetFiles (path, "*.crl");
|
||||
if ((files != null) && (files.Length > 0)) {
|
||||
foreach (string file in files) {
|
||||
|
||||
@@ -101,10 +101,6 @@ namespace Mono.Security.X509 {
|
||||
// PRINTABLESTRING
|
||||
asn1.Add (new ASN1 (0x13, Encoding.ASCII.GetBytes (attrValue)));
|
||||
break;
|
||||
case 0x16:
|
||||
// IA5STRING
|
||||
asn1.Add (new ASN1 (0x16, Encoding.ASCII.GetBytes (attrValue)));
|
||||
break;
|
||||
case 0x1E:
|
||||
// BMPSTRING
|
||||
asn1.Add (new ASN1 (0x1E, Encoding.BigEndianUnicode.GetBytes (attrValue)));
|
||||
@@ -180,14 +176,6 @@ namespace Mono.Security.X509 {
|
||||
}
|
||||
}
|
||||
|
||||
// NOTE: Not part of RFC2253
|
||||
public class EmailAddress : AttributeTypeAndValue
|
||||
{
|
||||
public EmailAddress () : base ("1.2.840.113549.1.9.1", 128, 0x16)
|
||||
{
|
||||
}
|
||||
}
|
||||
|
||||
/* -- Naming attributes of type X520Title
|
||||
* id-at-title AttributeType ::= { id-at 12 }
|
||||
*
|
||||
|
||||
@@ -9,7 +9,6 @@ Mono.Math/PrimeTestingTest.cs
|
||||
Mono.Math/SearchGeneratorTest.cs
|
||||
Mono.Security/ASN1ConvertTest.cs
|
||||
Mono.Security/StrongNameTest.cs
|
||||
Mono.Security.Authenticode/AuthenticodeDeformatterTest.cs
|
||||
Mono.Security.Authenticode/PrivateKeyTest.cs
|
||||
Mono.Security.Authenticode/SoftwarePublisherCertificateTest.cs
|
||||
Mono.Security.Cryptography/ARC4ManagedTest.cs
|
||||
|
||||
-724
@@ -1,724 +0,0 @@
|
||||
//
|
||||
// AuthenticodeDeformatterTest.cs -
|
||||
// NUnit Test Cases for AuthenticodeDeformatter
|
||||
//
|
||||
// Author:
|
||||
// Sebastien Pouliot ([email protected])
|
||||
//
|
||||
// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
|
||||
//
|
||||
// Permission is hereby granted, free of charge, to any person obtaining
|
||||
// a copy of this software and associated documentation files (the
|
||||
// "Software"), to deal in the Software without restriction, including
|
||||
// without limitation the rights to use, copy, modify, merge, publish,
|
||||
// distribute, sublicense, and/or sell copies of the Software, and to
|
||||
// permit persons to whom the Software is furnished to do so, subject to
|
||||
// the following conditions:
|
||||
//
|
||||
// The above copyright notice and this permission notice shall be
|
||||
// included in all copies or substantial portions of the Software.
|
||||
//
|
||||
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
|
||||
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
||||
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
//
|
||||
|
||||
using System;
|
||||
using System.IO;
|
||||
using System.Reflection;
|
||||
using System.Security.Cryptography;
|
||||
|
||||
using Mono.Security.Authenticode;
|
||||
using NUnit.Framework;
|
||||
|
||||
namespace MonoTests.Mono.Security.Authenticode {
|
||||
|
||||
[TestFixture]
|
||||
public class AuthenticodeDeformatterTest {
|
||||
|
||||
static byte[] helloworld_signed = {
|
||||
0x4D, 0x5A, 0x90, 0x00, 0x03, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
|
||||
0xFF, 0xFF, 0x00, 0x00, 0xB8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x80, 0x00, 0x00, 0x00, 0x0E, 0x1F, 0xBA, 0x0E, 0x00, 0xB4, 0x09, 0xCD,
|
||||
0x21, 0xB8, 0x01, 0x4C, 0xCD, 0x21, 0x54, 0x68, 0x69, 0x73, 0x20, 0x70,
|
||||
0x72, 0x6F, 0x67, 0x72, 0x61, 0x6D, 0x20, 0x63, 0x61, 0x6E, 0x6E, 0x6F,
|
||||
0x74, 0x20, 0x62, 0x65, 0x20, 0x72, 0x75, 0x6E, 0x20, 0x69, 0x6E, 0x20,
|
||||
0x44, 0x4F, 0x53, 0x20, 0x6D, 0x6F, 0x64, 0x65, 0x2E, 0x0D, 0x0D, 0x0A,
|
||||
0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x45, 0x00, 0x00,
|
||||
0x4C, 0x01, 0x03, 0x00, 0xF5, 0xE5, 0xFA, 0x3E, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x0E, 0x01, 0x0B, 0x01, 0x06, 0x00,
|
||||
0x00, 0x04, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x1E, 0x23, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00,
|
||||
0x00, 0x00, 0x40, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00,
|
||||
0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00,
|
||||
0x96, 0x96, 0x00, 0x00, 0x03, 0x00, 0x00, 0x04, 0x00, 0x00, 0x10, 0x00,
|
||||
0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x10, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0xC4, 0x22, 0x00, 0x00, 0x57, 0x00, 0x00, 0x00,
|
||||
0x00, 0x40, 0x00, 0x00, 0x30, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0xA8, 0x11, 0x00, 0x00,
|
||||
0x00, 0x60, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00,
|
||||
0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x08, 0x20, 0x00, 0x00, 0x48, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x2E, 0x74, 0x65, 0x78, 0x74, 0x00, 0x00, 0x00,
|
||||
0x24, 0x03, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00,
|
||||
0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x60, 0x2E, 0x72, 0x73, 0x72,
|
||||
0x63, 0x00, 0x00, 0x00, 0x30, 0x03, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00,
|
||||
0x00, 0x04, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x40,
|
||||
0x2E, 0x72, 0x65, 0x6C, 0x6F, 0x63, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00,
|
||||
0x00, 0x60, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x40, 0x00, 0x00, 0x42, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x23, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x48, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
|
||||
0x7C, 0x20, 0x00, 0x00, 0x48, 0x02, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
|
||||
0x01, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x13, 0x30, 0x01, 0x00, 0x0B, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x72, 0x01, 0x00, 0x00, 0x70, 0x28, 0x03, 0x00,
|
||||
0x00, 0x0A, 0x2A, 0x00, 0x13, 0x30, 0x01, 0x00, 0x07, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x02, 0x28, 0x04, 0x00, 0x00, 0x0A, 0x2A, 0x00,
|
||||
0x42, 0x53, 0x4A, 0x42, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x0C, 0x00, 0x00, 0x00, 0x76, 0x31, 0x2E, 0x31, 0x2E, 0x34, 0x33, 0x32,
|
||||
0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x6C, 0x00, 0x00, 0x00,
|
||||
0xEC, 0x00, 0x00, 0x00, 0x23, 0x7E, 0x00, 0x00, 0x58, 0x01, 0x00, 0x00,
|
||||
0x9C, 0x00, 0x00, 0x00, 0x23, 0x53, 0x74, 0x72, 0x69, 0x6E, 0x67, 0x73,
|
||||
0x00, 0x00, 0x00, 0x00, 0xF4, 0x01, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00,
|
||||
0x23, 0x55, 0x53, 0x00, 0x0C, 0x02, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00,
|
||||
0x23, 0x47, 0x55, 0x49, 0x44, 0x00, 0x00, 0x00, 0x1C, 0x02, 0x00, 0x00,
|
||||
0x2C, 0x00, 0x00, 0x00, 0x23, 0x42, 0x6C, 0x6F, 0x62, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x47, 0x15, 0x00, 0x00,
|
||||
0x09, 0x00, 0x00, 0x00, 0x00, 0xFA, 0x01, 0x33, 0x00, 0x02, 0x00, 0x00,
|
||||
0x01, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
|
||||
0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
|
||||
0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x0A, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00,
|
||||
0x25, 0x00, 0x1E, 0x00, 0x06, 0x00, 0x5C, 0x00, 0x49, 0x00, 0x06, 0x00,
|
||||
0x70, 0x00, 0x1E, 0x00, 0x06, 0x00, 0x88, 0x00, 0x1E, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00,
|
||||
0x00, 0x00, 0x10, 0x00, 0x2C, 0x00, 0x33, 0x00, 0x05, 0x00, 0x01, 0x00,
|
||||
0x01, 0x00, 0x50, 0x20, 0x00, 0x00, 0x00, 0x00, 0x91, 0x00, 0x3E, 0x00,
|
||||
0x0A, 0x00, 0x01, 0x00, 0x68, 0x20, 0x00, 0x00, 0x00, 0x00, 0x86, 0x18,
|
||||
0x43, 0x00, 0x10, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x83, 0x00,
|
||||
0x11, 0x00, 0x43, 0x00, 0x14, 0x00, 0x19, 0x00, 0x43, 0x00, 0x10, 0x00,
|
||||
0x21, 0x00, 0x90, 0x00, 0x1F, 0x00, 0x09, 0x00, 0x43, 0x00, 0x10, 0x00,
|
||||
0x20, 0x00, 0x13, 0x00, 0x1A, 0x00, 0x2E, 0x00, 0x0B, 0x00, 0x24, 0x00,
|
||||
0x04, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2C, 0x00, 0x00, 0x00, 0x01, 0x00,
|
||||
0x00, 0x00, 0x88, 0x13, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00,
|
||||
0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3C, 0x4D, 0x6F,
|
||||
0x64, 0x75, 0x6C, 0x65, 0x3E, 0x00, 0x43, 0x6C, 0x61, 0x73, 0x73, 0x31,
|
||||
0x2E, 0x65, 0x78, 0x65, 0x00, 0x6D, 0x73, 0x63, 0x6F, 0x72, 0x6C, 0x69,
|
||||
0x62, 0x00, 0x53, 0x79, 0x73, 0x74, 0x65, 0x6D, 0x00, 0x4F, 0x62, 0x6A,
|
||||
0x65, 0x63, 0x74, 0x00, 0x43, 0x6C, 0x61, 0x73, 0x73, 0x31, 0x00, 0x68,
|
||||
0x65, 0x6C, 0x6C, 0x6F, 0x77, 0x6F, 0x72, 0x6C, 0x64, 0x00, 0x4D, 0x61,
|
||||
0x69, 0x6E, 0x00, 0x2E, 0x63, 0x74, 0x6F, 0x72, 0x00, 0x53, 0x79, 0x73,
|
||||
0x74, 0x65, 0x6D, 0x2E, 0x44, 0x69, 0x61, 0x67, 0x6E, 0x6F, 0x73, 0x74,
|
||||
0x69, 0x63, 0x73, 0x00, 0x44, 0x65, 0x62, 0x75, 0x67, 0x67, 0x61, 0x62,
|
||||
0x6C, 0x65, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x00,
|
||||
0x53, 0x54, 0x41, 0x54, 0x68, 0x72, 0x65, 0x61, 0x64, 0x41, 0x74, 0x74,
|
||||
0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x00, 0x61, 0x72, 0x67, 0x73, 0x00,
|
||||
0x43, 0x6F, 0x6E, 0x73, 0x6F, 0x6C, 0x65, 0x00, 0x57, 0x72, 0x69, 0x74,
|
||||
0x65, 0x4C, 0x69, 0x6E, 0x65, 0x00, 0x00, 0x00, 0x00, 0x15, 0x48, 0x00,
|
||||
0x65, 0x00, 0x6C, 0x00, 0x6C, 0x00, 0x6F, 0x00, 0x20, 0x00, 0x77, 0x00,
|
||||
0x6F, 0x00, 0x72, 0x00, 0x64, 0x00, 0x00, 0x00, 0xA7, 0x01, 0xAB, 0x9B,
|
||||
0xF7, 0xF7, 0x3F, 0x49, 0xB9, 0x45, 0x97, 0xAF, 0x40, 0x00, 0x5D, 0x9D,
|
||||
0x00, 0x08, 0xB7, 0x7A, 0x5C, 0x56, 0x19, 0x34, 0xE0, 0x89, 0x05, 0x00,
|
||||
0x01, 0x01, 0x1D, 0x0E, 0x03, 0x20, 0x00, 0x01, 0x05, 0x20, 0x02, 0x01,
|
||||
0x02, 0x02, 0x04, 0x01, 0x00, 0x00, 0x00, 0x04, 0x00, 0x01, 0x01, 0x0E,
|
||||
0x06, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xEC, 0x22, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0E, 0x23, 0x00, 0x00,
|
||||
0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x23, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5F, 0x43,
|
||||
0x6F, 0x72, 0x45, 0x78, 0x65, 0x4D, 0x61, 0x69, 0x6E, 0x00, 0x6D, 0x73,
|
||||
0x63, 0x6F, 0x72, 0x65, 0x65, 0x2E, 0x64, 0x6C, 0x6C, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0xFF, 0x25, 0x00, 0x20, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x01, 0x00, 0x10, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x80,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x80,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x48, 0x00, 0x00, 0x00,
|
||||
0x58, 0x40, 0x00, 0x00, 0xD4, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0xD4, 0x02, 0x34, 0x00, 0x00, 0x00, 0x56, 0x00,
|
||||
0x53, 0x00, 0x5F, 0x00, 0x56, 0x00, 0x45, 0x00, 0x52, 0x00, 0x53, 0x00,
|
||||
0x49, 0x00, 0x4F, 0x00, 0x4E, 0x00, 0x5F, 0x00, 0x49, 0x00, 0x4E, 0x00,
|
||||
0x46, 0x00, 0x4F, 0x00, 0x00, 0x00, 0x00, 0x00, 0xBD, 0x04, 0xEF, 0xFE,
|
||||
0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x44, 0x00, 0x00, 0x00, 0x01, 0x00, 0x56, 0x00, 0x61, 0x00, 0x72, 0x00,
|
||||
0x46, 0x00, 0x69, 0x00, 0x6C, 0x00, 0x65, 0x00, 0x49, 0x00, 0x6E, 0x00,
|
||||
0x66, 0x00, 0x6F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x24, 0x00, 0x04, 0x00,
|
||||
0x00, 0x00, 0x54, 0x00, 0x72, 0x00, 0x61, 0x00, 0x6E, 0x00, 0x73, 0x00,
|
||||
0x6C, 0x00, 0x61, 0x00, 0x74, 0x00, 0x69, 0x00, 0x6F, 0x00, 0x6E, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xB0, 0x04, 0x34, 0x02, 0x00, 0x00,
|
||||
0x01, 0x00, 0x53, 0x00, 0x74, 0x00, 0x72, 0x00, 0x69, 0x00, 0x6E, 0x00,
|
||||
0x67, 0x00, 0x46, 0x00, 0x69, 0x00, 0x6C, 0x00, 0x65, 0x00, 0x49, 0x00,
|
||||
0x6E, 0x00, 0x66, 0x00, 0x6F, 0x00, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00,
|
||||
0x01, 0x00, 0x30, 0x00, 0x30, 0x00, 0x30, 0x00, 0x30, 0x00, 0x30, 0x00,
|
||||
0x34, 0x00, 0x62, 0x00, 0x30, 0x00, 0x00, 0x00, 0x1C, 0x00, 0x02, 0x00,
|
||||
0x01, 0x00, 0x43, 0x00, 0x6F, 0x00, 0x6D, 0x00, 0x6D, 0x00, 0x65, 0x00,
|
||||
0x6E, 0x00, 0x74, 0x00, 0x73, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00,
|
||||
0x24, 0x00, 0x02, 0x00, 0x01, 0x00, 0x43, 0x00, 0x6F, 0x00, 0x6D, 0x00,
|
||||
0x70, 0x00, 0x61, 0x00, 0x6E, 0x00, 0x79, 0x00, 0x4E, 0x00, 0x61, 0x00,
|
||||
0x6D, 0x00, 0x65, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00,
|
||||
0x2C, 0x00, 0x02, 0x00, 0x01, 0x00, 0x46, 0x00, 0x69, 0x00, 0x6C, 0x00,
|
||||
0x65, 0x00, 0x44, 0x00, 0x65, 0x00, 0x73, 0x00, 0x63, 0x00, 0x72, 0x00,
|
||||
0x69, 0x00, 0x70, 0x00, 0x74, 0x00, 0x69, 0x00, 0x6F, 0x00, 0x6E, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x30, 0x00, 0x08, 0x00,
|
||||
0x01, 0x00, 0x46, 0x00, 0x69, 0x00, 0x6C, 0x00, 0x65, 0x00, 0x56, 0x00,
|
||||
0x65, 0x00, 0x72, 0x00, 0x73, 0x00, 0x69, 0x00, 0x6F, 0x00, 0x6E, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x30, 0x00, 0x2E, 0x00, 0x30, 0x00, 0x2E, 0x00,
|
||||
0x30, 0x00, 0x2E, 0x00, 0x30, 0x00, 0x00, 0x00, 0x38, 0x00, 0x0B, 0x00,
|
||||
0x01, 0x00, 0x49, 0x00, 0x6E, 0x00, 0x74, 0x00, 0x65, 0x00, 0x72, 0x00,
|
||||
0x6E, 0x00, 0x61, 0x00, 0x6C, 0x00, 0x4E, 0x00, 0x61, 0x00, 0x6D, 0x00,
|
||||
0x65, 0x00, 0x00, 0x00, 0x43, 0x00, 0x6C, 0x00, 0x61, 0x00, 0x73, 0x00,
|
||||
0x73, 0x00, 0x31, 0x00, 0x2E, 0x00, 0x65, 0x00, 0x78, 0x00, 0x65, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x28, 0x00, 0x02, 0x00, 0x01, 0x00, 0x4C, 0x00,
|
||||
0x65, 0x00, 0x67, 0x00, 0x61, 0x00, 0x6C, 0x00, 0x43, 0x00, 0x6F, 0x00,
|
||||
0x70, 0x00, 0x79, 0x00, 0x72, 0x00, 0x69, 0x00, 0x67, 0x00, 0x68, 0x00,
|
||||
0x74, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x2C, 0x00, 0x02, 0x00,
|
||||
0x01, 0x00, 0x4C, 0x00, 0x65, 0x00, 0x67, 0x00, 0x61, 0x00, 0x6C, 0x00,
|
||||
0x54, 0x00, 0x72, 0x00, 0x61, 0x00, 0x64, 0x00, 0x65, 0x00, 0x6D, 0x00,
|
||||
0x61, 0x00, 0x72, 0x00, 0x6B, 0x00, 0x73, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x20, 0x00, 0x00, 0x00, 0x40, 0x00, 0x0B, 0x00, 0x01, 0x00, 0x4F, 0x00,
|
||||
0x72, 0x00, 0x69, 0x00, 0x67, 0x00, 0x69, 0x00, 0x6E, 0x00, 0x61, 0x00,
|
||||
0x6C, 0x00, 0x46, 0x00, 0x69, 0x00, 0x6C, 0x00, 0x65, 0x00, 0x6E, 0x00,
|
||||
0x61, 0x00, 0x6D, 0x00, 0x65, 0x00, 0x00, 0x00, 0x43, 0x00, 0x6C, 0x00,
|
||||
0x61, 0x00, 0x73, 0x00, 0x73, 0x00, 0x31, 0x00, 0x2E, 0x00, 0x65, 0x00,
|
||||
0x78, 0x00, 0x65, 0x00, 0x00, 0x00, 0x00, 0x00, 0x24, 0x00, 0x02, 0x00,
|
||||
0x01, 0x00, 0x50, 0x00, 0x72, 0x00, 0x6F, 0x00, 0x64, 0x00, 0x75, 0x00,
|
||||
0x63, 0x00, 0x74, 0x00, 0x4E, 0x00, 0x61, 0x00, 0x6D, 0x00, 0x65, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x34, 0x00, 0x08, 0x00,
|
||||
0x01, 0x00, 0x50, 0x00, 0x72, 0x00, 0x6F, 0x00, 0x64, 0x00, 0x75, 0x00,
|
||||
0x63, 0x00, 0x74, 0x00, 0x56, 0x00, 0x65, 0x00, 0x72, 0x00, 0x73, 0x00,
|
||||
0x69, 0x00, 0x6F, 0x00, 0x6E, 0x00, 0x00, 0x00, 0x30, 0x00, 0x2E, 0x00,
|
||||
0x30, 0x00, 0x2E, 0x00, 0x30, 0x00, 0x2E, 0x00, 0x30, 0x00, 0x00, 0x00,
|
||||
0x38, 0x00, 0x08, 0x00, 0x01, 0x00, 0x41, 0x00, 0x73, 0x00, 0x73, 0x00,
|
||||
0x65, 0x00, 0x6D, 0x00, 0x62, 0x00, 0x6C, 0x00, 0x79, 0x00, 0x20, 0x00,
|
||||
0x56, 0x00, 0x65, 0x00, 0x72, 0x00, 0x73, 0x00, 0x69, 0x00, 0x6F, 0x00,
|
||||
0x6E, 0x00, 0x00, 0x00, 0x30, 0x00, 0x2E, 0x00, 0x30, 0x00, 0x2E, 0x00,
|
||||
0x30, 0x00, 0x2E, 0x00, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00,
|
||||
0x20, 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0xA8, 0x11, 0x00, 0x00, 0x00, 0x02, 0x02, 0x00, 0x30, 0x82, 0x11, 0x97,
|
||||
0x06, 0x09, 0x2A, 0x86, 0x48, 0x86, 0xF7, 0x0D, 0x01, 0x07, 0x02, 0xA0,
|
||||
0x82, 0x11, 0x88, 0x30, 0x82, 0x11, 0x84, 0x02, 0x01, 0x01, 0x31, 0x0E,
|
||||
0x30, 0x0C, 0x06, 0x08, 0x2A, 0x86, 0x48, 0x86, 0xF7, 0x0D, 0x02, 0x05,
|
||||
0x05, 0x00, 0x30, 0x67, 0x06, 0x0A, 0x2B, 0x06, 0x01, 0x04, 0x01, 0x82,
|
||||
0x37, 0x02, 0x01, 0x04, 0xA0, 0x59, 0x30, 0x57, 0x30, 0x33, 0x06, 0x0A,
|
||||
0x2B, 0x06, 0x01, 0x04, 0x01, 0x82, 0x37, 0x02, 0x01, 0x0F, 0x30, 0x25,
|
||||
0x03, 0x01, 0x00, 0xA0, 0x20, 0xA2, 0x1E, 0x80, 0x1C, 0x00, 0x3C, 0x00,
|
||||
0x3C, 0x00, 0x3C, 0x00, 0x4F, 0x00, 0x62, 0x00, 0x73, 0x00, 0x6F, 0x00,
|
||||
0x6C, 0x00, 0x65, 0x00, 0x74, 0x00, 0x65, 0x00, 0x3E, 0x00, 0x3E, 0x00,
|
||||
0x3E, 0x30, 0x20, 0x30, 0x0C, 0x06, 0x08, 0x2A, 0x86, 0x48, 0x86, 0xF7,
|
||||
0x0D, 0x02, 0x05, 0x05, 0x00, 0x04, 0x10, 0x35, 0xA5, 0x21, 0x3B, 0xFC,
|
||||
0xFE, 0xFA, 0x40, 0x97, 0xAA, 0xBB, 0xDE, 0x3B, 0x52, 0x15, 0x6F, 0xA0,
|
||||
0x82, 0x0C, 0xF4, 0x30, 0x82, 0x02, 0xBC, 0x30, 0x82, 0x02, 0x25, 0x02,
|
||||
0x10, 0x4A, 0x19, 0xD2, 0x38, 0x8C, 0x82, 0x59, 0x1C, 0xA5, 0x5D, 0x73,
|
||||
0x5F, 0x15, 0x5D, 0xDC, 0xA3, 0x30, 0x0D, 0x06, 0x09, 0x2A, 0x86, 0x48,
|
||||
0x86, 0xF7, 0x0D, 0x01, 0x01, 0x04, 0x05, 0x00, 0x30, 0x81, 0x9E, 0x31,
|
||||
0x1F, 0x30, 0x1D, 0x06, 0x03, 0x55, 0x04, 0x0A, 0x13, 0x16, 0x56, 0x65,
|
||||
0x72, 0x69, 0x53, 0x69, 0x67, 0x6E, 0x20, 0x54, 0x72, 0x75, 0x73, 0x74,
|
||||
0x20, 0x4E, 0x65, 0x74, 0x77, 0x6F, 0x72, 0x6B, 0x31, 0x17, 0x30, 0x15,
|
||||
0x06, 0x03, 0x55, 0x04, 0x0B, 0x13, 0x0E, 0x56, 0x65, 0x72, 0x69, 0x53,
|
||||
0x69, 0x67, 0x6E, 0x2C, 0x20, 0x49, 0x6E, 0x63, 0x2E, 0x31, 0x2C, 0x30,
|
||||
0x2A, 0x06, 0x03, 0x55, 0x04, 0x0B, 0x13, 0x23, 0x56, 0x65, 0x72, 0x69,
|
||||
0x53, 0x69, 0x67, 0x6E, 0x20, 0x54, 0x69, 0x6D, 0x65, 0x20, 0x53, 0x74,
|
||||
0x61, 0x6D, 0x70, 0x69, 0x6E, 0x67, 0x20, 0x53, 0x65, 0x72, 0x76, 0x69,
|
||||
0x63, 0x65, 0x20, 0x52, 0x6F, 0x6F, 0x74, 0x31, 0x34, 0x30, 0x32, 0x06,
|
||||
0x03, 0x55, 0x04, 0x0B, 0x13, 0x2B, 0x4E, 0x4F, 0x20, 0x4C, 0x49, 0x41,
|
||||
0x42, 0x49, 0x4C, 0x49, 0x54, 0x59, 0x20, 0x41, 0x43, 0x43, 0x45, 0x50,
|
||||
0x54, 0x45, 0x44, 0x2C, 0x20, 0x28, 0x63, 0x29, 0x39, 0x37, 0x20, 0x56,
|
||||
0x65, 0x72, 0x69, 0x53, 0x69, 0x67, 0x6E, 0x2C, 0x20, 0x49, 0x6E, 0x63,
|
||||
0x2E, 0x30, 0x1E, 0x17, 0x0D, 0x39, 0x37, 0x30, 0x35, 0x31, 0x32, 0x30,
|
||||
0x30, 0x30, 0x30, 0x30, 0x30, 0x5A, 0x17, 0x0D, 0x30, 0x34, 0x30, 0x31,
|
||||
0x30, 0x37, 0x32, 0x33, 0x35, 0x39, 0x35, 0x39, 0x5A, 0x30, 0x81, 0x9E,
|
||||
0x31, 0x1F, 0x30, 0x1D, 0x06, 0x03, 0x55, 0x04, 0x0A, 0x13, 0x16, 0x56,
|
||||
0x65, 0x72, 0x69, 0x53, 0x69, 0x67, 0x6E, 0x20, 0x54, 0x72, 0x75, 0x73,
|
||||
0x74, 0x20, 0x4E, 0x65, 0x74, 0x77, 0x6F, 0x72, 0x6B, 0x31, 0x17, 0x30,
|
||||
0x15, 0x06, 0x03, 0x55, 0x04, 0x0B, 0x13, 0x0E, 0x56, 0x65, 0x72, 0x69,
|
||||
0x53, 0x69, 0x67, 0x6E, 0x2C, 0x20, 0x49, 0x6E, 0x63, 0x2E, 0x31, 0x2C,
|
||||
0x30, 0x2A, 0x06, 0x03, 0x55, 0x04, 0x0B, 0x13, 0x23, 0x56, 0x65, 0x72,
|
||||
0x69, 0x53, 0x69, 0x67, 0x6E, 0x20, 0x54, 0x69, 0x6D, 0x65, 0x20, 0x53,
|
||||
0x74, 0x61, 0x6D, 0x70, 0x69, 0x6E, 0x67, 0x20, 0x53, 0x65, 0x72, 0x76,
|
||||
0x69, 0x63, 0x65, 0x20, 0x52, 0x6F, 0x6F, 0x74, 0x31, 0x34, 0x30, 0x32,
|
||||
0x06, 0x03, 0x55, 0x04, 0x0B, 0x13, 0x2B, 0x4E, 0x4F, 0x20, 0x4C, 0x49,
|
||||
0x41, 0x42, 0x49, 0x4C, 0x49, 0x54, 0x59, 0x20, 0x41, 0x43, 0x43, 0x45,
|
||||
0x50, 0x54, 0x45, 0x44, 0x2C, 0x20, 0x28, 0x63, 0x29, 0x39, 0x37, 0x20,
|
||||
0x56, 0x65, 0x72, 0x69, 0x53, 0x69, 0x67, 0x6E, 0x2C, 0x20, 0x49, 0x6E,
|
||||
0x63, 0x2E, 0x30, 0x81, 0x9F, 0x30, 0x0D, 0x06, 0x09, 0x2A, 0x86, 0x48,
|
||||
0x86, 0xF7, 0x0D, 0x01, 0x01, 0x01, 0x05, 0x00, 0x03, 0x81, 0x8D, 0x00,
|
||||
0x30, 0x81, 0x89, 0x02, 0x81, 0x81, 0x00, 0xD3, 0x2E, 0x20, 0xF0, 0x68,
|
||||
0x7C, 0x2C, 0x2D, 0x2E, 0x81, 0x1C, 0xB1, 0x06, 0xB2, 0xA7, 0x0B, 0xB7,
|
||||
0x11, 0x0D, 0x57, 0xDA, 0x53, 0xD8, 0x75, 0xE3, 0xC9, 0x33, 0x2A, 0xB2,
|
||||
0xD4, 0xF6, 0x09, 0x5B, 0x34, 0xF3, 0xE9, 0x90, 0xFE, 0x09, 0x0C, 0xD0,
|
||||
0xDB, 0x1B, 0x5A, 0xB9, 0xCD, 0xE7, 0xF6, 0x88, 0xB1, 0x9D, 0xC0, 0x87,
|
||||
0x25, 0xEB, 0x7D, 0x58, 0x10, 0x73, 0x6A, 0x78, 0xCB, 0x71, 0x15, 0xFD,
|
||||
0xC6, 0x58, 0xF6, 0x29, 0xAB, 0x58, 0x5E, 0x96, 0x04, 0xFD, 0x2D, 0x62,
|
||||
0x11, 0x58, 0x81, 0x1C, 0xCA, 0x71, 0x94, 0xD5, 0x22, 0x58, 0x2F, 0xD5,
|
||||
0xCC, 0x14, 0x05, 0x84, 0x36, 0xBA, 0x94, 0xAA, 0xB4, 0x4D, 0x4A, 0xE9,
|
||||
0xEE, 0x3B, 0x22, 0xAD, 0x56, 0x99, 0x7E, 0x21, 0x9C, 0x6C, 0x86, 0xC0,
|
||||
0x4A, 0x47, 0x97, 0x6A, 0xB4, 0xA6, 0x36, 0xD5, 0xFC, 0x09, 0x2D, 0xD3,
|
||||
0xB4, 0x39, 0x9B, 0x02, 0x03, 0x01, 0x00, 0x01, 0x30, 0x0D, 0x06, 0x09,
|
||||
0x2A, 0x86, 0x48, 0x86, 0xF7, 0x0D, 0x01, 0x01, 0x04, 0x05, 0x00, 0x03,
|
||||
0x81, 0x81, 0x00, 0x61, 0x55, 0x0E, 0x3E, 0x7B, 0xC7, 0x92, 0x12, 0x7E,
|
||||
0x11, 0x10, 0x8E, 0x22, 0xCC, 0xD4, 0xB3, 0x13, 0x2B, 0x5B, 0xE8, 0x44,
|
||||
0xE4, 0x0B, 0x78, 0x9E, 0xA4, 0x7E, 0xF3, 0xA7, 0x07, 0x72, 0x1E, 0xE2,
|
||||
0x59, 0xEF, 0xCC, 0x84, 0xE3, 0x89, 0x94, 0x4C, 0xDB, 0x4E, 0x61, 0xEF,
|
||||
0xB3, 0xA4, 0xFB, 0x46, 0x3D, 0x50, 0x34, 0x0B, 0x9F, 0x70, 0x56, 0xF6,
|
||||
0x8E, 0x2A, 0x7F, 0x17, 0xCE, 0xE5, 0x63, 0xBF, 0x79, 0x69, 0x07, 0x73,
|
||||
0x2E, 0xB0, 0x95, 0x28, 0x8A, 0xF5, 0xED, 0xAA, 0xA9, 0xD2, 0x5D, 0xCD,
|
||||
0x0A, 0xCA, 0x10, 0x09, 0x8F, 0xCE, 0xB3, 0xAF, 0x28, 0x96, 0xC4, 0x79,
|
||||
0x29, 0x84, 0x92, 0xDC, 0xFF, 0xBA, 0x67, 0x42, 0x48, 0xA6, 0x90, 0x10,
|
||||
0xE4, 0xBF, 0x61, 0xF8, 0x9C, 0x53, 0xE5, 0x93, 0xD1, 0x73, 0x3F, 0xF8,
|
||||
0xFD, 0x9D, 0x4F, 0x84, 0xAC, 0x55, 0xD1, 0xFD, 0x11, 0x63, 0x63, 0x30,
|
||||
0x82, 0x03, 0x13, 0x30, 0x82, 0x02, 0x7C, 0xA0, 0x03, 0x02, 0x01, 0x02,
|
||||
0x02, 0x01, 0x01, 0x30, 0x0D, 0x06, 0x09, 0x2A, 0x86, 0x48, 0x86, 0xF7,
|
||||
0x0D, 0x01, 0x01, 0x04, 0x05, 0x00, 0x30, 0x81, 0xC4, 0x31, 0x0B, 0x30,
|
||||
0x09, 0x06, 0x03, 0x55, 0x04, 0x06, 0x13, 0x02, 0x5A, 0x41, 0x31, 0x15,
|
||||
0x30, 0x13, 0x06, 0x03, 0x55, 0x04, 0x08, 0x13, 0x0C, 0x57, 0x65, 0x73,
|
||||
0x74, 0x65, 0x72, 0x6E, 0x20, 0x43, 0x61, 0x70, 0x65, 0x31, 0x12, 0x30,
|
||||
0x10, 0x06, 0x03, 0x55, 0x04, 0x07, 0x13, 0x09, 0x43, 0x61, 0x70, 0x65,
|
||||
0x20, 0x54, 0x6F, 0x77, 0x6E, 0x31, 0x1D, 0x30, 0x1B, 0x06, 0x03, 0x55,
|
||||
0x04, 0x0A, 0x13, 0x14, 0x54, 0x68, 0x61, 0x77, 0x74, 0x65, 0x20, 0x43,
|
||||
0x6F, 0x6E, 0x73, 0x75, 0x6C, 0x74, 0x69, 0x6E, 0x67, 0x20, 0x63, 0x63,
|
||||
0x31, 0x28, 0x30, 0x26, 0x06, 0x03, 0x55, 0x04, 0x0B, 0x13, 0x1F, 0x43,
|
||||
0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6F, 0x6E,
|
||||
0x20, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x20, 0x44, 0x69,
|
||||
0x76, 0x69, 0x73, 0x69, 0x6F, 0x6E, 0x31, 0x19, 0x30, 0x17, 0x06, 0x03,
|
||||
0x55, 0x04, 0x03, 0x13, 0x10, 0x54, 0x68, 0x61, 0x77, 0x74, 0x65, 0x20,
|
||||
0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x20, 0x43, 0x41, 0x31, 0x26, 0x30,
|
||||
0x24, 0x06, 0x09, 0x2A, 0x86, 0x48, 0x86, 0xF7, 0x0D, 0x01, 0x09, 0x01,
|
||||
0x16, 0x17, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2D, 0x63, 0x65, 0x72,
|
||||
0x74, 0x73, 0x40, 0x74, 0x68, 0x61, 0x77, 0x74, 0x65, 0x2E, 0x63, 0x6F,
|
||||
0x6D, 0x30, 0x1E, 0x17, 0x0D, 0x39, 0x36, 0x30, 0x38, 0x30, 0x31, 0x30,
|
||||
0x30, 0x30, 0x30, 0x30, 0x30, 0x5A, 0x17, 0x0D, 0x32, 0x30, 0x31, 0x32,
|
||||
0x33, 0x31, 0x32, 0x33, 0x35, 0x39, 0x35, 0x39, 0x5A, 0x30, 0x81, 0xC4,
|
||||
0x31, 0x0B, 0x30, 0x09, 0x06, 0x03, 0x55, 0x04, 0x06, 0x13, 0x02, 0x5A,
|
||||
0x41, 0x31, 0x15, 0x30, 0x13, 0x06, 0x03, 0x55, 0x04, 0x08, 0x13, 0x0C,
|
||||
0x57, 0x65, 0x73, 0x74, 0x65, 0x72, 0x6E, 0x20, 0x43, 0x61, 0x70, 0x65,
|
||||
0x31, 0x12, 0x30, 0x10, 0x06, 0x03, 0x55, 0x04, 0x07, 0x13, 0x09, 0x43,
|
||||
0x61, 0x70, 0x65, 0x20, 0x54, 0x6F, 0x77, 0x6E, 0x31, 0x1D, 0x30, 0x1B,
|
||||
0x06, 0x03, 0x55, 0x04, 0x0A, 0x13, 0x14, 0x54, 0x68, 0x61, 0x77, 0x74,
|
||||
0x65, 0x20, 0x43, 0x6F, 0x6E, 0x73, 0x75, 0x6C, 0x74, 0x69, 0x6E, 0x67,
|
||||
0x20, 0x63, 0x63, 0x31, 0x28, 0x30, 0x26, 0x06, 0x03, 0x55, 0x04, 0x0B,
|
||||
0x13, 0x1F, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74,
|
||||
0x69, 0x6F, 0x6E, 0x20, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73,
|
||||
0x20, 0x44, 0x69, 0x76, 0x69, 0x73, 0x69, 0x6F, 0x6E, 0x31, 0x19, 0x30,
|
||||
0x17, 0x06, 0x03, 0x55, 0x04, 0x03, 0x13, 0x10, 0x54, 0x68, 0x61, 0x77,
|
||||
0x74, 0x65, 0x20, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x20, 0x43, 0x41,
|
||||
0x31, 0x26, 0x30, 0x24, 0x06, 0x09, 0x2A, 0x86, 0x48, 0x86, 0xF7, 0x0D,
|
||||
0x01, 0x09, 0x01, 0x16, 0x17, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2D,
|
||||
0x63, 0x65, 0x72, 0x74, 0x73, 0x40, 0x74, 0x68, 0x61, 0x77, 0x74, 0x65,
|
||||
0x2E, 0x63, 0x6F, 0x6D, 0x30, 0x81, 0x9F, 0x30, 0x0D, 0x06, 0x09, 0x2A,
|
||||
0x86, 0x48, 0x86, 0xF7, 0x0D, 0x01, 0x01, 0x01, 0x05, 0x00, 0x03, 0x81,
|
||||
0x8D, 0x00, 0x30, 0x81, 0x89, 0x02, 0x81, 0x81, 0x00, 0xD3, 0xA4, 0x50,
|
||||
0x6E, 0xC8, 0xFF, 0x56, 0x6B, 0xE6, 0xCF, 0x5D, 0xB6, 0xEA, 0x0C, 0x68,
|
||||
0x75, 0x47, 0xA2, 0xAA, 0xC2, 0xDA, 0x84, 0x25, 0xFC, 0xA8, 0xF4, 0x47,
|
||||
0x51, 0xDA, 0x85, 0xB5, 0x20, 0x74, 0x94, 0x86, 0x1E, 0x0F, 0x75, 0xC9,
|
||||
0xE9, 0x08, 0x61, 0xF5, 0x06, 0x6D, 0x30, 0x6E, 0x15, 0x19, 0x02, 0xE9,
|
||||
0x52, 0xC0, 0x62, 0xDB, 0x4D, 0x99, 0x9E, 0xE2, 0x6A, 0x0C, 0x44, 0x38,
|
||||
0xCD, 0xFE, 0xBE, 0xE3, 0x64, 0x09, 0x70, 0xC5, 0xFE, 0xB1, 0x6B, 0x29,
|
||||
0xB6, 0x2F, 0x49, 0xC8, 0x3B, 0xD4, 0x27, 0x04, 0x25, 0x10, 0x97, 0x2F,
|
||||
0xE7, 0x90, 0x6D, 0xC0, 0x28, 0x42, 0x99, 0xD7, 0x4C, 0x43, 0xDE, 0xC3,
|
||||
0xF5, 0x21, 0x6D, 0x54, 0x9F, 0x5D, 0xC3, 0x58, 0xE1, 0xC0, 0xE4, 0xD9,
|
||||
0x5B, 0xB0, 0xB8, 0xDC, 0xB4, 0x7B, 0xDF, 0x36, 0x3A, 0xC2, 0xB5, 0x66,
|
||||
0x22, 0x12, 0xD6, 0x87, 0x0D, 0x02, 0x03, 0x01, 0x00, 0x01, 0xA3, 0x13,
|
||||
0x30, 0x11, 0x30, 0x0F, 0x06, 0x03, 0x55, 0x1D, 0x13, 0x01, 0x01, 0xFF,
|
||||
0x04, 0x05, 0x30, 0x03, 0x01, 0x01, 0xFF, 0x30, 0x0D, 0x06, 0x09, 0x2A,
|
||||
0x86, 0x48, 0x86, 0xF7, 0x0D, 0x01, 0x01, 0x04, 0x05, 0x00, 0x03, 0x81,
|
||||
0x81, 0x00, 0x07, 0xFA, 0x4C, 0x69, 0x5C, 0xFB, 0x95, 0xCC, 0x46, 0xEE,
|
||||
0x85, 0x83, 0x4D, 0x21, 0x30, 0x8E, 0xCA, 0xD9, 0xA8, 0x6F, 0x49, 0x1A,
|
||||
0xE6, 0xDA, 0x51, 0xE3, 0x60, 0x70, 0x6C, 0x84, 0x61, 0x11, 0xA1, 0x1A,
|
||||
0xC8, 0x48, 0x3E, 0x59, 0x43, 0x7D, 0x4F, 0x95, 0x3D, 0xA1, 0x8B, 0xB7,
|
||||
0x0B, 0x62, 0x98, 0x7A, 0x75, 0x8A, 0xDD, 0x88, 0x4E, 0x4E, 0x9E, 0x40,
|
||||
0xDB, 0xA8, 0xCC, 0x32, 0x74, 0xB9, 0x6F, 0x0D, 0xC6, 0xE3, 0xB3, 0x44,
|
||||
0x0B, 0xD9, 0x8A, 0x6F, 0x9A, 0x29, 0x9B, 0x99, 0x18, 0x28, 0x3B, 0xD1,
|
||||
0xE3, 0x40, 0x28, 0x9A, 0x5A, 0x3C, 0xD5, 0xB5, 0xE7, 0x20, 0x1B, 0x8B,
|
||||
0xCA, 0xA4, 0xAB, 0x8D, 0xE9, 0x51, 0xD9, 0xE2, 0x4C, 0x2C, 0x59, 0xA9,
|
||||
0xDA, 0xB9, 0xB2, 0x75, 0x1B, 0xF6, 0x42, 0xF2, 0xEF, 0xC7, 0xF2, 0x18,
|
||||
0xF9, 0x89, 0xBC, 0xA3, 0xFF, 0x8A, 0x23, 0x2E, 0x70, 0x47, 0x30, 0x82,
|
||||
0x03, 0x13, 0x30, 0x82, 0x02, 0x7C, 0xA0, 0x03, 0x02, 0x01, 0x02, 0x02,
|
||||
0x03, 0x09, 0xCE, 0x15, 0x30, 0x0D, 0x06, 0x09, 0x2A, 0x86, 0x48, 0x86,
|
||||
0xF7, 0x0D, 0x01, 0x01, 0x04, 0x05, 0x00, 0x30, 0x81, 0xC4, 0x31, 0x0B,
|
||||
0x30, 0x09, 0x06, 0x03, 0x55, 0x04, 0x06, 0x13, 0x02, 0x5A, 0x41, 0x31,
|
||||
0x15, 0x30, 0x13, 0x06, 0x03, 0x55, 0x04, 0x08, 0x13, 0x0C, 0x57, 0x65,
|
||||
0x73, 0x74, 0x65, 0x72, 0x6E, 0x20, 0x43, 0x61, 0x70, 0x65, 0x31, 0x12,
|
||||
0x30, 0x10, 0x06, 0x03, 0x55, 0x04, 0x07, 0x13, 0x09, 0x43, 0x61, 0x70,
|
||||
0x65, 0x20, 0x54, 0x6F, 0x77, 0x6E, 0x31, 0x1D, 0x30, 0x1B, 0x06, 0x03,
|
||||
0x55, 0x04, 0x0A, 0x13, 0x14, 0x54, 0x68, 0x61, 0x77, 0x74, 0x65, 0x20,
|
||||
0x43, 0x6F, 0x6E, 0x73, 0x75, 0x6C, 0x74, 0x69, 0x6E, 0x67, 0x20, 0x63,
|
||||
0x63, 0x31, 0x28, 0x30, 0x26, 0x06, 0x03, 0x55, 0x04, 0x0B, 0x13, 0x1F,
|
||||
0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6F,
|
||||
0x6E, 0x20, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x20, 0x44,
|
||||
0x69, 0x76, 0x69, 0x73, 0x69, 0x6F, 0x6E, 0x31, 0x19, 0x30, 0x17, 0x06,
|
||||
0x03, 0x55, 0x04, 0x03, 0x13, 0x10, 0x54, 0x68, 0x61, 0x77, 0x74, 0x65,
|
||||
0x20, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x20, 0x43, 0x41, 0x31, 0x26,
|
||||
0x30, 0x24, 0x06, 0x09, 0x2A, 0x86, 0x48, 0x86, 0xF7, 0x0D, 0x01, 0x09,
|
||||
0x01, 0x16, 0x17, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2D, 0x63, 0x65,
|
||||
0x72, 0x74, 0x73, 0x40, 0x74, 0x68, 0x61, 0x77, 0x74, 0x65, 0x2E, 0x63,
|
||||
0x6F, 0x6D, 0x30, 0x1E, 0x17, 0x0D, 0x30, 0x33, 0x30, 0x31, 0x31, 0x35,
|
||||
0x30, 0x36, 0x33, 0x35, 0x32, 0x37, 0x5A, 0x17, 0x0D, 0x30, 0x34, 0x30,
|
||||
0x32, 0x30, 0x38, 0x30, 0x39, 0x35, 0x30, 0x35, 0x32, 0x5A, 0x30, 0x81,
|
||||
0x9C, 0x31, 0x0B, 0x30, 0x09, 0x06, 0x03, 0x55, 0x04, 0x06, 0x13, 0x02,
|
||||
0x43, 0x41, 0x31, 0x0F, 0x30, 0x0D, 0x06, 0x03, 0x55, 0x04, 0x08, 0x13,
|
||||
0x06, 0x51, 0x75, 0x65, 0x62, 0x65, 0x63, 0x31, 0x0F, 0x30, 0x0D, 0x06,
|
||||
0x03, 0x55, 0x04, 0x07, 0x13, 0x06, 0x51, 0x75, 0x65, 0x62, 0x65, 0x63,
|
||||
0x31, 0x20, 0x30, 0x1E, 0x06, 0x03, 0x55, 0x04, 0x0A, 0x13, 0x17, 0x4D,
|
||||
0x6F, 0x74, 0x75, 0x73, 0x20, 0x54, 0x65, 0x63, 0x68, 0x6E, 0x6F, 0x6C,
|
||||
0x6F, 0x67, 0x69, 0x65, 0x73, 0x20, 0x49, 0x6E, 0x63, 0x2E, 0x31, 0x27,
|
||||
0x30, 0x25, 0x06, 0x03, 0x55, 0x04, 0x0B, 0x13, 0x1E, 0x53, 0x65, 0x63,
|
||||
0x75, 0x72, 0x65, 0x20, 0x41, 0x70, 0x70, 0x6C, 0x69, 0x63, 0x61, 0x74,
|
||||
0x69, 0x6F, 0x6E, 0x20, 0x44, 0x65, 0x76, 0x65, 0x6C, 0x6F, 0x70, 0x6D,
|
||||
0x65, 0x6E, 0x74, 0x31, 0x20, 0x30, 0x1E, 0x06, 0x03, 0x55, 0x04, 0x03,
|
||||
0x13, 0x17, 0x4D, 0x6F, 0x74, 0x75, 0x73, 0x20, 0x54, 0x65, 0x63, 0x68,
|
||||
0x6E, 0x6F, 0x6C, 0x6F, 0x67, 0x69, 0x65, 0x73, 0x20, 0x49, 0x6E, 0x63,
|
||||
0x2E, 0x30, 0x5C, 0x30, 0x0D, 0x06, 0x09, 0x2A, 0x86, 0x48, 0x86, 0xF7,
|
||||
0x0D, 0x01, 0x01, 0x01, 0x05, 0x00, 0x03, 0x4B, 0x00, 0x30, 0x48, 0x02,
|
||||
0x41, 0x00, 0xC5, 0x46, 0xCD, 0xDA, 0xE2, 0x72, 0xC5, 0x63, 0x5B, 0xE5,
|
||||
0xAC, 0x2A, 0x3A, 0x61, 0xFA, 0x63, 0x1F, 0xC3, 0xC9, 0x32, 0x82, 0x9D,
|
||||
0xBD, 0x83, 0x56, 0x50, 0x07, 0x66, 0x45, 0xB4, 0x6C, 0xFF, 0x4A, 0x68,
|
||||
0x37, 0xB4, 0x6B, 0xA3, 0x92, 0x1E, 0xA8, 0x35, 0xC7, 0x06, 0xCB, 0xE1,
|
||||
0x39, 0x22, 0xB5, 0x0E, 0xA1, 0x7B, 0x7B, 0x33, 0x16, 0x6F, 0xA7, 0x14,
|
||||
0xE5, 0x51, 0x1A, 0x7D, 0x41, 0xB5, 0x02, 0x03, 0x01, 0x00, 0x01, 0xA3,
|
||||
0x7D, 0x30, 0x7B, 0x30, 0x1F, 0x06, 0x03, 0x55, 0x1D, 0x25, 0x04, 0x18,
|
||||
0x30, 0x16, 0x06, 0x08, 0x2B, 0x06, 0x01, 0x05, 0x05, 0x07, 0x03, 0x03,
|
||||
0x06, 0x0A, 0x2B, 0x06, 0x01, 0x04, 0x01, 0x82, 0x37, 0x02, 0x01, 0x16,
|
||||
0x30, 0x11, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x86, 0xF8, 0x42, 0x01,
|
||||
0x01, 0x04, 0x04, 0x03, 0x02, 0x04, 0x10, 0x30, 0x1D, 0x06, 0x03, 0x55,
|
||||
0x1D, 0x04, 0x04, 0x16, 0x30, 0x14, 0x30, 0x0E, 0x30, 0x0C, 0x06, 0x0A,
|
||||
0x2B, 0x06, 0x01, 0x04, 0x01, 0x82, 0x37, 0x02, 0x01, 0x16, 0x03, 0x02,
|
||||
0x07, 0x80, 0x30, 0x18, 0x06, 0x03, 0x55, 0x1D, 0x11, 0x04, 0x11, 0x30,
|
||||
0x0F, 0x82, 0x0D, 0x77, 0x77, 0x77, 0x2E, 0x6D, 0x6F, 0x74, 0x75, 0x73,
|
||||
0x2E, 0x63, 0x6F, 0x6D, 0x30, 0x0C, 0x06, 0x03, 0x55, 0x1D, 0x13, 0x01,
|
||||
0x01, 0xFF, 0x04, 0x02, 0x30, 0x00, 0x30, 0x0D, 0x06, 0x09, 0x2A, 0x86,
|
||||
0x48, 0x86, 0xF7, 0x0D, 0x01, 0x01, 0x04, 0x05, 0x00, 0x03, 0x81, 0x81,
|
||||
0x00, 0x6D, 0xD6, 0x83, 0xDA, 0x39, 0xA2, 0xD8, 0x81, 0x12, 0x8D, 0xA5,
|
||||
0x3E, 0xE5, 0xB7, 0xBE, 0x17, 0x42, 0x34, 0x6C, 0x34, 0xF7, 0x92, 0x89,
|
||||
0x28, 0xD0, 0xE7, 0xF2, 0xAA, 0x91, 0xAA, 0x76, 0x40, 0xE2, 0x0B, 0xC3,
|
||||
0x5A, 0x61, 0x3F, 0x00, 0x21, 0x68, 0x8E, 0xB3, 0x20, 0xCD, 0x42, 0x47,
|
||||
0x6B, 0x14, 0xB2, 0x60, 0x36, 0x28, 0xC9, 0xC6, 0x97, 0xB5, 0xC3, 0x9F,
|
||||
0x23, 0xED, 0xF6, 0x9B, 0xC9, 0x80, 0x07, 0x10, 0x0F, 0xA2, 0x54, 0x63,
|
||||
0x5E, 0x13, 0x21, 0xBC, 0xD1, 0xAB, 0xEE, 0x96, 0xB7, 0xF8, 0x4D, 0x39,
|
||||
0x8B, 0xB6, 0xDC, 0x49, 0x60, 0x3B, 0xAB, 0x7B, 0x4A, 0x38, 0x77, 0x7A,
|
||||
0x2F, 0x34, 0x26, 0xF6, 0xE7, 0x6D, 0x9A, 0x27, 0x4E, 0xF6, 0x69, 0x13,
|
||||
0xB2, 0x84, 0xEB, 0x23, 0xC3, 0x7A, 0x8C, 0x6B, 0xA2, 0xF6, 0x04, 0xDD,
|
||||
0x45, 0xF3, 0xC5, 0x76, 0x5C, 0x35, 0xF6, 0x2A, 0x3E, 0x30, 0x82, 0x04,
|
||||
0x02, 0x30, 0x82, 0x03, 0x6B, 0xA0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x10,
|
||||
0x08, 0x7A, 0x6D, 0x5C, 0x6F, 0x62, 0x93, 0x4F, 0xBA, 0xC4, 0xFD, 0x43,
|
||||
0xE1, 0x14, 0x18, 0x9D, 0x30, 0x0D, 0x06, 0x09, 0x2A, 0x86, 0x48, 0x86,
|
||||
0xF7, 0x0D, 0x01, 0x01, 0x04, 0x05, 0x00, 0x30, 0x81, 0x9E, 0x31, 0x1F,
|
||||
0x30, 0x1D, 0x06, 0x03, 0x55, 0x04, 0x0A, 0x13, 0x16, 0x56, 0x65, 0x72,
|
||||
0x69, 0x53, 0x69, 0x67, 0x6E, 0x20, 0x54, 0x72, 0x75, 0x73, 0x74, 0x20,
|
||||
0x4E, 0x65, 0x74, 0x77, 0x6F, 0x72, 0x6B, 0x31, 0x17, 0x30, 0x15, 0x06,
|
||||
0x03, 0x55, 0x04, 0x0B, 0x13, 0x0E, 0x56, 0x65, 0x72, 0x69, 0x53, 0x69,
|
||||
0x67, 0x6E, 0x2C, 0x20, 0x49, 0x6E, 0x63, 0x2E, 0x31, 0x2C, 0x30, 0x2A,
|
||||
0x06, 0x03, 0x55, 0x04, 0x0B, 0x13, 0x23, 0x56, 0x65, 0x72, 0x69, 0x53,
|
||||
0x69, 0x67, 0x6E, 0x20, 0x54, 0x69, 0x6D, 0x65, 0x20, 0x53, 0x74, 0x61,
|
||||
0x6D, 0x70, 0x69, 0x6E, 0x67, 0x20, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63,
|
||||
0x65, 0x20, 0x52, 0x6F, 0x6F, 0x74, 0x31, 0x34, 0x30, 0x32, 0x06, 0x03,
|
||||
0x55, 0x04, 0x0B, 0x13, 0x2B, 0x4E, 0x4F, 0x20, 0x4C, 0x49, 0x41, 0x42,
|
||||
0x49, 0x4C, 0x49, 0x54, 0x59, 0x20, 0x41, 0x43, 0x43, 0x45, 0x50, 0x54,
|
||||
0x45, 0x44, 0x2C, 0x20, 0x28, 0x63, 0x29, 0x39, 0x37, 0x20, 0x56, 0x65,
|
||||
0x72, 0x69, 0x53, 0x69, 0x67, 0x6E, 0x2C, 0x20, 0x49, 0x6E, 0x63, 0x2E,
|
||||
0x30, 0x1E, 0x17, 0x0D, 0x30, 0x31, 0x30, 0x32, 0x32, 0x38, 0x30, 0x30,
|
||||
0x30, 0x30, 0x30, 0x30, 0x5A, 0x17, 0x0D, 0x30, 0x34, 0x30, 0x31, 0x30,
|
||||
0x36, 0x32, 0x33, 0x35, 0x39, 0x35, 0x39, 0x5A, 0x30, 0x81, 0xA0, 0x31,
|
||||
0x17, 0x30, 0x15, 0x06, 0x03, 0x55, 0x04, 0x0A, 0x13, 0x0E, 0x56, 0x65,
|
||||
0x72, 0x69, 0x53, 0x69, 0x67, 0x6E, 0x2C, 0x20, 0x49, 0x6E, 0x63, 0x2E,
|
||||
0x31, 0x1F, 0x30, 0x1D, 0x06, 0x03, 0x55, 0x04, 0x0B, 0x13, 0x16, 0x56,
|
||||
0x65, 0x72, 0x69, 0x53, 0x69, 0x67, 0x6E, 0x20, 0x54, 0x72, 0x75, 0x73,
|
||||
0x74, 0x20, 0x4E, 0x65, 0x74, 0x77, 0x6F, 0x72, 0x6B, 0x31, 0x3B, 0x30,
|
||||
0x39, 0x06, 0x03, 0x55, 0x04, 0x0B, 0x13, 0x32, 0x54, 0x65, 0x72, 0x6D,
|
||||
0x73, 0x20, 0x6F, 0x66, 0x20, 0x75, 0x73, 0x65, 0x20, 0x61, 0x74, 0x20,
|
||||
0x68, 0x74, 0x74, 0x70, 0x73, 0x3A, 0x2F, 0x2F, 0x77, 0x77, 0x77, 0x2E,
|
||||
0x76, 0x65, 0x72, 0x69, 0x73, 0x69, 0x67, 0x6E, 0x2E, 0x63, 0x6F, 0x6D,
|
||||
0x2F, 0x72, 0x70, 0x61, 0x20, 0x28, 0x63, 0x29, 0x30, 0x31, 0x31, 0x27,
|
||||
0x30, 0x25, 0x06, 0x03, 0x55, 0x04, 0x03, 0x13, 0x1E, 0x56, 0x65, 0x72,
|
||||
0x69, 0x53, 0x69, 0x67, 0x6E, 0x20, 0x54, 0x69, 0x6D, 0x65, 0x20, 0x53,
|
||||
0x74, 0x61, 0x6D, 0x70, 0x69, 0x6E, 0x67, 0x20, 0x53, 0x65, 0x72, 0x76,
|
||||
0x69, 0x63, 0x65, 0x30, 0x82, 0x01, 0x22, 0x30, 0x0D, 0x06, 0x09, 0x2A,
|
||||
0x86, 0x48, 0x86, 0xF7, 0x0D, 0x01, 0x01, 0x01, 0x05, 0x00, 0x03, 0x82,
|
||||
0x01, 0x0F, 0x00, 0x30, 0x82, 0x01, 0x0A, 0x02, 0x82, 0x01, 0x01, 0x00,
|
||||
0xC0, 0x7A, 0x61, 0x87, 0xEB, 0xB2, 0xA7, 0x03, 0x63, 0x1B, 0x2B, 0x1A,
|
||||
0x61, 0xDE, 0x80, 0xB7, 0x15, 0x1D, 0xA0, 0x8B, 0x90, 0x3D, 0xBB, 0x27,
|
||||
0x92, 0x84, 0x14, 0x39, 0xEB, 0x85, 0xCE, 0x29, 0x92, 0x06, 0x66, 0x48,
|
||||
0xA4, 0x03, 0x4F, 0x8D, 0xE8, 0x4F, 0xA7, 0xF0, 0xAF, 0x5E, 0xD1, 0x2F,
|
||||
0x19, 0xC7, 0x91, 0xF1, 0xB5, 0x9E, 0x7B, 0x91, 0x21, 0xCE, 0xE9, 0xFF,
|
||||
0xE3, 0x4E, 0xF0, 0xFC, 0xAF, 0x95, 0x58, 0xB8, 0x63, 0x2D, 0xE6, 0x8E,
|
||||
0xF6, 0x29, 0x18, 0xCD, 0x70, 0x8E, 0x50, 0xC3, 0xED, 0x96, 0xBB, 0x40,
|
||||
0xDB, 0xBE, 0x25, 0xE8, 0x42, 0x55, 0xD6, 0xF6, 0x85, 0xF2, 0x06, 0xE7,
|
||||
0x8B, 0x99, 0x1C, 0x31, 0xF3, 0x03, 0x0F, 0xD4, 0x4C, 0x9C, 0x24, 0x2A,
|
||||
0xDC, 0x1B, 0x1B, 0x8F, 0x82, 0xF3, 0xB0, 0xEF, 0xA7, 0x4D, 0xE3, 0x14,
|
||||
0xA7, 0xE0, 0x8F, 0xD6, 0xC7, 0x68, 0xC2, 0x61, 0x58, 0xA9, 0x72, 0xD4,
|
||||
0xF8, 0x30, 0x48, 0x4F, 0xD9, 0x2F, 0x6F, 0x63, 0x20, 0xD9, 0x89, 0xCA,
|
||||
0x82, 0x7B, 0xC2, 0x4B, 0xBC, 0x28, 0xC5, 0x81, 0x68, 0xE7, 0xE6, 0x82,
|
||||
0x40, 0xAC, 0x46, 0x3A, 0xA0, 0xF9, 0x3F, 0x36, 0xCD, 0x4C, 0xBB, 0x54,
|
||||
0x42, 0x5A, 0x7A, 0x65, 0x7B, 0xFE, 0x84, 0xE4, 0xC7, 0x47, 0x54, 0xAC,
|
||||
0xB9, 0x3D, 0xEC, 0x80, 0xC7, 0x1A, 0xF7, 0xC4, 0x33, 0x81, 0x81, 0xC9,
|
||||
0x2A, 0x95, 0xFB, 0x7F, 0x5E, 0x3A, 0x87, 0x90, 0x14, 0xDB, 0xCC, 0x2E,
|
||||
0x75, 0xF2, 0xEF, 0x6B, 0xE6, 0x3D, 0xA9, 0x60, 0xBE, 0x42, 0x01, 0xAA,
|
||||
0x4F, 0xAA, 0x5B, 0xA8, 0x3F, 0x22, 0x31, 0x9F, 0x12, 0x15, 0xF9, 0x73,
|
||||
0xA1, 0x1E, 0x82, 0x8B, 0x04, 0x2B, 0xEA, 0x46, 0x02, 0x4C, 0x6D, 0x8F,
|
||||
0x1F, 0x50, 0x2E, 0x95, 0x4B, 0x2A, 0x78, 0x06, 0x84, 0x74, 0x3D, 0x91,
|
||||
0x8F, 0x2C, 0x47, 0x31, 0x02, 0x03, 0x01, 0x00, 0x01, 0xA3, 0x81, 0xB8,
|
||||
0x30, 0x81, 0xB5, 0x30, 0x40, 0x06, 0x08, 0x2B, 0x06, 0x01, 0x05, 0x05,
|
||||
0x07, 0x01, 0x01, 0x04, 0x34, 0x30, 0x32, 0x30, 0x30, 0x06, 0x08, 0x2B,
|
||||
0x06, 0x01, 0x05, 0x05, 0x07, 0x30, 0x01, 0x86, 0x24, 0x68, 0x74, 0x74,
|
||||
0x70, 0x3A, 0x2F, 0x2F, 0x6F, 0x63, 0x73, 0x70, 0x2E, 0x76, 0x65, 0x72,
|
||||
0x69, 0x73, 0x69, 0x67, 0x6E, 0x2E, 0x63, 0x6F, 0x6D, 0x2F, 0x6F, 0x63,
|
||||
0x73, 0x70, 0x2F, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x30, 0x09, 0x06,
|
||||
0x03, 0x55, 0x1D, 0x13, 0x04, 0x02, 0x30, 0x00, 0x30, 0x44, 0x06, 0x03,
|
||||
0x55, 0x1D, 0x20, 0x04, 0x3D, 0x30, 0x3B, 0x30, 0x39, 0x06, 0x0B, 0x60,
|
||||
0x86, 0x48, 0x01, 0x86, 0xF8, 0x45, 0x01, 0x07, 0x01, 0x01, 0x30, 0x2A,
|
||||
0x30, 0x28, 0x06, 0x08, 0x2B, 0x06, 0x01, 0x05, 0x05, 0x07, 0x02, 0x01,
|
||||
0x16, 0x1C, 0x68, 0x74, 0x74, 0x70, 0x73, 0x3A, 0x2F, 0x2F, 0x77, 0x77,
|
||||
0x77, 0x2E, 0x76, 0x65, 0x72, 0x69, 0x73, 0x69, 0x67, 0x6E, 0x2E, 0x63,
|
||||
0x6F, 0x6D, 0x2F, 0x72, 0x70, 0x61, 0x30, 0x13, 0x06, 0x03, 0x55, 0x1D,
|
||||
0x25, 0x04, 0x0C, 0x30, 0x0A, 0x06, 0x08, 0x2B, 0x06, 0x01, 0x05, 0x05,
|
||||
0x07, 0x03, 0x08, 0x30, 0x0B, 0x06, 0x03, 0x55, 0x1D, 0x0F, 0x04, 0x04,
|
||||
0x03, 0x02, 0x06, 0xC0, 0x30, 0x0D, 0x06, 0x09, 0x2A, 0x86, 0x48, 0x86,
|
||||
0xF7, 0x0D, 0x01, 0x01, 0x04, 0x05, 0x00, 0x03, 0x81, 0x81, 0x00, 0x2D,
|
||||
0xF3, 0x4F, 0x63, 0x60, 0x2C, 0x18, 0xDA, 0xF5, 0x24, 0x0F, 0x52, 0xB3,
|
||||
0x0C, 0xEB, 0xB3, 0xBC, 0x67, 0x85, 0xC2, 0x23, 0xED, 0x8F, 0x46, 0x0D,
|
||||
0xCF, 0x1A, 0x4D, 0xBE, 0xF3, 0x7C, 0x7A, 0x20, 0x30, 0x32, 0x18, 0x68,
|
||||
0x8B, 0x92, 0xBB, 0x32, 0x99, 0xF0, 0x93, 0xB8, 0x3B, 0x15, 0x06, 0x27,
|
||||
0x7B, 0x3E, 0x02, 0x06, 0x00, 0xA4, 0x21, 0x92, 0x84, 0x13, 0x0A, 0xC5,
|
||||
0x98, 0xE5, 0x40, 0x57, 0xC5, 0x05, 0x25, 0xE8, 0xAF, 0xAF, 0x11, 0x6A,
|
||||
0xA9, 0xE5, 0x3B, 0xCB, 0xE9, 0x23, 0xF6, 0x94, 0x29, 0x5D, 0x40, 0x55,
|
||||
0xF3, 0xA5, 0x53, 0x9D, 0xC8, 0x36, 0x3A, 0x39, 0x65, 0x08, 0x73, 0x73,
|
||||
0xA4, 0x32, 0xD2, 0xAF, 0xAC, 0xBF, 0xC7, 0x05, 0x3C, 0xFF, 0x45, 0xEC,
|
||||
0xC3, 0xE8, 0xDA, 0x24, 0xD1, 0xCE, 0x63, 0xAE, 0x09, 0xA7, 0xFB, 0xE2,
|
||||
0x1B, 0xE3, 0xFD, 0x41, 0x0A, 0x6A, 0x96, 0x31, 0x82, 0x04, 0x0C, 0x30,
|
||||
0x82, 0x04, 0x08, 0x02, 0x01, 0x01, 0x30, 0x81, 0xCC, 0x30, 0x81, 0xC4,
|
||||
0x31, 0x0B, 0x30, 0x09, 0x06, 0x03, 0x55, 0x04, 0x06, 0x13, 0x02, 0x5A,
|
||||
0x41, 0x31, 0x15, 0x30, 0x13, 0x06, 0x03, 0x55, 0x04, 0x08, 0x13, 0x0C,
|
||||
0x57, 0x65, 0x73, 0x74, 0x65, 0x72, 0x6E, 0x20, 0x43, 0x61, 0x70, 0x65,
|
||||
0x31, 0x12, 0x30, 0x10, 0x06, 0x03, 0x55, 0x04, 0x07, 0x13, 0x09, 0x43,
|
||||
0x61, 0x70, 0x65, 0x20, 0x54, 0x6F, 0x77, 0x6E, 0x31, 0x1D, 0x30, 0x1B,
|
||||
0x06, 0x03, 0x55, 0x04, 0x0A, 0x13, 0x14, 0x54, 0x68, 0x61, 0x77, 0x74,
|
||||
0x65, 0x20, 0x43, 0x6F, 0x6E, 0x73, 0x75, 0x6C, 0x74, 0x69, 0x6E, 0x67,
|
||||
0x20, 0x63, 0x63, 0x31, 0x28, 0x30, 0x26, 0x06, 0x03, 0x55, 0x04, 0x0B,
|
||||
0x13, 0x1F, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74,
|
||||
0x69, 0x6F, 0x6E, 0x20, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73,
|
||||
0x20, 0x44, 0x69, 0x76, 0x69, 0x73, 0x69, 0x6F, 0x6E, 0x31, 0x19, 0x30,
|
||||
0x17, 0x06, 0x03, 0x55, 0x04, 0x03, 0x13, 0x10, 0x54, 0x68, 0x61, 0x77,
|
||||
0x74, 0x65, 0x20, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x20, 0x43, 0x41,
|
||||
0x31, 0x26, 0x30, 0x24, 0x06, 0x09, 0x2A, 0x86, 0x48, 0x86, 0xF7, 0x0D,
|
||||
0x01, 0x09, 0x01, 0x16, 0x17, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2D,
|
||||
0x63, 0x65, 0x72, 0x74, 0x73, 0x40, 0x74, 0x68, 0x61, 0x77, 0x74, 0x65,
|
||||
0x2E, 0x63, 0x6F, 0x6D, 0x02, 0x03, 0x09, 0xCE, 0x15, 0x30, 0x0C, 0x06,
|
||||
0x08, 0x2A, 0x86, 0x48, 0x86, 0xF7, 0x0D, 0x02, 0x05, 0x05, 0x00, 0xA0,
|
||||
0x81, 0x84, 0x30, 0x19, 0x06, 0x09, 0x2A, 0x86, 0x48, 0x86, 0xF7, 0x0D,
|
||||
0x01, 0x09, 0x03, 0x31, 0x0C, 0x06, 0x0A, 0x2B, 0x06, 0x01, 0x04, 0x01,
|
||||
0x82, 0x37, 0x02, 0x01, 0x04, 0x30, 0x1C, 0x06, 0x0A, 0x2B, 0x06, 0x01,
|
||||
0x04, 0x01, 0x82, 0x37, 0x02, 0x01, 0x0B, 0x31, 0x0E, 0x30, 0x0C, 0x06,
|
||||
0x0A, 0x2B, 0x06, 0x01, 0x04, 0x01, 0x82, 0x37, 0x02, 0x01, 0x16, 0x30,
|
||||
0x1F, 0x06, 0x09, 0x2A, 0x86, 0x48, 0x86, 0xF7, 0x0D, 0x01, 0x09, 0x04,
|
||||
0x31, 0x12, 0x04, 0x10, 0x62, 0x0B, 0x26, 0x7E, 0x35, 0x1A, 0xB1, 0xE5,
|
||||
0x5E, 0xF4, 0x4F, 0x14, 0xD0, 0xC0, 0xD1, 0x90, 0x30, 0x28, 0x06, 0x0A,
|
||||
0x2B, 0x06, 0x01, 0x04, 0x01, 0x82, 0x37, 0x02, 0x01, 0x0C, 0x31, 0x1A,
|
||||
0x30, 0x18, 0xA1, 0x16, 0x80, 0x14, 0x68, 0x74, 0x74, 0x70, 0x3A, 0x2F,
|
||||
0x2F, 0x77, 0x77, 0x77, 0x2E, 0x6D, 0x6F, 0x74, 0x75, 0x73, 0x2E, 0x63,
|
||||
0x6F, 0x6D, 0x30, 0x0D, 0x06, 0x09, 0x2A, 0x86, 0x48, 0x86, 0xF7, 0x0D,
|
||||
0x01, 0x01, 0x01, 0x05, 0x00, 0x04, 0x40, 0x0D, 0xBA, 0xBB, 0xB0, 0x63,
|
||||
0x33, 0x6A, 0x03, 0x20, 0xA0, 0xD4, 0xC0, 0xBD, 0xDA, 0xAB, 0xE3, 0x73,
|
||||
0xCA, 0x92, 0xB6, 0xE5, 0x75, 0x73, 0x0C, 0xD2, 0x4F, 0xB1, 0x8D, 0x96,
|
||||
0x89, 0xD8, 0x01, 0x8B, 0x9C, 0x1E, 0x9D, 0x5A, 0xF1, 0xEE, 0x05, 0x9A,
|
||||
0x59, 0xB9, 0x5A, 0xC0, 0xEC, 0x1C, 0x2B, 0x17, 0x1B, 0x8B, 0x10, 0xC7,
|
||||
0xC1, 0xF6, 0xE2, 0xF9, 0x3E, 0xCC, 0xC9, 0x3A, 0x19, 0x17, 0x51, 0xA1,
|
||||
0x82, 0x02, 0x4C, 0x30, 0x82, 0x02, 0x48, 0x06, 0x09, 0x2A, 0x86, 0x48,
|
||||
0x86, 0xF7, 0x0D, 0x01, 0x09, 0x06, 0x31, 0x82, 0x02, 0x39, 0x30, 0x82,
|
||||
0x02, 0x35, 0x02, 0x01, 0x01, 0x30, 0x81, 0xB3, 0x30, 0x81, 0x9E, 0x31,
|
||||
0x1F, 0x30, 0x1D, 0x06, 0x03, 0x55, 0x04, 0x0A, 0x13, 0x16, 0x56, 0x65,
|
||||
0x72, 0x69, 0x53, 0x69, 0x67, 0x6E, 0x20, 0x54, 0x72, 0x75, 0x73, 0x74,
|
||||
0x20, 0x4E, 0x65, 0x74, 0x77, 0x6F, 0x72, 0x6B, 0x31, 0x17, 0x30, 0x15,
|
||||
0x06, 0x03, 0x55, 0x04, 0x0B, 0x13, 0x0E, 0x56, 0x65, 0x72, 0x69, 0x53,
|
||||
0x69, 0x67, 0x6E, 0x2C, 0x20, 0x49, 0x6E, 0x63, 0x2E, 0x31, 0x2C, 0x30,
|
||||
0x2A, 0x06, 0x03, 0x55, 0x04, 0x0B, 0x13, 0x23, 0x56, 0x65, 0x72, 0x69,
|
||||
0x53, 0x69, 0x67, 0x6E, 0x20, 0x54, 0x69, 0x6D, 0x65, 0x20, 0x53, 0x74,
|
||||
0x61, 0x6D, 0x70, 0x69, 0x6E, 0x67, 0x20, 0x53, 0x65, 0x72, 0x76, 0x69,
|
||||
0x63, 0x65, 0x20, 0x52, 0x6F, 0x6F, 0x74, 0x31, 0x34, 0x30, 0x32, 0x06,
|
||||
0x03, 0x55, 0x04, 0x0B, 0x13, 0x2B, 0x4E, 0x4F, 0x20, 0x4C, 0x49, 0x41,
|
||||
0x42, 0x49, 0x4C, 0x49, 0x54, 0x59, 0x20, 0x41, 0x43, 0x43, 0x45, 0x50,
|
||||
0x54, 0x45, 0x44, 0x2C, 0x20, 0x28, 0x63, 0x29, 0x39, 0x37, 0x20, 0x56,
|
||||
0x65, 0x72, 0x69, 0x53, 0x69, 0x67, 0x6E, 0x2C, 0x20, 0x49, 0x6E, 0x63,
|
||||
0x2E, 0x02, 0x10, 0x08, 0x7A, 0x6D, 0x5C, 0x6F, 0x62, 0x93, 0x4F, 0xBA,
|
||||
0xC4, 0xFD, 0x43, 0xE1, 0x14, 0x18, 0x9D, 0x30, 0x0C, 0x06, 0x08, 0x2A,
|
||||
0x86, 0x48, 0x86, 0xF7, 0x0D, 0x02, 0x05, 0x05, 0x00, 0xA0, 0x59, 0x30,
|
||||
0x18, 0x06, 0x09, 0x2A, 0x86, 0x48, 0x86, 0xF7, 0x0D, 0x01, 0x09, 0x03,
|
||||
0x31, 0x0B, 0x06, 0x09, 0x2A, 0x86, 0x48, 0x86, 0xF7, 0x0D, 0x01, 0x07,
|
||||
0x01, 0x30, 0x1C, 0x06, 0x09, 0x2A, 0x86, 0x48, 0x86, 0xF7, 0x0D, 0x01,
|
||||
0x09, 0x05, 0x31, 0x0F, 0x17, 0x0D, 0x30, 0x33, 0x31, 0x30, 0x30, 0x37,
|
||||
0x31, 0x35, 0x32, 0x34, 0x33, 0x30, 0x5A, 0x30, 0x1F, 0x06, 0x09, 0x2A,
|
||||
0x86, 0x48, 0x86, 0xF7, 0x0D, 0x01, 0x09, 0x04, 0x31, 0x12, 0x04, 0x10,
|
||||
0x11, 0x7B, 0x03, 0x6B, 0xAB, 0xC2, 0x07, 0x41, 0x02, 0x76, 0x9F, 0x71,
|
||||
0xBE, 0xA3, 0xD1, 0x03, 0x30, 0x0D, 0x06, 0x09, 0x2A, 0x86, 0x48, 0x86,
|
||||
0xF7, 0x0D, 0x01, 0x01, 0x01, 0x05, 0x00, 0x04, 0x82, 0x01, 0x00, 0x58,
|
||||
0xD1, 0xF6, 0x51, 0xF0, 0x1C, 0xDB, 0x38, 0x15, 0x55, 0x6C, 0x09, 0x4A,
|
||||
0xDC, 0x14, 0x7E, 0x02, 0x7A, 0x6D, 0x8C, 0x2E, 0xB1, 0xA0, 0xDB, 0x5A,
|
||||
0x55, 0x4F, 0xFB, 0xD4, 0x4D, 0x73, 0xEB, 0xDF, 0xD5, 0xAC, 0x62, 0x80,
|
||||
0xE9, 0x4C, 0x58, 0x67, 0xD2, 0xAC, 0x6E, 0x5A, 0x71, 0x9E, 0x1F, 0xED,
|
||||
0xB0, 0x08, 0x74, 0xF7, 0xC1, 0x7B, 0xC1, 0x53, 0xD2, 0x7E, 0x41, 0x7C,
|
||||
0xF3, 0x35, 0xBF, 0x83, 0xF8, 0x30, 0xAC, 0x67, 0xC7, 0xA1, 0x34, 0xC4,
|
||||
0xB4, 0xD4, 0xB0, 0x6F, 0x36, 0x5A, 0xC3, 0xA9, 0x3E, 0x76, 0x1B, 0xB2,
|
||||
0x68, 0x99, 0x85, 0x48, 0xA5, 0x84, 0x79, 0xE2, 0x8F, 0x10, 0xE9, 0x06,
|
||||
0x20, 0xC4, 0x7A, 0x7F, 0x8A, 0x0F, 0x0A, 0x95, 0x0F, 0xD9, 0xE9, 0x02,
|
||||
0xA5, 0x6B, 0x58, 0x30, 0x75, 0x15, 0xEF, 0x31, 0xAB, 0x2A, 0x2E, 0xC1,
|
||||
0x1F, 0xB3, 0xCF, 0xD8, 0x2A, 0x60, 0xB3, 0x1E, 0x1F, 0x2E, 0x76, 0xC8,
|
||||
0x7A, 0x6B, 0x2D, 0xD6, 0x3B, 0xC8, 0xE2, 0x78, 0xB7, 0x83, 0x20, 0xA8,
|
||||
0x2C, 0x66, 0xFF, 0x30, 0xE4, 0x37, 0xEB, 0xBB, 0x03, 0x06, 0xAD, 0x31,
|
||||
0xFD, 0x18, 0x9E, 0x97, 0xD1, 0x5E, 0xB4, 0x4A, 0x5D, 0x03, 0xDA, 0x89,
|
||||
0xDB, 0xF1, 0x0B, 0xDA, 0x45, 0x14, 0x82, 0x01, 0xC0, 0x2E, 0x5B, 0x69,
|
||||
0xCF, 0xD4, 0xAB, 0xD4, 0xB2, 0x8E, 0x96, 0xBA, 0x3B, 0x58, 0x04, 0xE7,
|
||||
0x4C, 0xD9, 0x12, 0x91, 0x2B, 0x87, 0xFD, 0x0B, 0x63, 0xF1, 0x55, 0x12,
|
||||
0x3A, 0xCE, 0xF1, 0x78, 0x23, 0x4D, 0x61, 0x51, 0x90, 0x16, 0x12, 0x12,
|
||||
0xAA, 0xFF, 0xBE, 0x82, 0x0E, 0xC9, 0x81, 0x75, 0xBA, 0x20, 0x16, 0x18,
|
||||
0x12, 0xE2, 0xAC, 0x97, 0x88, 0xCB, 0xCA, 0x4C, 0x4E, 0x82, 0x09, 0x31,
|
||||
0xED, 0x42, 0xB3, 0xD8, 0xCF, 0x55, 0x10, 0x2A, 0xA3, 0x12, 0x5A, 0x3C,
|
||||
0x0A, 0xB2, 0x59, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
};
|
||||
|
||||
private string WriteFile ()
|
||||
{
|
||||
string filename = "helloworld_signed.exe";
|
||||
try {
|
||||
if (File.Exists (filename)) {
|
||||
File.Delete (filename);
|
||||
}
|
||||
using (FileStream fs = File.OpenWrite (filename)) {
|
||||
fs.Write (helloworld_signed, 0, helloworld_signed.Length);
|
||||
filename = Path.GetFullPath (fs.Name);
|
||||
fs.Close ();
|
||||
}
|
||||
}
|
||||
catch {}
|
||||
return filename;
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void VerifySignedAssembly ()
|
||||
{
|
||||
string filename = WriteFile ();
|
||||
AuthenticodeDeformatter ad = new AuthenticodeDeformatter (filename);
|
||||
// note: it's a valid signed PE file - but it doesn't
|
||||
// mean it's root is trusted on the current system
|
||||
Assert.IsTrue (((ad.Reason == 0) || (ad.Reason == 6)), "Reason");
|
||||
Assert.AreEqual ("35-A5-21-3B-FC-FE-FA-40-97-AA-BB-DE-3B-52-15-6F", BitConverter.ToString (ad.Hash), "Hash");
|
||||
Assert.AreEqual (632011226700000000, ad.Timestamp.Ticks, "Timestamp");
|
||||
Assert.AreEqual (4, ad.Certificates.Count, "#Certificates");
|
||||
Assert.AreEqual ("C=ZA, S=Western Cape, L=Cape Town, O=Thawte Consulting cc, OU=Certification Services Division, CN=Thawte Server CA, [email protected]", ad.SigningCertificate.IssuerName, "IssuerName");
|
||||
Assert.AreEqual ("C=CA, S=Quebec, L=Quebec, O=Motus Technologies Inc., OU=Secure Application Development, CN=Motus Technologies Inc.", ad.SigningCertificate.SubjectName, "SubjectName");
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void VerifyUnsignedAssembly ()
|
||||
{
|
||||
string filename = Assembly.GetExecutingAssembly ().Location;
|
||||
AuthenticodeDeformatter ad = new AuthenticodeDeformatter (filename);
|
||||
// no digital signature
|
||||
Assert.AreEqual (1, ad.Reason, "Reason");
|
||||
Assert.IsNull (ad.Hash, "Hash");
|
||||
Assert.AreEqual (DateTime.MinValue, ad.Timestamp, "Timestamp");
|
||||
Assert.IsNull (ad.Certificates, "Certificates");
|
||||
Assert.IsNull (ad.SigningCertificate, "SigningCertificate");
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,7 +1,3 @@
|
||||
2004-09-07 Sebastien Pouliot <[email protected]>
|
||||
|
||||
* AuthenticodeDeformatterTest.cs: Merge new unit tests from HEAD.
|
||||
|
||||
2004-05-11 Sebastien Pouliot <[email protected]>
|
||||
|
||||
* PrivateKeyTest.cs: Added new unit tests for better coverage.
|
||||
|
||||
@@ -1,6 +1,3 @@
|
||||
2004-07-12 Umadevi S <[email protected]>
|
||||
* Tokenizer.cs - read an Int64 from the text instead of Int32. Resolves bug 61203
|
||||
|
||||
2004-06-17 Boris Kirzner <[email protected]>
|
||||
* Comparison.cs - use 'as' to avoid NullReferenceExeption in casting.
|
||||
|
||||
|
||||
@@ -122,7 +122,7 @@ namespace Mono.Data.SqlExpressions {
|
||||
string str = sb.ToString ();
|
||||
|
||||
if (str.IndexOf(".") == -1)
|
||||
return Int64.Parse (str);
|
||||
return int.Parse (str);
|
||||
else
|
||||
return double.Parse (str);
|
||||
}
|
||||
|
||||
@@ -1,11 +1,5 @@
|
||||
2004-07-21 Umadevi S <[email protected]>
|
||||
* DbDataRecord.cs - Fix for bug 58163. Return DBNull instead of null
|
||||
|
||||
2004-07-07 Umadevi S <[email protected]>
|
||||
* DataContainer.cs :CheckedforNull before calling the relavant setmethods in each of the
|
||||
SetItemForDataRecord method for the DateTimeClass
|
||||
|
||||
2004-06-24 Atsushi Enomoto <[email protected]>
|
||||
|
||||
* DataColumnMappingCollection.cs : fixed typo.
|
||||
* DbDataAdapter.cs : column mappings were not filled.
|
||||
|
||||
|
||||
@@ -1098,8 +1098,8 @@ namespace System.Data.Common
|
||||
{
|
||||
// if exception thrown, it should be caught
|
||||
// in the caller method
|
||||
if (!CheckAndSetNull(index,record,field))
|
||||
base.SetValue(index,record.GetDateTime(field));
|
||||
base.SetValue(index,record.GetDateTime(field));
|
||||
base.SetItemFromDataRecord(index,record,field);
|
||||
}
|
||||
|
||||
internal override int CompareValues(int index1, int index2)
|
||||
|
||||
@@ -340,7 +340,7 @@ namespace System.Data.Common {
|
||||
|
||||
public bool IsDBNull (int i)
|
||||
{
|
||||
return GetValue (i) == DBNull.Value;
|
||||
return GetValue (i) == null;
|
||||
}
|
||||
#if NET_2_0
|
||||
public virtual bool IsSetAsDefault (int i)
|
||||
|
||||
@@ -1,47 +1,3 @@
|
||||
2004-08-31 Umadevi S ([email protected])
|
||||
* OdbcDataReader.cs - Fixed Decimal parsing
|
||||
|
||||
|
||||
2004-08-30 Umadevi S ([email protected])
|
||||
* OdbcType.cs - removed inheritance from short.
|
||||
|
||||
2004-08-27 Sureshkumar T ([email protected])
|
||||
* OdbcDataReader.cs - fixed bug #63539 - TINYINT ODBC datatype is converted into System.Byte
|
||||
|
||||
2004-08-26 Sureshkumar T ([email protected])
|
||||
* OdbcDataReader.cs - Date & DateTime GetValue fixed.
|
||||
GetBytes ordinal parameter passing fixed for BINARY in GetValue.
|
||||
|
||||
2004-08-20 Sureshkumar T ([email protected])
|
||||
* OdbcConnection.cs - correct handles are passed to OdbcError exception to trap the correct error
|
||||
|
||||
2004-08-04 Umadevi S ([email protected])
|
||||
* OdbcDataReader.cs - Fixed bug 61832 - Column names were not filled, due to which name based lookup of columns failed.
|
||||
|
||||
2004-08-04 Umadevi S ([email protected])
|
||||
* OdbcDataReader.cs - Fixed bug 61405 - Handling smallint column type.
|
||||
|
||||
2004-07-30 Sureshkumar T ([email protected])
|
||||
* OdbcCommand.cs: ExecuteNonQuery Closed statement handle to fix memory leak
|
||||
* OdbcDataReader.cs: Closed statement handle to fix memory leak
|
||||
Removed SQLState login in GetBytes coz OdbcError provides the same.
|
||||
|
||||
2004-07-29 Umadevi S ([email protected])
|
||||
* OdbcCommand.cs - Fixed bug 62046. ExecuteNonQuery implemented correctly
|
||||
|
||||
2004-07-28 Umadevi S ([email protected])
|
||||
* OdbcParameter.cs - fixed bug 61968. String values passed with quotes
|
||||
|
||||
2004-07-07 Umadevi S ([email protected])
|
||||
* OdbcConnection.cs - Allowed Close to be called multiple times
|
||||
- Implementation of Dispose method
|
||||
|
||||
2004-07-07 Umadevi S ([email protected])
|
||||
* OdbcCommand.cs : fixed set method for Transaction
|
||||
|
||||
2004-07-01 Sureshkumar T ([email protected])
|
||||
* OdbcCommand.cs : fixed reader problem with ExecuteScalar
|
||||
|
||||
2004-06-23 Sureshkumar T ([email protected])
|
||||
* OdbcConnection.cs: Fix: Moved env allocation to Open method.
|
||||
Disconnection & freeing handles are done in Close
|
||||
|
||||
@@ -223,14 +223,7 @@ namespace System.Data.Odbc
|
||||
return (IDbTransaction) Transaction;
|
||||
}
|
||||
set {
|
||||
if (value is OdbcTransaction)
|
||||
{
|
||||
Transaction = (OdbcTransaction)value;
|
||||
}
|
||||
else
|
||||
{
|
||||
throw new ArgumentException ();
|
||||
}
|
||||
throw new NotImplementedException ();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -292,12 +285,6 @@ namespace System.Data.Odbc
|
||||
|
||||
public int ExecuteNonQuery ()
|
||||
{
|
||||
return ExecuteNonQuery (true);
|
||||
}
|
||||
|
||||
private int ExecuteNonQuery (bool freeHandle)
|
||||
{
|
||||
int records = 0;
|
||||
if (connection == null)
|
||||
throw new InvalidOperationException ();
|
||||
if (connection.State == ConnectionState.Closed)
|
||||
@@ -305,29 +292,12 @@ namespace System.Data.Odbc
|
||||
// FIXME: a third check is mentioned in .NET docs
|
||||
|
||||
ExecSQL(CommandText);
|
||||
|
||||
// .NET documentation says that except for INSERT, UPDATE and
|
||||
// DELETE where the return value is the number of rows affected
|
||||
// for the rest of the commands the return value is -1.
|
||||
if ((CommandText.ToUpper().IndexOf("UPDATE")!=-1) ||
|
||||
(CommandText.ToUpper().IndexOf("INSERT")!=-1) ||
|
||||
(CommandText.ToUpper().IndexOf("DELETE")!=-1)) {
|
||||
|
||||
int numrows = 0;
|
||||
OdbcReturn ret = libodbc.SQLRowCount(hstmt,ref numrows);
|
||||
records = numrows;
|
||||
}
|
||||
else
|
||||
records = -1;
|
||||
|
||||
if (freeHandle && !prepared) {
|
||||
OdbcReturn ret = libodbc.SQLFreeHandle( (ushort) OdbcHandleType.Stmt, hstmt);
|
||||
if ((ret!=OdbcReturn.Success) && (ret!=OdbcReturn.SuccessWithInfo))
|
||||
throw new OdbcException(new OdbcError("SQLFreeHandle",OdbcHandleType.Stmt,hstmt));
|
||||
}
|
||||
return records;
|
||||
}
|
||||
|
||||
// if (!prepared)
|
||||
// libodbc.SQLFreeHandle( (ushort) OdbcHandleType.Stmt, hstmt);
|
||||
return 0;
|
||||
}
|
||||
|
||||
public void Prepare()
|
||||
{
|
||||
OdbcReturn ret=libodbc.SQLAllocHandle(OdbcHandleType.Stmt, Connection.hDbc, ref hstmt);
|
||||
@@ -360,7 +330,7 @@ namespace System.Data.Odbc
|
||||
|
||||
public OdbcDataReader ExecuteReader (CommandBehavior behavior)
|
||||
{
|
||||
ExecuteNonQuery(false);
|
||||
ExecuteNonQuery();
|
||||
dataReader=new OdbcDataReader(this,behavior);
|
||||
return dataReader;
|
||||
}
|
||||
@@ -372,12 +342,11 @@ namespace System.Data.Odbc
|
||||
|
||||
public object ExecuteScalar ()
|
||||
{
|
||||
object val = null;
|
||||
object val;
|
||||
OdbcDataReader reader=ExecuteReader();
|
||||
try
|
||||
{
|
||||
if (reader.Read ())
|
||||
val=reader[0];
|
||||
val=reader[0];
|
||||
}
|
||||
finally
|
||||
{
|
||||
|
||||
@@ -46,7 +46,6 @@ namespace System.Data.Odbc
|
||||
int connectionTimeout;
|
||||
internal OdbcTransaction transaction;
|
||||
IntPtr henv=IntPtr.Zero, hdbc=IntPtr.Zero;
|
||||
bool disposed = false;
|
||||
|
||||
#endregion
|
||||
|
||||
@@ -198,25 +197,27 @@ namespace System.Data.Odbc
|
||||
// disconnect
|
||||
ret = libodbc.SQLDisconnect (hdbc);
|
||||
if ( (ret!=OdbcReturn.Success) && (ret!=OdbcReturn.SuccessWithInfo))
|
||||
throw new OdbcException (new OdbcError ("SQLDisconnect", OdbcHandleType.Dbc,hdbc));
|
||||
throw new OdbcException (new OdbcError ("SQLConnect", OdbcHandleType.Dbc,hdbc));
|
||||
|
||||
// free handles
|
||||
if (hdbc != IntPtr.Zero) {
|
||||
ret = libodbc.SQLFreeHandle ( (ushort) OdbcHandleType.Dbc, hdbc);
|
||||
if ( (ret!=OdbcReturn.Success) && (ret!=OdbcReturn.SuccessWithInfo))
|
||||
throw new OdbcException (new OdbcError ("SQLFreeHandle", OdbcHandleType.Dbc,hdbc));
|
||||
throw new OdbcException (new OdbcError ("SQLConnect", OdbcHandleType.Dbc,hdbc));
|
||||
}
|
||||
hdbc = IntPtr.Zero;
|
||||
|
||||
if (henv != IntPtr.Zero) {
|
||||
ret = libodbc.SQLFreeHandle ( (ushort) OdbcHandleType.Env, henv);
|
||||
if ( (ret!=OdbcReturn.Success) && (ret!=OdbcReturn.SuccessWithInfo))
|
||||
throw new OdbcException (new OdbcError ("SQLFreeHandle", OdbcHandleType.Env,henv));
|
||||
throw new OdbcException (new OdbcError ("SQLConnect", OdbcHandleType.Dbc,hdbc));
|
||||
}
|
||||
henv = IntPtr.Zero;
|
||||
|
||||
transaction = null;
|
||||
}
|
||||
else
|
||||
throw new InvalidOperationException ();
|
||||
}
|
||||
|
||||
public OdbcCommand CreateCommand ()
|
||||
@@ -230,23 +231,10 @@ namespace System.Data.Odbc
|
||||
throw new NotImplementedException ();
|
||||
}
|
||||
|
||||
[MonoTODO]
|
||||
protected override void Dispose (bool disposing)
|
||||
{
|
||||
if (!this.disposed) {
|
||||
try
|
||||
{
|
||||
// release the native unmananged resources
|
||||
this.Close();
|
||||
this.disposed = true;
|
||||
}
|
||||
finally
|
||||
{
|
||||
// call Dispose on the base class
|
||||
base.Dispose(disposing);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
{
|
||||
}
|
||||
|
||||
[MonoTODO]
|
||||
object ICloneable.Clone ()
|
||||
|
||||
@@ -167,8 +167,25 @@ namespace System.Data.Odbc
|
||||
return cols[ordinal];
|
||||
}
|
||||
|
||||
private string GetSQLState (IntPtr hstmt, ushort recNo)
|
||||
{
|
||||
OdbcReturn ret = OdbcReturn.Error;
|
||||
short bufLength=256, txtLength=0;
|
||||
int nativeError = 1;
|
||||
string sqlState = "", sqlMsg = "";
|
||||
byte [] msgtxtBuffer = new byte [bufLength];
|
||||
byte [] sqlStateBuffer = new byte [bufLength];
|
||||
ret = libodbc.SQLGetDiagRec (OdbcHandleType.Stmt, hstmt, recNo,
|
||||
sqlStateBuffer, ref nativeError, msgtxtBuffer,
|
||||
bufLength, ref txtLength);
|
||||
sqlState = Encoding.Default.GetString (sqlStateBuffer).Replace (
|
||||
(char) 0, ' ').Trim ();
|
||||
return sqlState;
|
||||
}
|
||||
|
||||
public void Close ()
|
||||
{
|
||||
// libodbc.SQLFreeHandle((ushort) OdbcHandleType.Stmt, hstmt);
|
||||
|
||||
OdbcReturn ret=libodbc.SQLCloseCursor(hstmt);
|
||||
if ((ret!=OdbcReturn.Success) && (ret!=OdbcReturn.SuccessWithInfo))
|
||||
@@ -179,9 +196,6 @@ namespace System.Data.Odbc
|
||||
|
||||
if ((behavior & CommandBehavior.CloseConnection)==CommandBehavior.CloseConnection)
|
||||
this.command.Connection.Close();
|
||||
ret = libodbc.SQLFreeHandle( (ushort) OdbcHandleType.Stmt, hstmt);
|
||||
if ((ret!=OdbcReturn.Success) && (ret!=OdbcReturn.SuccessWithInfo))
|
||||
throw new OdbcException(new OdbcError("SQLFreeHandle",OdbcHandleType.Stmt,hstmt));
|
||||
}
|
||||
|
||||
~OdbcDataReader ()
|
||||
@@ -217,10 +231,6 @@ namespace System.Data.Odbc
|
||||
if ( (ret != OdbcReturn.Success) && (ret != OdbcReturn.SuccessWithInfo))
|
||||
throw new OdbcException (new OdbcError ("SQLGetData", OdbcHandleType.Stmt, hstmt));
|
||||
|
||||
OdbcError odbcErr = null;
|
||||
if ( (ret == OdbcReturn.SuccessWithInfo))
|
||||
odbcErr = new OdbcError ("SQLGetData", OdbcHandleType.Stmt, hstmt);
|
||||
|
||||
if (buffer == null)
|
||||
return outsize; //if buffer is null,return length of the field
|
||||
|
||||
@@ -231,10 +241,11 @@ namespace System.Data.Odbc
|
||||
copyBuffer = false;
|
||||
returnVal = -1;
|
||||
} else {
|
||||
string sqlstate = odbcErr.SQLState;
|
||||
string sqlstate = GetSQLState (hstmt, 1);
|
||||
//SQLState: String Data, Right truncated
|
||||
if (sqlstate != libodbc.SQLSTATE_RIGHT_TRUNC)
|
||||
throw new OdbcException ( odbcErr);
|
||||
throw new OdbcException (new OdbcError ("SQLGetData",
|
||||
OdbcHandleType.Stmt, hstmt));
|
||||
copyBuffer = true;
|
||||
}
|
||||
} else {
|
||||
@@ -389,6 +400,7 @@ namespace System.Data.Odbc
|
||||
for (int i = 0; i < cols.Length; i += 1 )
|
||||
{
|
||||
OdbcColumn col=GetColumn(i);
|
||||
//Console.WriteLine("{0}:{1}:{2}",col.ColumnName,col.DataType,col.OdbcType);
|
||||
|
||||
schemaRow = dataTableSchema.NewRow ();
|
||||
dataTableSchema.Rows.Add (schemaRow);
|
||||
@@ -473,23 +485,14 @@ namespace System.Data.Odbc
|
||||
bufsize=50;
|
||||
buffer=new byte[bufsize]; // According to sqlext.h, use SQL_CHAR for decimal
|
||||
ret=libodbc.SQLGetData(hstmt, ColIndex, OdbcType.Char, buffer, bufsize, ref outsize);
|
||||
byte[] temp = new byte[outsize];
|
||||
for (int i=0;i<outsize;i++)
|
||||
temp[i]=buffer[i];
|
||||
|
||||
if (outsize!=-1)
|
||||
DataValue=Decimal.Parse(System.Text.Encoding.Default.GetString(temp));
|
||||
DataValue=Decimal.Parse(System.Text.Encoding.Default.GetString(buffer));
|
||||
break;
|
||||
case OdbcType.TinyInt:
|
||||
short short_data=0;
|
||||
ret=libodbc.SQLGetData(hstmt, ColIndex, OdbcType.TinyInt, ref short_data, 0, ref outsize);
|
||||
DataValue = System.Convert.ToByte (short_data);
|
||||
DataValue=short_data;
|
||||
break;
|
||||
case OdbcType.SmallInt:
|
||||
short sint_data=0;
|
||||
ret=libodbc.SQLGetData(hstmt, ColIndex, OdbcType.SmallInt, ref sint_data, 0, ref outsize);
|
||||
DataValue=sint_data;
|
||||
break;
|
||||
case OdbcType.Int:
|
||||
int int_data=0;
|
||||
ret=libodbc.SQLGetData(hstmt, ColIndex, OdbcType.Int, ref int_data, 0, ref outsize);
|
||||
@@ -521,17 +524,8 @@ namespace System.Data.Odbc
|
||||
break;
|
||||
case OdbcType.Timestamp:
|
||||
case OdbcType.DateTime:
|
||||
case OdbcType.Date:
|
||||
case OdbcType.Time:
|
||||
OdbcTimestamp ts_data=new OdbcTimestamp();
|
||||
if (col.OdbcType == OdbcType.Timestamp)
|
||||
ret=libodbc.SQLGetData(hstmt, ColIndex, OdbcType.Timestamp, ref ts_data, 0, ref outsize);
|
||||
else if (col.OdbcType == OdbcType.DateTime)
|
||||
ret=libodbc.SQLGetData(hstmt, ColIndex, OdbcType.DateTime, ref ts_data, 0, ref outsize);
|
||||
else if (col.OdbcType == OdbcType.Date)
|
||||
ret=libodbc.SQLGetData(hstmt, ColIndex, OdbcType.Date, ref ts_data, 0, ref outsize);
|
||||
else // FIXME: how to get TIME datatype ??
|
||||
ret=libodbc.SQLGetData(hstmt, ColIndex, OdbcType.DateTime, ref ts_data, 0, ref outsize);
|
||||
ret=libodbc.SQLGetData(hstmt, ColIndex, OdbcType.DateTime, ref ts_data, 0, ref outsize);
|
||||
if (outsize!=-1) // This means SQL_NULL_DATA
|
||||
DataValue=new DateTime(ts_data.year,ts_data.month,ts_data.day,ts_data.hour,
|
||||
ts_data.minute,ts_data.second,Convert.ToInt32(ts_data.fraction));
|
||||
@@ -540,11 +534,12 @@ namespace System.Data.Odbc
|
||||
case OdbcType.Image :
|
||||
bufsize = col.MaxLength + 1;
|
||||
buffer = new byte [bufsize];
|
||||
long read = GetBytes (ordinal, 0, buffer, 0, bufsize);
|
||||
long read = GetBytes (ColIndex, 0, buffer, 0, bufsize);
|
||||
ret = OdbcReturn.Success;
|
||||
DataValue = buffer;
|
||||
break;
|
||||
default:
|
||||
//Console.WriteLine("Fetching unsupported data type as string: "+col.OdbcType.ToString());
|
||||
bufsize=255;
|
||||
buffer=new byte[bufsize];
|
||||
ret=libodbc.SQLGetData(hstmt, ColIndex, OdbcType.Char, buffer, bufsize, ref outsize);
|
||||
@@ -617,8 +612,6 @@ namespace System.Data.Odbc
|
||||
currentRow=-1;
|
||||
else
|
||||
currentRow++;
|
||||
GetSchemaTable();
|
||||
|
||||
// Clear cached values from last record
|
||||
foreach (OdbcColumn col in cols)
|
||||
{
|
||||
|
||||
@@ -261,9 +261,6 @@ namespace System.Data.Odbc
|
||||
string paramValueString = ParamValue.ToString();
|
||||
// Treat everything else as a string
|
||||
// Init string buffer
|
||||
if (ParamValue is String)
|
||||
paramValueString = "\'"+paramValueString+"\'";
|
||||
|
||||
if (buffer == null || buffer.Length < ((size > 20) ? size : 20))
|
||||
buffer = new byte[(size > 20) ? size : 20];
|
||||
else
|
||||
|
||||
@@ -51,7 +51,7 @@ namespace System.Data.Odbc
|
||||
//#define SQL_INTERVAL 10
|
||||
// could map to SmallDateTime?
|
||||
|
||||
public enum OdbcType
|
||||
public enum OdbcType : short
|
||||
{
|
||||
BigInt=-5, // SQL_BIGINT
|
||||
Binary=-2, // SQL_BINARY
|
||||
|
||||
@@ -1,10 +1,6 @@
|
||||
2004-09-02 Umadevi S <[email protected]>
|
||||
* SqlCommand.cs - ExecuteNonQuery to return -1 incase of executing a storedprocedure
|
||||
|
||||
|
||||
2004-08-12 Sureshkumar T <[email protected]>
|
||||
* SqlDataReader.cs - In Close method, the remaining resultsets are drained
|
||||
out, to read output parameters & to avoid stream overlap
|
||||
2004-06-30 Umadevi S <[email protected]>
|
||||
* SqlCommand.cs : In the Execute Method the commandbehavior parameters were ignored correct
|
||||
these
|
||||
|
||||
2004-06-22 Atsushi Enomoto <[email protected]>
|
||||
|
||||
|
||||
@@ -268,8 +268,8 @@ namespace System.Data.SqlClient {
|
||||
{
|
||||
TdsMetaParameterCollection parms = Parameters.MetaParameters;
|
||||
if (preparedStatement == null) {
|
||||
bool schemaOnly = ((CommandBehavior & CommandBehavior.SchemaOnly) > 0);
|
||||
bool keyInfo = ((CommandBehavior & CommandBehavior.KeyInfo) > 0);
|
||||
bool schemaOnly = ((behavior & CommandBehavior.SchemaOnly) > 0);
|
||||
bool keyInfo = ((behavior & CommandBehavior.KeyInfo) > 0);
|
||||
|
||||
StringBuilder sql1 = new StringBuilder ();
|
||||
StringBuilder sql2 = new StringBuilder ();
|
||||
@@ -310,19 +310,16 @@ namespace System.Data.SqlClient {
|
||||
|
||||
try {
|
||||
Execute (CommandBehavior.Default, false);
|
||||
if (commandType == CommandType.StoredProcedure)
|
||||
result = -1;
|
||||
else {
|
||||
// .NET documentation says that except for INSERT, UPDATE and
|
||||
// DELETE where the return value is the number of rows affected
|
||||
// for the rest of the commands the return value is -1.
|
||||
if ((CommandText.ToUpper().IndexOf("UPDATE")!=-1) ||
|
||||
(CommandText.ToUpper().IndexOf("INSERT")!=-1) ||
|
||||
(CommandText.ToUpper().IndexOf("DELETE")!=-1))
|
||||
// .NET documentation says that except for INSERT, UPDATE and
|
||||
// DELETE where the return value is the number of rows affected
|
||||
// for the rest of the commands the return value is -1.
|
||||
if ((CommandText.ToUpper().IndexOf("UPDATE")!=-1) ||
|
||||
(CommandText.ToUpper().IndexOf("INSERT")!=-1) ||
|
||||
(CommandText.ToUpper().IndexOf("DELETE")!=-1))
|
||||
result = Connection.Tds.RecordsAffected;
|
||||
else
|
||||
result = -1;
|
||||
}
|
||||
else
|
||||
result = -1;
|
||||
|
||||
}
|
||||
catch (TdsTimeoutException e) {
|
||||
throw SqlException.FromTdsInternalException ((TdsInternalException) e);
|
||||
|
||||
@@ -131,9 +131,6 @@ namespace System.Data.SqlClient {
|
||||
|
||||
public void Close ()
|
||||
{
|
||||
// skip to end & read output parameters
|
||||
while (NextResult ())
|
||||
;
|
||||
isClosed = true;
|
||||
command.Connection.DataReader = null;
|
||||
command.CloseDataReader (moreResults);
|
||||
|
||||
@@ -1,18 +1,3 @@
|
||||
2004-08-06 Atsushi Enomoto <[email protected]>
|
||||
|
||||
* DataSet.cs : DataSet's ExtendedProperties were not XmlConverted.
|
||||
|
||||
2004-08-05 Atsushi Enomoto <[email protected]>
|
||||
|
||||
* XmlConstants.cs : Added constants for "msprop" support.
|
||||
* DataSet.cs : ExtendedProperties should be written in the schema.
|
||||
This fixes bug #61233.
|
||||
|
||||
2004-07-27 Atsushi Enomoto <[email protected]>
|
||||
|
||||
* DataSet.cs : on serialization to XmlWriter, XmlConvert should be
|
||||
used. There were also some culture dependency problems to write int.
|
||||
|
||||
2004-06-27 Atsushi Enomoto <[email protected]>
|
||||
|
||||
* XmlDataInferenceLoader.cs : It was not always filling relation
|
||||
|
||||
@@ -1270,7 +1270,7 @@ namespace System.Data {
|
||||
|
||||
private void WriteColumnAsAttribute (XmlWriter writer, XmlWriteMode mode, DataColumn col, DataRow row, DataRowVersion version)
|
||||
{
|
||||
WriteAttributeString (writer, mode, col.Namespace, col.Prefix, XmlConvert.EncodeLocalName (col.ColumnName), WriteObjectXml (row[col, version]));
|
||||
WriteAttributeString (writer, mode, col.Namespace, col.Prefix, XmlConvert.EncodeLocalName (col.ColumnName), row[col, version].ToString ());
|
||||
}
|
||||
|
||||
private void WriteTableElement (XmlWriter writer, XmlWriteMode mode, DataTable table, DataRow row, DataRowVersion version)
|
||||
@@ -1282,7 +1282,7 @@ namespace System.Data {
|
||||
|
||||
if (mode == XmlWriteMode.DiffGram) {
|
||||
WriteAttributeString (writer, mode, XmlConstants.DiffgrNamespace, XmlConstants.DiffgrPrefix, "id", table.TableName + (row.XmlRowID + 1));
|
||||
WriteAttributeString (writer, mode, XmlConstants.MsdataNamespace, XmlConstants.MsdataPrefix, "rowOrder", XmlConvert.ToString (row.XmlRowID));
|
||||
WriteAttributeString (writer, mode, XmlConstants.MsdataNamespace, XmlConstants.MsdataPrefix, "rowOrder", row.XmlRowID.ToString());
|
||||
string modeName = null;
|
||||
if (row.RowState == DataRowState.Modified)
|
||||
modeName = "modified";
|
||||
@@ -1390,8 +1390,6 @@ namespace System.Data {
|
||||
nsmgr.AddNamespace (XmlConstants.TnsPrefix, Namespace);
|
||||
nsmgr.AddNamespace (String.Empty, Namespace);
|
||||
}
|
||||
if (CheckExtendedPropertyExists ())
|
||||
nsmgr.AddNamespace (XmlConstants.MspropPrefix, XmlConstants.MspropNamespace);
|
||||
|
||||
if (atts.Count > 0)
|
||||
schema.UnhandledAttributes = atts.ToArray (typeof (XmlAttribute)) as XmlAttribute [];
|
||||
@@ -1418,8 +1416,6 @@ namespace System.Data {
|
||||
|
||||
elem.UnhandledAttributes = atts.ToArray (typeof (XmlAttribute)) as XmlAttribute [];
|
||||
|
||||
AddExtendedPropertyAttributes (elem, ExtendedProperties, doc);
|
||||
|
||||
XmlSchemaComplexType complex = new XmlSchemaComplexType ();
|
||||
elem.SchemaType = complex;
|
||||
|
||||
@@ -1450,7 +1446,7 @@ namespace System.Data {
|
||||
|
||||
schema.Items.Add (elem);
|
||||
|
||||
AddConstraintsToSchema (elem, constraintPrefix, tables, relations, doc);
|
||||
AddConstraintsToSchema (elem, constraintPrefix, tables, relations);
|
||||
foreach (string prefix in nsmgr) {
|
||||
string ns = nsmgr.LookupNamespace (nsmgr.NameTable.Get (prefix));
|
||||
if (prefix != "xmlns" && prefix != "xml" && ns != null && ns != String.Empty)
|
||||
@@ -1459,48 +1455,29 @@ namespace System.Data {
|
||||
return schema;
|
||||
}
|
||||
|
||||
private bool CheckExtendedPropertyExists ()
|
||||
{
|
||||
if (ExtendedProperties.Count > 0)
|
||||
return true;
|
||||
foreach (DataTable dt in Tables) {
|
||||
if (dt.ExtendedProperties.Count > 0)
|
||||
return true;
|
||||
foreach (DataColumn col in dt.Columns)
|
||||
if (col.ExtendedProperties.Count > 0)
|
||||
return true;
|
||||
foreach (Constraint c in dt.Constraints)
|
||||
if (c.ExtendedProperties.Count > 0)
|
||||
return true;
|
||||
}
|
||||
foreach (DataRelation rel in Relations)
|
||||
if (rel.ExtendedProperties.Count > 0)
|
||||
return true;
|
||||
return false;
|
||||
}
|
||||
|
||||
// Add all constraints in all tables to the schema.
|
||||
private void AddConstraintsToSchema (XmlSchemaElement elem, string constraintPrefix, DataTableCollection tables, DataRelationCollection relations, XmlDocument doc)
|
||||
private void AddConstraintsToSchema (XmlSchemaElement elem, string constraintPrefix, DataTableCollection tables, DataRelationCollection relations)
|
||||
{
|
||||
// first add all unique constraints.
|
||||
Hashtable uniqueNames = AddUniqueConstraints (elem, constraintPrefix, tables, doc);
|
||||
Hashtable uniqueNames = AddUniqueConstraints (elem, constraintPrefix, tables);
|
||||
// Add all foriegn key constraints.
|
||||
AddForeignKeys (uniqueNames, elem, constraintPrefix, relations, doc);
|
||||
AddForeignKeys (uniqueNames, elem, constraintPrefix, relations);
|
||||
}
|
||||
|
||||
// Add unique constaraints to the schema.
|
||||
// return hashtable with the names of all XmlSchemaUnique elements we created.
|
||||
private Hashtable AddUniqueConstraints (XmlSchemaElement elem, string constraintPrefix, DataTableCollection tables, XmlDocument doc)
|
||||
private Hashtable AddUniqueConstraints (XmlSchemaElement elem, string constraintPrefix, DataTableCollection tables)
|
||||
{
|
||||
XmlDocument doc = new XmlDocument();
|
||||
Hashtable uniqueNames = new Hashtable();
|
||||
foreach (DataTable table in tables) {
|
||||
|
||||
foreach (Constraint constraint in table.Constraints) {
|
||||
foreach (Constraint constaint in table.Constraints) {
|
||||
|
||||
if (constraint is UniqueConstraint) {
|
||||
if (constaint is UniqueConstraint) {
|
||||
ArrayList attrs = new ArrayList ();
|
||||
XmlAttribute attrib;
|
||||
UniqueConstraint uqConst = (UniqueConstraint) constraint;
|
||||
UniqueConstraint uqConst = (UniqueConstraint)constaint;
|
||||
XmlSchemaUnique uniq = new XmlSchemaUnique ();
|
||||
|
||||
// if column of the constraint is hidden do not write the constraint.
|
||||
@@ -1543,8 +1520,6 @@ namespace System.Data {
|
||||
uniq.Fields.Add(field);
|
||||
}
|
||||
|
||||
AddExtendedPropertyAttributes (uniq, constraint.ExtendedProperties, doc);
|
||||
|
||||
elem.Constraints.Add (uniq);
|
||||
uniqueNames.Add (uniq.Name, null);
|
||||
}
|
||||
@@ -1554,10 +1529,11 @@ namespace System.Data {
|
||||
}
|
||||
|
||||
// Add the foriegn keys to the schema.
|
||||
private void AddForeignKeys (Hashtable uniqueNames, XmlSchemaElement elem, string constraintPrefix, DataRelationCollection relations, XmlDocument doc)
|
||||
private void AddForeignKeys (Hashtable uniqueNames, XmlSchemaElement elem, string constraintPrefix, DataRelationCollection relations)
|
||||
{
|
||||
if (relations == null) return;
|
||||
|
||||
XmlDocument doc = new XmlDocument();
|
||||
foreach (DataRelation rel in relations) {
|
||||
|
||||
if (rel.ParentKeyConstraint == null || rel.ChildKeyConstraint == null)
|
||||
@@ -1609,10 +1585,7 @@ namespace System.Data {
|
||||
field.XPath = constraintPrefix+column.ColumnName;
|
||||
keyRef.Fields.Add(field);
|
||||
}
|
||||
|
||||
keyRef.UnhandledAttributes = (XmlAttribute[])attrs.ToArray (typeof (XmlAttribute));
|
||||
AddExtendedPropertyAttributes (keyRef, rel.ExtendedProperties, doc);
|
||||
|
||||
elem.Constraints.Add (keyRef);
|
||||
}
|
||||
}
|
||||
@@ -1645,7 +1618,7 @@ namespace System.Data {
|
||||
|
||||
// add ordinal attribute
|
||||
xlmAttrs[1] = doc.CreateAttribute (XmlConstants.MsdataPrefix, XmlConstants.Ordinal, XmlConstants.MsdataNamespace);
|
||||
xlmAttrs[1].Value = XmlConvert.ToString (simple.Ordinal);
|
||||
xlmAttrs[1].Value = simple.Ordinal.ToString();
|
||||
simpleContent.UnhandledAttributes = xlmAttrs;
|
||||
|
||||
|
||||
@@ -1682,12 +1655,12 @@ namespace System.Data {
|
||||
|
||||
if (col.AutoIncrementSeed != 0) {
|
||||
xattr = doc.CreateAttribute (XmlConstants.MsdataPrefix, XmlConstants.AutoIncrementSeed, XmlConstants.MsdataNamespace);
|
||||
xattr.Value = XmlConvert.ToString (col.AutoIncrementSeed);
|
||||
xattr.Value = col.AutoIncrementSeed.ToString();
|
||||
xattrs.Add (xattr);
|
||||
}
|
||||
|
||||
if (col.DefaultValue.ToString () != String.Empty)
|
||||
colElem.DefaultValue = WriteObjectXml (col.DefaultValue);
|
||||
colElem.DefaultValue = col.DefaultValue.ToString ();
|
||||
|
||||
if (col.MaxLength < 0)
|
||||
colElem.SchemaTypeName = MapType (col.DataType);
|
||||
@@ -1714,7 +1687,6 @@ namespace System.Data {
|
||||
}
|
||||
|
||||
colElem.UnhandledAttributes = (XmlAttribute[])xattrs.ToArray(typeof (XmlAttribute));
|
||||
AddExtendedPropertyAttributes (colElem, col.ExtendedProperties, doc);
|
||||
seq.Items.Add (colElem);
|
||||
}
|
||||
|
||||
@@ -1754,33 +1726,12 @@ namespace System.Data {
|
||||
schemaToAdd.Namespaces.Add (prefix, col.Namespace);
|
||||
}
|
||||
att.SchemaTypeName = MapType (col.DataType);
|
||||
// FIXME: what happens if extended properties are set on attribute columns??
|
||||
schemaAttributes.Add (att);
|
||||
}
|
||||
|
||||
AddExtendedPropertyAttributes (elem, table.ExtendedProperties, doc);
|
||||
|
||||
return elem;
|
||||
}
|
||||
|
||||
private void AddExtendedPropertyAttributes (XmlSchemaAnnotated xsobj, PropertyCollection props, XmlDocument doc)
|
||||
{
|
||||
ArrayList attList = new ArrayList ();
|
||||
XmlAttribute xmlAttr;
|
||||
|
||||
if (xsobj.UnhandledAttributes != null)
|
||||
attList.AddRange (xsobj.UnhandledAttributes);
|
||||
|
||||
// add extended properties to xs:element
|
||||
foreach (DictionaryEntry de in props) {
|
||||
xmlAttr = doc.CreateAttribute (XmlConstants.MspropPrefix, XmlConvert.EncodeName (de.Key.ToString ()), XmlConstants.MspropNamespace);
|
||||
xmlAttr.Value = de.Value != null ? WriteObjectXml (de.Value) : String.Empty;
|
||||
attList.Add (xmlAttr);
|
||||
}
|
||||
if (attList.Count > 0)
|
||||
xsobj.UnhandledAttributes = attList.ToArray (typeof (XmlAttribute)) as XmlAttribute [];
|
||||
}
|
||||
|
||||
private string SafeNS (string ns)
|
||||
{
|
||||
return ns != null ? ns : String.Empty;
|
||||
|
||||
@@ -83,8 +83,6 @@ internal class XmlConstants
|
||||
//ms schema objects
|
||||
public const string MsdataPrefix = "msdata";
|
||||
public const string MsdataNamespace = "urn:schemas-microsoft-com:xml-msdata";
|
||||
public const string MspropPrefix = "msprop";
|
||||
public const string MspropNamespace = "urn:schemas-microsoft-com:xml-msprop";
|
||||
public const string DiffgrPrefix = "diffgr";
|
||||
public const string DiffgrNamespace = "urn:schemas-microsoft-com:xml-diffgram-v1";
|
||||
public const string TnsPrefix = "mstns";
|
||||
|
||||
@@ -1,13 +1,3 @@
|
||||
2004-08-26 Sureshkumar T <[email protected]>
|
||||
* MySqlTestBed.cs - Added few more fields for DateTime testing
|
||||
|
||||
2004-08-13 Umadevi S <[email protected]>
|
||||
* Added standalone nunit testcases for datacontainer class.
|
||||
* Currently will use MSSQL server
|
||||
* New File
|
||||
MSSqlTestBed.cs - Base class for MSSql testing
|
||||
(similar to the mysqltestbed)
|
||||
|
||||
2004-06-16 Sureshkumar T <[email protected]>
|
||||
* Added standalone NUnit test cases for MySql db related tests.
|
||||
* Created sub-directory for System.Data.Odbc
|
||||
|
||||
@@ -1,100 +0,0 @@
|
||||
//
|
||||
// MSSqlTestBed.cs : This is base class which manages the connections to
|
||||
// MSSql database. This serves as a base class for all
|
||||
// MSSql database dependant tests.
|
||||
//
|
||||
// To run :
|
||||
//
|
||||
// * compile using following command
|
||||
// mcs /r:System.Data.dll,nunit.framework.dll /t:library /debug
|
||||
// /out:MSSqlTestBed.dll MSSqlTestBed.cs System.Data.Common/*.cs
|
||||
// * To run the tests
|
||||
// mono /usr/local/bin/nunit-console.exe MSSqlTestBed.dll
|
||||
//
|
||||
// Author:
|
||||
// Umadevi S ([email protected])
|
||||
//
|
||||
// Copyright (c) 2004 Novell Inc., and the individuals listed
|
||||
// on the ChangeLog entries.
|
||||
//
|
||||
// Permission is hereby granted, free of charge, to any person obtaining
|
||||
// a copy of this software and associated documentation files (the
|
||||
// "Software"), to deal in the Software without restriction, including
|
||||
// without limitation the rights to use, copy, modify, merge, publish,
|
||||
// distribute, sublicense, and/or sell copies of the Software, and to
|
||||
// permit persons to whom the Software is furnished to do so, subject to
|
||||
// the following conditions:
|
||||
//
|
||||
// The above copyright notice and this permission notice shall be
|
||||
// included in all copies or substantial portions of the Software.
|
||||
//
|
||||
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
|
||||
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
||||
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
//
|
||||
|
||||
using System;
|
||||
using System.Data;
|
||||
using System.Data.Common;
|
||||
using System.Data.SqlClient;
|
||||
using System.Collections.Specialized;
|
||||
|
||||
namespace MonoTests.System.Data
|
||||
{
|
||||
public class MSSqlTestClient
|
||||
{
|
||||
#region protected members
|
||||
protected string connectionString = null;
|
||||
protected SqlConnection conn = null;
|
||||
protected bool isConnAlive = false;
|
||||
#endregion
|
||||
|
||||
public MSSqlTestClient ()
|
||||
{
|
||||
connectionString =
|
||||
"Server=164.99.168.131;" +
|
||||
"Database=Northwind;" +
|
||||
"User ID=sa;" +
|
||||
"Password=novell";
|
||||
conn = new SqlConnection(connectionString);
|
||||
}
|
||||
|
||||
protected void OpenConnection ()
|
||||
{
|
||||
conn.ConnectionString = connectionString;
|
||||
conn.Open ();
|
||||
// run tests only if the connection is open,
|
||||
// otherwise make it fail, to setup with correct
|
||||
// database settings
|
||||
if (conn != null && conn.State != ConnectionState.Closed)
|
||||
isConnAlive = true;
|
||||
}
|
||||
|
||||
protected void CloseConnection ()
|
||||
{
|
||||
if (conn != null && conn.State != ConnectionState.Closed) {
|
||||
conn.Close ();
|
||||
isConnAlive = false;
|
||||
}
|
||||
}
|
||||
|
||||
internal void ExecuteQuery (string query)
|
||||
{
|
||||
SqlCommand cmd = new SqlCommand ();
|
||||
cmd.Connection = conn;
|
||||
cmd.CommandText = query;
|
||||
try {
|
||||
int recordsAff = cmd.ExecuteNonQuery ();
|
||||
} catch (Exception e) {
|
||||
Console.WriteLine("exception");
|
||||
Console.WriteLine(e.StackTrace);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
@@ -95,26 +95,23 @@ namespace MonoTests.System.Data
|
||||
"pk_tint TINYINT NOT NULL PRIMARY KEY," +
|
||||
"col_char CHAR(20)," +
|
||||
"col_int INT," +
|
||||
"col_blob TINYBLOB," +
|
||||
"col_datetime DATETIME," +
|
||||
"col_date DATE," +
|
||||
"col_time TIME" +
|
||||
"col_blob TINYBLOB" +
|
||||
");";
|
||||
ExecuteQuery (createQuery);
|
||||
createQuery = "INSERT INTO test VALUES (1, 'mono test" +
|
||||
"#1', 255, 127123645917568585638457243856234985, '2004-08-22', '2004-08-22', '12:00:00' );" ;
|
||||
"#1', 255, 127123645917568585638457243856234985 );" ;
|
||||
ExecuteQuery (createQuery);
|
||||
createQuery = "INSERT INTO test VALUES (2, 'mono test" +
|
||||
"#2', 256, NULL, NULL, NULL, NULL );";
|
||||
"#2', 256, NULL );" ;
|
||||
ExecuteQuery (createQuery);
|
||||
createQuery = "INSERT INTO test VALUES (3, 'mono test" +
|
||||
"#3', 257 , 127123645917568585638457243856234985, '2004-08-22', '2004-08-22', '12:00:00');" ;
|
||||
"#3', 257 , 127123645917568585638457243856234985);" ;
|
||||
ExecuteQuery (createQuery);
|
||||
createQuery = "INSERT INTO test VALUES (4, 'mono test" +
|
||||
"#4', 258 , 127123645917568585638457243856234985, '2004-08-22', '2004-08-22', '12:00:00');" ;
|
||||
"#4', 258 , 127123645917568585638457243856234985);" ;
|
||||
ExecuteQuery (createQuery);
|
||||
createQuery = "INSERT INTO test VALUES (5, 'mono test" +
|
||||
"#5', 259, 127123645917568585638457243856234985, '2004-08-22', '2004-08-22', '12:00:00' );" ;
|
||||
"#5', 259, 127123645917568585638457243856234985 );" ;
|
||||
ExecuteQuery (createQuery);
|
||||
}
|
||||
|
||||
|
||||
@@ -1,6 +1,3 @@
|
||||
2004-08-13 Umadevi S <[email protected]>
|
||||
* Added File DataContainerTest
|
||||
|
||||
2004-06-10 Umadevi S <[email protected]>
|
||||
* Corrected GetTableMappingBySchemaAction for DataTableMappingCollectionTest
|
||||
|
||||
|
||||
@@ -1,104 +0,0 @@
|
||||
//
|
||||
// DataContainerTest.cs - NUnit Test Cases for testing the
|
||||
// DataContainer class
|
||||
// Author:
|
||||
// Umadevi S ([email protected])
|
||||
//
|
||||
// Copyright (c) 2004 Novell Inc., and the individuals listed
|
||||
// on the ChangeLog entries.
|
||||
//
|
||||
// Permission is hereby granted, free of charge, to any person obtaining
|
||||
// a copy of this software and associated documentation files (the
|
||||
// "Software"), to deal in the Software without restriction, including
|
||||
// without limitation the rights to use, copy, modify, merge, publish,
|
||||
// distribute, sublicense, and/or sell copies of the Software, and to
|
||||
// permit persons to whom the Software is furnished to do so, subject to
|
||||
// the following conditions:
|
||||
//
|
||||
// The above copyright notice and this permission notice shall be
|
||||
// included in all copies or substantial portions of the Software.
|
||||
//
|
||||
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
|
||||
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
||||
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
//
|
||||
|
||||
using System;
|
||||
using System.Data;
|
||||
using System.Data.Common;
|
||||
using System.Data.SqlClient;
|
||||
|
||||
using NUnit.Framework;
|
||||
|
||||
namespace MonoTests.System.Data.Common
|
||||
{
|
||||
|
||||
[TestFixture]
|
||||
public class DataContainerTest : MSSqlTestClient {
|
||||
|
||||
[SetUp]
|
||||
public void GetReady () {
|
||||
OpenConnection ();
|
||||
CreateTestSetup (); // create test database & tables
|
||||
}
|
||||
|
||||
[TearDown]
|
||||
public void Clean () {
|
||||
CleanTestSetup (); // clean test database
|
||||
CloseConnection ();
|
||||
}
|
||||
|
||||
private void CreateTestSetup()
|
||||
{
|
||||
if (!isConnAlive)
|
||||
return ;
|
||||
// Create test database & tables
|
||||
string createQuery = "DROP TABLE datetimetest;" ;
|
||||
ExecuteQuery (createQuery);
|
||||
createQuery = "CREATE TABLE datetimetest (" +
|
||||
"col_char CHAR(20)," +
|
||||
"col_date DATETIME );";
|
||||
ExecuteQuery (createQuery);
|
||||
createQuery = "INSERT INTO datetimetest VALUES ('one', '4/12/2004 4:59:00');" ;
|
||||
ExecuteQuery (createQuery);
|
||||
createQuery = "INSERT INTO datetimetest VALUES ('two',null);" ;
|
||||
ExecuteQuery (createQuery);
|
||||
createQuery = "INSERT INTO datetimetest (col_char) VALUES ('three');" ;
|
||||
ExecuteQuery (createQuery);
|
||||
|
||||
|
||||
}
|
||||
|
||||
private void CleanTestSetup()
|
||||
{
|
||||
if (!isConnAlive)
|
||||
return;
|
||||
// delete test database
|
||||
string dropQuery = "DROP table datetimetest";
|
||||
ExecuteQuery(dropQuery);
|
||||
|
||||
}
|
||||
|
||||
|
||||
[Test]
|
||||
public void DateTimeTest () {
|
||||
try {
|
||||
|
||||
SqlDataAdapter myadapter = new SqlDataAdapter("select * from datetimetest;",conn);
|
||||
|
||||
DataTable dt = new DataTable();
|
||||
myadapter.Fill(dt);
|
||||
Assertion.AssertEquals ("Row count must be three", 3, dt.Rows.Count );
|
||||
}
|
||||
|
||||
finally { // try/catch is necessary to gracefully close connections
|
||||
CleanTestSetup (); // clean test database
|
||||
CloseConnection ();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,24 +1,3 @@
|
||||
2004-08-31 Umadevi S <[email protected]>
|
||||
* OdbcDataReaderTest.cs - Added a test for Numeric Type
|
||||
|
||||
2004-08-27 Sureshkumar T <[email protected]>
|
||||
* OdbcDataReaderTest.cs - Added a test for TinyInt
|
||||
|
||||
2004-08-26 Sureshkumar T <[email protected]>
|
||||
* OdbcDataReaderTest.cs - Added a test for DateTime - GetDateTimeTest
|
||||
* OdbcCommandTest.cs - Syntax Error Fix
|
||||
|
||||
2004-07-29 Umadevi S <[email protected]>
|
||||
* OdbcCommandTest.cs - Added testcase for bug 62046. ExecuteNonQuery
|
||||
|
||||
2004-07-28 Umadevi S <[email protected]>
|
||||
* OdbcCommandTest.cs - Added testcase for bug 61968. String values passed with quotes
|
||||
|
||||
2004-07-01 Sureshkumar T <[email protected]>
|
||||
* Added test case for OdbcCommand.ExecuteScalar Method
|
||||
* New files:
|
||||
OdbcCommandTest.cs - test suite for OdbcCommand class.
|
||||
|
||||
2004-06-23 Sureshkumar T <[email protected]>
|
||||
* Added test to check whether the OdbcConnection.Close method closes
|
||||
all the handles.
|
||||
|
||||
@@ -1,113 +0,0 @@
|
||||
//
|
||||
// OdbcCommandTest.cs - NUnit Test Cases for testing the
|
||||
// OdbcCommand class
|
||||
//
|
||||
// Authors:
|
||||
// Sureshkumar T ([email protected])
|
||||
// Umadevi S ([email protected])
|
||||
//
|
||||
// Copyright (c) 2004 Novell Inc., and the individuals listed
|
||||
// on the ChangeLog entries.
|
||||
//
|
||||
// Permission is hereby granted, free of charge, to any person obtaining
|
||||
// a copy of this software and associated documentation files (the
|
||||
// "Software"), to deal in the Software without restriction, including
|
||||
// without limitation the rights to use, copy, modify, merge, publish,
|
||||
// distribute, sublicense, and/or sell copies of the Software, and to
|
||||
// permit persons to whom the Software is furnished to do so, subject to
|
||||
// the following conditions:
|
||||
//
|
||||
// The above copyright notice and this permission notice shall be
|
||||
// included in all copies or substantial portions of the Software.
|
||||
//
|
||||
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
|
||||
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
||||
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
//
|
||||
|
||||
|
||||
using System;
|
||||
using System.Data;
|
||||
using System.Data.Odbc;
|
||||
|
||||
using NUnit.Framework;
|
||||
|
||||
namespace MonoTests.System.Data.Odbc
|
||||
{
|
||||
|
||||
[TestFixture]
|
||||
public class OdbcCommandTest : MySqlOdbcBaseClient
|
||||
{
|
||||
|
||||
[SetUp]
|
||||
public void GetReady () {
|
||||
OpenConnection ();
|
||||
CreateTestSetup (); // create database & test tables
|
||||
}
|
||||
|
||||
[TearDown]
|
||||
public void Clean () {
|
||||
CleanTestSetup (); // clean test database;
|
||||
CloseConnection ();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Test Execute Scalar Method
|
||||
/// </summary>
|
||||
[Test]
|
||||
public void ExecuteScalarTest ()
|
||||
{
|
||||
OdbcCommand cmd = conn.CreateCommand ();
|
||||
string query = "select count(*) from test order by col_int;";
|
||||
cmd.CommandText = query;
|
||||
object objCount = cmd.ExecuteScalar ();
|
||||
Assertion.AssertEquals( "ExecuteScalar does not return int type", 5, Convert.ToInt32(objCount));
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Test String parameters to ODBC Command
|
||||
/// </summary>
|
||||
[Test]
|
||||
public void ExecuteStringParameterTest()
|
||||
{
|
||||
|
||||
OdbcCommand dbcmd = new OdbcCommand();
|
||||
dbcmd.Connection = conn;
|
||||
dbcmd.CommandType = CommandType.Text;
|
||||
dbcmd.CommandText = "select count(*) from test where col_char=?;";
|
||||
string colvalue = "mono test#1";
|
||||
dbcmd.Parameters.Add("@un",colvalue);
|
||||
Object obj = dbcmd.ExecuteScalar();
|
||||
Assertion.AssertEquals( "String parameter not passed correctly",1,Convert.ToInt32(obj));
|
||||
|
||||
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Test ExecuteNonQuery
|
||||
/// </summary>
|
||||
[Test]
|
||||
public void ExecuteNonQueryTest ()
|
||||
{
|
||||
|
||||
OdbcCommand dbcmd = new OdbcCommand();
|
||||
dbcmd.Connection = conn;
|
||||
dbcmd.CommandType = CommandType.Text;
|
||||
dbcmd.CommandText = "select count(*) from test where col_char=?;";
|
||||
string colvalue = "mono test";
|
||||
dbcmd.Parameters.Add("@un",colvalue);
|
||||
int ret = dbcmd.ExecuteNonQuery();
|
||||
Assertion.AssertEquals( "ExecuteNonQuery not working",-1, ret);
|
||||
dbcmd = new OdbcCommand();
|
||||
dbcmd.Connection = conn;
|
||||
dbcmd.CommandType = CommandType.Text;
|
||||
dbcmd.CommandText = "delete from test where (col_int >257);";
|
||||
ret = dbcmd.ExecuteNonQuery();
|
||||
Assertion.AssertEquals("ExecuteNonQuery not working", 2, ret);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -231,106 +231,5 @@ namespace MonoTests.System.Data.Odbc
|
||||
CloseConnection ();
|
||||
}
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void GetDateTimeTest ()
|
||||
{
|
||||
OdbcCommand cmd = conn.CreateCommand ();
|
||||
string sql = "SELECT * FROM test";
|
||||
cmd.CommandText = sql;
|
||||
OdbcDataReader reader = cmd.ExecuteReader (CommandBehavior.Default);
|
||||
try {
|
||||
if (reader.Read ()) {
|
||||
object ob = reader["col_datetime"];
|
||||
Assertion.AssertEquals ("Type of datetime column is wrong!",
|
||||
"System.DateTime", ob.GetType ().ToString () );
|
||||
ob = reader["col_date"];
|
||||
Assertion.AssertEquals ("Type of date column is wrong!",
|
||||
"System.DateTime", ob.GetType ().ToString () );
|
||||
// FIXME : Once TIME data type is fixed, enable this check
|
||||
//ob = reader["col_time"];
|
||||
//Assertion.AssertEquals ("Type of time column is wrong!",
|
||||
//"System.DateTime", ob.GetType ().ToString () );
|
||||
|
||||
DateTime dt = reader.GetDateTime (4);
|
||||
Assertion.AssertEquals ("DateValue (SQL_TIMESTAMP) is wrong", new DateTime (2004, 8, 22, 0, 0, 0), dt);
|
||||
dt = reader.GetDateTime (5);
|
||||
Assertion.AssertEquals ("DateValue (SQL_DATE) is wrong", new DateTime (2004, 8, 22, 0, 0, 0), dt);
|
||||
// FIXME : Once TIME data type is fixed, enable this check
|
||||
//dt = reader.GetDateTime (7);
|
||||
//Assertion.AssertEquals ("DateValue is wrong", "2004-08-22", dt.ToString ());
|
||||
}
|
||||
} finally {
|
||||
// clean up
|
||||
if (reader != null && !reader.IsClosed )
|
||||
reader.Close ();
|
||||
reader = null;
|
||||
CleanTestSetup ();
|
||||
CloseConnection ();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// This test for the return type & value for GetValue
|
||||
/// in case of Odbc Data type TINYINT
|
||||
/// </summary>
|
||||
[Test]
|
||||
public void TinyIntTest ()
|
||||
{
|
||||
OdbcCommand cmd = conn.CreateCommand ();
|
||||
string sql = "SELECT * FROM test";
|
||||
cmd.CommandText = sql;
|
||||
OdbcDataReader reader = cmd.ExecuteReader (CommandBehavior.SequentialAccess);
|
||||
try {
|
||||
if (reader.Read ()) {
|
||||
object ob = reader.GetValue (0);
|
||||
Assertion.AssertEquals ("Type of tinyInt column is wrong!",
|
||||
"System.Byte", ob.GetType ().ToString () );
|
||||
Assertion.AssertEquals ("Value of tinyInt column is wrong!",
|
||||
1, System.Convert.ToInt16(ob) );
|
||||
}
|
||||
} finally {
|
||||
// clean up
|
||||
if (reader != null && !reader.IsClosed )
|
||||
reader.Close ();
|
||||
reader = null;
|
||||
CleanTestSetup ();
|
||||
CloseConnection ();
|
||||
}
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void NumericTest()
|
||||
{
|
||||
using(IDbConnection dbConnection = new OdbcConnection(connectionString))
|
||||
{
|
||||
dbConnection.Open();
|
||||
IDbCommand dbCommand = dbConnection.CreateCommand();
|
||||
//note this will fail if the table already exists, ie if the test has failed.
|
||||
dbCommand.CommandText = "CREATE TABLE NumericTable (NumericField NUMERIC(10) NOT NULL)";
|
||||
dbCommand.ExecuteNonQuery();
|
||||
dbCommand.CommandText = "INSERT INTO NumericTable (NumericField) VALUES (125)";
|
||||
dbCommand.ExecuteNonQuery();
|
||||
dbCommand.CommandText = "SELECT * FROM NumericTable";
|
||||
using(IDataReader reader = dbCommand.ExecuteReader())
|
||||
{
|
||||
while(reader.Read())
|
||||
{
|
||||
for(int index = 0; index < reader.FieldCount; index++)
|
||||
{
|
||||
Object dataValue = reader.GetValue(index);
|
||||
Assert.AreEqual("System.Decimal",dataValue.GetType().ToString());
|
||||
Assert.AreEqual("125", dataValue.ToString());
|
||||
}
|
||||
}
|
||||
}
|
||||
dbCommand.CommandText = "DROP TABLE NumericTable";
|
||||
dbCommand.ExecuteNonQuery();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
@@ -1,99 +0,0 @@
|
||||
//
|
||||
// SqlCommandTest.cs - NUnit Test Cases for testing the
|
||||
// SqlCommand class
|
||||
// Author:
|
||||
// Umadevi S ([email protected])
|
||||
//
|
||||
// Copyright (c) 2004 Novell Inc., and the individuals listed
|
||||
// on the ChangeLog entries.
|
||||
//
|
||||
// Permission is hereby granted, free of charge, to any person obtaining
|
||||
// a copy of this software and associated documentation files (the
|
||||
// "Software"), to deal in the Software without restriction, including
|
||||
// without limitation the rights to use, copy, modify, merge, publish,
|
||||
// distribute, sublicense, and/or sell copies of the Software, and to
|
||||
// permit persons to whom the Software is furnished to do so, subject to
|
||||
// the following conditions:
|
||||
//
|
||||
// The above copyright notice and this permission notice shall be
|
||||
// included in all copies or substantial portions of the Software.
|
||||
//
|
||||
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
|
||||
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
||||
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
//
|
||||
|
||||
using System;
|
||||
using System.Data;
|
||||
using System.Data.Common;
|
||||
using System.Data.SqlClient;
|
||||
|
||||
using NUnit.Framework;
|
||||
|
||||
namespace MonoTests.System.Data.SqlClient
|
||||
{
|
||||
|
||||
[TestFixture]
|
||||
public class SqlCommandTest : MSSqlTestClient {
|
||||
|
||||
[SetUp]
|
||||
public void GetReady () {
|
||||
OpenConnection ();
|
||||
}
|
||||
|
||||
[TearDown]
|
||||
public void Clean () {
|
||||
CloseConnection ();
|
||||
}
|
||||
|
||||
/**
|
||||
This is required to be run only once, call this from the GetReady.
|
||||
**/
|
||||
private void setup(){
|
||||
string createquery = "CREATE PROCEDURE sp_insert @TestPar1 varchar(50),@BirthDate datetime as insert into Employees(LastName,FirstName) VALUES('SSS','uuuu') ";
|
||||
SqlCommand cmd = new SqlCommand();
|
||||
cmd.Connection = conn;
|
||||
cmd.CommandText = createquery;
|
||||
int ret =cmd.ExecuteNonQuery();
|
||||
}
|
||||
|
||||
|
||||
[Test]
|
||||
/**
|
||||
The below test expects the stored procedure sp_insert in the database.
|
||||
**/
|
||||
public void ExecuteNonQueryTest () {
|
||||
try {
|
||||
SqlCommand cmd = new SqlCommand();
|
||||
cmd.Connection = conn;
|
||||
cmd.CommandText = "sp_insert";
|
||||
cmd.CommandType = CommandType.StoredProcedure;
|
||||
Object TestPar = System.DBNull.Value;
|
||||
cmd.Parameters.Add("@TestPar1",SqlDbType.Int);
|
||||
cmd.Parameters["@TestPar1"].Value = TestPar;
|
||||
cmd.Parameters.Add("@BirthDate",DateTime.Now);
|
||||
Assert.AreEqual(-1,cmd.ExecuteNonQuery());
|
||||
}
|
||||
catch (Exception e) {
|
||||
Assert.Fail("A#01 Got an exception");
|
||||
Console.WriteLine(e.Message);
|
||||
Console.WriteLine(e.StackTrace);
|
||||
|
||||
}
|
||||
|
||||
finally { // try/catch is necessary to gracefully close connections
|
||||
|
||||
CloseConnection ();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
@@ -1,7 +1,3 @@
|
||||
2004-07-02 Jordi Mas i Hernandez <[email protected]>
|
||||
|
||||
* gdipFunctions.cs: fixes bug 61050
|
||||
|
||||
2004-06-24 Sanjay Gupta <[email protected]>
|
||||
|
||||
* ImageAnimator.cs: Rewrote complete implementation.
|
||||
|
||||
@@ -1418,11 +1418,7 @@ namespace System.Drawing
|
||||
{
|
||||
public Stream stream;
|
||||
|
||||
public GdiPlusStreamHelper (Stream s)
|
||||
{
|
||||
stream = s;
|
||||
stream.Seek(0, SeekOrigin.Begin);
|
||||
}
|
||||
public GdiPlusStreamHelper (Stream s) { stream = s; }
|
||||
|
||||
public int StreamGetBytesImpl (IntPtr buf, int bufsz, bool peek)
|
||||
{
|
||||
|
||||
@@ -1,8 +1,3 @@
|
||||
2004-07-15 Lluis Sanchez Gual <[email protected]>
|
||||
|
||||
* TcpServerChannel.cs: Set channel name from the provided properties.
|
||||
This fixes bug #61592.
|
||||
|
||||
2004-05-13 Lluis Sanchez Gual <[email protected]>
|
||||
|
||||
* TcpChannel.cs: Made Init private.
|
||||
|
||||
-3
@@ -106,9 +106,6 @@ namespace System.Runtime.Remoting.Channels.Tcp
|
||||
{
|
||||
switch((string)property.Key)
|
||||
{
|
||||
case "name":
|
||||
name = property.Value.ToString();
|
||||
break;
|
||||
case "port":
|
||||
port = Convert.ToInt32(property.Value);
|
||||
break;
|
||||
|
||||
@@ -1,14 +1,3 @@
|
||||
2004-07-26 Lluis Sanchez Gual <[email protected]>
|
||||
|
||||
* SoapMessageFormater.cs: In BuildSoapMessageFromMethodResponse, add the
|
||||
return value to the SoapMessage even if it is null. This fixes bug #61837.
|
||||
|
||||
2004-07-06 Lluis Sanchez Gual <[email protected]>
|
||||
|
||||
* SoapMessageFormatter.cs: In BuildMethodCallFromSoapMessage, set get the
|
||||
parameters from the SoapMessage by position, not by name, since names
|
||||
may be different. This fixes bug #60427.
|
||||
|
||||
2004-06-16 Lluis Sanchez Gual <[email protected]>
|
||||
|
||||
* SoapServerFormatterSink.cs: Removed unneded method.
|
||||
|
||||
+11
-17
@@ -222,21 +222,21 @@ namespace System.Runtime.Remoting.Channels {
|
||||
// have to add them here
|
||||
_methodCallParameters = _methodCallInfo.GetParameters();
|
||||
object[] args = new object[_methodCallParameters.Length];
|
||||
int sn = 0;
|
||||
for (int n=0; n<_methodCallParameters.Length; n++)
|
||||
|
||||
foreach(ParameterInfo paramInfo in _methodCallParameters)
|
||||
{
|
||||
ParameterInfo paramInfo = _methodCallParameters [n];
|
||||
Type paramType = (paramInfo.ParameterType.IsByRef ? paramInfo.ParameterType.GetElementType() : paramInfo.ParameterType);
|
||||
|
||||
if (paramInfo.IsOut && paramInfo.ParameterType.IsByRef) {
|
||||
args [n] = GetNullValue (paramType);
|
||||
args [paramInfo.Position] = GetNullValue (paramType);
|
||||
}
|
||||
else{
|
||||
object val = soapMessage.ParamValues[sn++];
|
||||
if(val is IConvertible)
|
||||
args [n] = Convert.ChangeType (val, paramType);
|
||||
else
|
||||
args [n] = val;
|
||||
int index = Array.IndexOf(soapMessage.ParamNames, paramInfo.Name);
|
||||
if(soapMessage.ParamValues[index] is IConvertible)
|
||||
soapMessage.ParamValues[index] = Convert.ChangeType(
|
||||
soapMessage.ParamValues[index],
|
||||
paramType);
|
||||
args [paramInfo.Position] = soapMessage.ParamValues[index];
|
||||
}
|
||||
}
|
||||
|
||||
@@ -267,16 +267,10 @@ namespace System.Runtime.Remoting.Channels {
|
||||
ArrayList paramValues = new ArrayList();
|
||||
ArrayList paramTypes = new ArrayList();
|
||||
soapMessage.MethodName = mrm.MethodName+"Response";
|
||||
|
||||
Type retType = ((MethodInfo)mrm.MethodBase).ReturnType;
|
||||
|
||||
if(retType != typeof(void)) {
|
||||
if(mrm.ReturnValue != null && mrm.ReturnValue.GetType() != typeof(void)) {
|
||||
paramNames.Add("return");
|
||||
paramValues.Add(mrm.ReturnValue);
|
||||
if (mrm.ReturnValue != null)
|
||||
paramTypes.Add(mrm.ReturnValue.GetType());
|
||||
else
|
||||
paramTypes.Add(retType);
|
||||
paramTypes.Add(mrm.ReturnValue.GetType());
|
||||
}
|
||||
|
||||
for(int i = 0; i < mrm.OutArgCount; i++){
|
||||
|
||||
@@ -1,8 +1,3 @@
|
||||
2004-07-20 Atsushi Enomoto <[email protected]>
|
||||
|
||||
* Signature.cs : Fixed NextElementPos() that incorrectly examined
|
||||
node matching.
|
||||
|
||||
2004-06-17 Sebastien Pouliot <[email protected]>
|
||||
|
||||
* KeyInfoX509Data.cs: Removed old internal IssuerSerial for the
|
||||
|
||||
@@ -192,14 +192,13 @@ namespace System.Security.Cryptography.Xml {
|
||||
{
|
||||
while (pos < nl.Count) {
|
||||
if (nl [pos].NodeType == XmlNodeType.Element) {
|
||||
if (nl [pos].LocalName != name || nl [pos].NamespaceURI != ns) {
|
||||
if (nl [pos].LocalName != name && nl [pos].NamespaceURI != ns) {
|
||||
if (required)
|
||||
throw new CryptographicException ("Malformed element " + name);
|
||||
else
|
||||
return -2;
|
||||
}
|
||||
else
|
||||
return pos;
|
||||
return pos;
|
||||
}
|
||||
else
|
||||
pos++;
|
||||
|
||||
@@ -1,8 +1,3 @@
|
||||
2004-08-24 Lluis Sanchez Gual <[email protected]>
|
||||
|
||||
* ContractReference.cs, DiscoveryClientProtocol.cs: Set the url from which
|
||||
documents are being read.
|
||||
|
||||
2004-06-13 Gert Driesen <[email protected]>
|
||||
|
||||
* SchemaReference.cs: corrected namespace
|
||||
|
||||
@@ -147,7 +147,7 @@ namespace System.Web.Services.Discovery {
|
||||
{
|
||||
string contentType = null;
|
||||
Stream stream = prot.Download (ref url, ref contentType);
|
||||
XmlTextReader reader = new XmlTextReader (url, stream);
|
||||
XmlTextReader reader = new XmlTextReader (stream);
|
||||
reader.MoveToContent ();
|
||||
|
||||
DiscoveryReference refe;
|
||||
|
||||
+2
-2
@@ -84,7 +84,7 @@ namespace System.Web.Services.Discovery {
|
||||
public DiscoveryDocument Discover (string url)
|
||||
{
|
||||
Stream stream = Download (ref url);
|
||||
XmlTextReader reader = new XmlTextReader (url, stream);
|
||||
XmlTextReader reader = new XmlTextReader (stream);
|
||||
if (!DiscoveryDocument.CanRead (reader))
|
||||
throw new InvalidOperationException ("The url '" + url + "' does not point to a valid discovery document");
|
||||
|
||||
@@ -131,7 +131,7 @@ namespace System.Web.Services.Discovery {
|
||||
stream = Download (ref url);
|
||||
}
|
||||
|
||||
XmlTextReader reader = new XmlTextReader (url, stream);
|
||||
XmlTextReader reader = new XmlTextReader (stream);
|
||||
reader.MoveToContent ();
|
||||
DiscoveryDocument doc;
|
||||
DiscoveryReference refe = null;
|
||||
|
||||
@@ -1,13 +1,3 @@
|
||||
2004-08-25 Lluis Sanchez Gual <[email protected]>
|
||||
|
||||
* HttpSoapWebServiceHandler.cs, WebServiceHandler.cs: Do not assign the
|
||||
context to the service. It already gets it from HttpContext.Current.
|
||||
|
||||
2004-07-20 Lluis Sanchez Gual <[email protected]>
|
||||
|
||||
* HttpWebClientProtocol.cs: Add received cookies to cookieContainer when
|
||||
getting the response, do not wait for the next request to do it.
|
||||
|
||||
2004-06-22 Lluis Sanchez Gual <[email protected]>
|
||||
|
||||
* XmlReturnReader.cs, XmlReturnWriter.cs: Generate the serializer with
|
||||
|
||||
+5
@@ -335,6 +335,11 @@ namespace System.Web.Services.Protocols
|
||||
|
||||
private SoapServerMessage Invoke (HttpContext ctx, SoapServerMessage requestMessage)
|
||||
{
|
||||
WebService wsi = requestMessage.Server as WebService;
|
||||
if (wsi != null) {
|
||||
wsi.SetContext (ctx);
|
||||
}
|
||||
|
||||
SoapMethodStubInfo methodInfo = requestMessage.MethodStubInfo;
|
||||
|
||||
// Assign header values to web service members
|
||||
|
||||
+27
-9
@@ -45,6 +45,7 @@ namespace System.Web.Services.Protocols {
|
||||
CookieContainer cookieContainer;
|
||||
IWebProxy proxy;
|
||||
string userAgent;
|
||||
CookieCollection prevCookies;
|
||||
|
||||
#if NET_1_1
|
||||
bool _unsafeAuthenticated;
|
||||
@@ -116,25 +117,41 @@ namespace System.Web.Services.Protocols {
|
||||
|
||||
#region Methods
|
||||
|
||||
internal virtual void CheckForCookies (HttpWebResponse response)
|
||||
internal virtual void AddCookies (Uri uri)
|
||||
{
|
||||
CookieCollection cookies = response.Cookies;
|
||||
if (cookieContainer == null || cookies.Count == 0)
|
||||
if (cookieContainer == null)
|
||||
cookieContainer = new CookieContainer ();
|
||||
|
||||
if (prevCookies == null || prevCookies.Count == 0)
|
||||
return;
|
||||
|
||||
CookieCollection coll = cookieContainer.GetCookies (uri);
|
||||
foreach (Cookie c in cookies) {
|
||||
bool add = true;
|
||||
foreach (Cookie prev in coll) {
|
||||
foreach (Cookie prev in prevCookies) {
|
||||
bool dont = false;
|
||||
foreach (Cookie c in coll) {
|
||||
if (c.Equals (prev)) {
|
||||
add = false;
|
||||
dont = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (add)
|
||||
cookieContainer.Add (c);
|
||||
|
||||
if (dont == false)
|
||||
cookieContainer.Add (prev);
|
||||
}
|
||||
}
|
||||
|
||||
internal virtual void CheckForCookies (HttpWebResponse response)
|
||||
{
|
||||
CookieCollection cookies = response.Cookies;
|
||||
if (cookies.Count == 0)
|
||||
return;
|
||||
|
||||
if (prevCookies == null)
|
||||
prevCookies = new CookieCollection ();
|
||||
|
||||
foreach (Cookie c in cookies)
|
||||
prevCookies.Add (c);
|
||||
}
|
||||
|
||||
protected override WebRequest GetWebRequest (Uri uri)
|
||||
{
|
||||
@@ -147,6 +164,7 @@ namespace System.Web.Services.Protocols {
|
||||
if (clientCertificates != null)
|
||||
request.ClientCertificates.AddRange (clientCertificates);
|
||||
|
||||
AddCookies (uri);
|
||||
request.CookieContainer = cookieContainer;
|
||||
if (proxy != null)
|
||||
request.Proxy = proxy;
|
||||
|
||||
@@ -78,7 +78,13 @@ namespace System.Web.Services.Protocols
|
||||
|
||||
protected object CreateServerInstance ()
|
||||
{
|
||||
return Activator.CreateInstance (ServiceType);
|
||||
object ws = Activator.CreateInstance (ServiceType);
|
||||
WebService wsi = ws as WebService;
|
||||
if (wsi != null) {
|
||||
wsi.SetContext (_context);
|
||||
}
|
||||
|
||||
return ws;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,9 +1,3 @@
|
||||
2004-08-25 Lluis Sanchez Gual <[email protected]>
|
||||
|
||||
* WebService.cs: Get the HttpContext from the HttpContext.Current, do not
|
||||
wait to be set with SetContext. In this way the context is available
|
||||
in the web service constructor.
|
||||
|
||||
2004-05-12 Lluis Sanchez Gual <[email protected]>
|
||||
|
||||
* WebService.cs: Take the session from the context.
|
||||
|
||||
@@ -46,13 +46,17 @@ namespace System.Web.Services {
|
||||
|
||||
public WebService ()
|
||||
{
|
||||
_context = HttpContext.Current;
|
||||
}
|
||||
|
||||
#endregion // Constructors
|
||||
|
||||
#region Properties
|
||||
|
||||
internal void SetContext (HttpContext context)
|
||||
{
|
||||
_context = context;
|
||||
}
|
||||
|
||||
[Browsable (false)]
|
||||
[Description ("The ASP.NET application object for the current request.")]
|
||||
[DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
|
||||
|
||||
@@ -1,7 +1,3 @@
|
||||
2004-08-25 Lluis Sanchez Gual <[email protected]>
|
||||
|
||||
* server/SessionCounter.asmx: Check that Context != null in the constructor.
|
||||
|
||||
2004-06-22 Lluis Sanchez Gual <[email protected]>
|
||||
|
||||
* proxies.net.xml.gz: Updated.
|
||||
|
||||
@@ -8,12 +8,6 @@
|
||||
{
|
||||
public class SessionCounter: System.Web.Services.WebService
|
||||
{
|
||||
public SessionCounter ()
|
||||
{
|
||||
if (Context == null)
|
||||
throw new Exception ("Context not set in constructor");
|
||||
}
|
||||
|
||||
[ WebMethod(EnableSession=true) ]
|
||||
public void Reset()
|
||||
{
|
||||
|
||||
@@ -49,7 +49,7 @@ namespace System.Web.Compilation
|
||||
this.Location = location;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
class BuilderLocationStack : Stack
|
||||
{
|
||||
public override void Push (object o)
|
||||
@@ -138,7 +138,6 @@ namespace System.Web.Compilation
|
||||
bool inScript, javascript;
|
||||
ILocation location;
|
||||
bool isApplication;
|
||||
StringBuilder tagInnerText = new StringBuilder ();
|
||||
static Hashtable emptyHash = new Hashtable ();
|
||||
|
||||
public AspGenerator (TemplateParser tparser)
|
||||
@@ -320,8 +319,8 @@ namespace System.Web.Compilation
|
||||
|
||||
if (isvirtual) {
|
||||
file = tparser.MapPath (file);
|
||||
} else {
|
||||
file = GetIncludeFilePath (tparser.BaseDir, file);
|
||||
} else if (!Path.IsPathRooted (file)) {
|
||||
file = UrlUtils.Combine (tparser.BaseVirtualDir, file);
|
||||
}
|
||||
|
||||
InitParser (file);
|
||||
@@ -333,14 +332,6 @@ namespace System.Web.Compilation
|
||||
//PrintLocation (location);
|
||||
}
|
||||
|
||||
static string GetIncludeFilePath (string basedir, string filename)
|
||||
{
|
||||
if (Path.DirectorySeparatorChar == '/')
|
||||
filename = filename.Replace ("\\", "/");
|
||||
|
||||
return Path.GetFullPath (Path.Combine (basedir, filename));
|
||||
}
|
||||
|
||||
void TextParsed (ILocation location, string text)
|
||||
{
|
||||
if (text.IndexOf ("<%") != -1 && !inScript) {
|
||||
@@ -368,11 +359,7 @@ namespace System.Web.Compilation
|
||||
if (tparser.DefaultDirectiveName == "application" && t.Trim () != "")
|
||||
throw new ParseException (location, "Content not valid for application file.");
|
||||
|
||||
ControlBuilder current = stack.Builder;
|
||||
current.AppendLiteralString (t);
|
||||
if (current.NeedsTagInnerText ()) {
|
||||
tagInnerText.Append (t);
|
||||
}
|
||||
stack.Builder.AppendLiteralString (t);
|
||||
}
|
||||
|
||||
bool ProcessTag (string tagid, TagAttributes atts, TagType tagtype)
|
||||
@@ -498,16 +485,6 @@ namespace System.Web.Compilation
|
||||
|
||||
// if (current is TemplateBuilder)
|
||||
// pop from the id list
|
||||
if (current.NeedsTagInnerText ()) {
|
||||
try {
|
||||
current.SetTagInnerText (tagInnerText.ToString ());
|
||||
} catch (Exception e) {
|
||||
throw new ParseException (current.location, e.Message, e);
|
||||
}
|
||||
|
||||
tagInnerText.Length = 0;
|
||||
}
|
||||
|
||||
current.CloseControl ();
|
||||
stack.Pop ();
|
||||
stack.Builder.AppendSubBuilder (current);
|
||||
|
||||
@@ -184,15 +184,12 @@ namespace System.Web.Compilation
|
||||
str = str.Substring (2).Trim ();
|
||||
int len = str.Length;
|
||||
int lastQuote = str.LastIndexOf ('"');
|
||||
if (len < 10 || lastQuote != len - 1)
|
||||
return false;
|
||||
|
||||
if (!str.ToLower ().StartsWith ("#include "))
|
||||
if (len < 10 || lastQuote != len - 1 || !str.StartsWith ("#include "))
|
||||
return false;
|
||||
|
||||
str = str.Substring (9).Trim ();
|
||||
bool isfile = (str.ToLower ().StartsWith ("file"));
|
||||
if (!isfile && !str.ToLower ().StartsWith ("virtual"))
|
||||
bool isfile = (str.StartsWith ("file"));
|
||||
if (!isfile && !str.StartsWith ("virtual"))
|
||||
return false;
|
||||
|
||||
pathType = (isfile) ? "file" : "virtual";
|
||||
|
||||
@@ -284,7 +284,7 @@ namespace System.Web.Compilation
|
||||
|
||||
public virtual Type GetCompiledType ()
|
||||
{
|
||||
Type type = CachingCompiler.GetTypeFromCache (parser.InputFile);
|
||||
Type type = CachingCompiler.GetTypeFromCache (parser.InputFile, parser.ClassName);
|
||||
if (type != null)
|
||||
return type;
|
||||
|
||||
@@ -309,7 +309,7 @@ namespace System.Web.Compilation
|
||||
bool keepFiles = (Environment.GetEnvironmentVariable ("MONO_ASPNET_NODELETE") != null);
|
||||
TempFileCollection tempcoll = new TempFileCollection (config.TempDirectory, keepFiles);
|
||||
compilerParameters.TempFiles = tempcoll;
|
||||
string dllfilename = Path.GetFileName (tempcoll.AddExtension ("dll", true));
|
||||
string dllfilename = tempcoll.AddExtension ("dll", true);
|
||||
if (!Directory.Exists (dynamicBase))
|
||||
Directory.CreateDirectory (dynamicBase);
|
||||
|
||||
|
||||
@@ -1,41 +0,0 @@
|
||||
//
|
||||
// System.Web.Compilation.BuildProviderResultFlags.cs
|
||||
//
|
||||
// Authors:
|
||||
// Duncan Mak ([email protected])
|
||||
//
|
||||
// Permission is hereby granted, free of charge, to any person obtaining
|
||||
// a copy of this software and associated documentation files (the
|
||||
// "Software"), to deal in the Software without restriction, including
|
||||
// without limitation the rights to use, copy, modify, merge, publish,
|
||||
// distribute, sublicense, and/or sell copies of the Software, and to
|
||||
// permit persons to whom the Software is furnished to do so, subject to
|
||||
// the following conditions:
|
||||
//
|
||||
// The above copyright notice and this permission notice shall be
|
||||
// included in all copies or substantial portions of the Software.
|
||||
//
|
||||
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
|
||||
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
||||
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
//
|
||||
// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
|
||||
//
|
||||
|
||||
using System.Resources;
|
||||
|
||||
#if NET_2_0
|
||||
namespace System.Web.Compilation
|
||||
{
|
||||
[Serializable, Flags]
|
||||
public enum BuildProviderResultFlags
|
||||
{
|
||||
Default = 0,
|
||||
ShutdownAppDomainOnChange = 1
|
||||
}
|
||||
}
|
||||
#endif
|
||||
@@ -32,7 +32,6 @@ using System;
|
||||
using System.CodeDom.Compiler;
|
||||
using System.Collections;
|
||||
using System.Collections.Specialized;
|
||||
using System.IO;
|
||||
using System.Reflection;
|
||||
using System.Web.UI;
|
||||
using System.Web.Caching;
|
||||
@@ -44,20 +43,21 @@ namespace System.Web.Compilation
|
||||
{
|
||||
static object compilationLock = new object ();
|
||||
const string cachePrefix = "@@Assembly";
|
||||
const string cacheTypePrefix = "@@@Type";
|
||||
|
||||
public static void InsertType (Type type, string filename)
|
||||
public static Type GetTypeFromCache (string filename, string typename)
|
||||
{
|
||||
string [] cacheKeys = new string [] { cachePrefix + filename };
|
||||
CacheDependency dep = new CacheDependency (null, cacheKeys);
|
||||
HttpRuntime.Cache.Insert (cacheTypePrefix + filename, type, dep);
|
||||
}
|
||||
string key = CachingCompiler.cachePrefix + filename;
|
||||
CompilerResults results = (CompilerResults) HttpRuntime.Cache [key];
|
||||
if (results == null)
|
||||
return null;
|
||||
|
||||
public static Type GetTypeFromCache (string filename)
|
||||
{
|
||||
return (Type) HttpRuntime.Cache [cacheTypePrefix + filename];
|
||||
}
|
||||
Assembly a = results.CompiledAssembly;
|
||||
if (a == null)
|
||||
return null;
|
||||
|
||||
return a.GetType (typename, false);
|
||||
}
|
||||
|
||||
public static CompilerResults Compile (BaseCompiler compiler)
|
||||
{
|
||||
Cache cache = HttpRuntime.Cache;
|
||||
@@ -139,39 +139,12 @@ namespace System.Web.Compilation
|
||||
ICodeCompiler compiler = provider.CreateCompiler ();
|
||||
CompilerParameters options = GetOptions (assemblies);
|
||||
results = compiler.CompileAssemblyFromFile (options, file);
|
||||
ArrayList realdeps = new ArrayList (assemblies.Count);
|
||||
for (int i = assemblies.Count - 1; i >= 0; i--) {
|
||||
string current = (string) assemblies [i];
|
||||
if (Path.IsPathRooted (current))
|
||||
realdeps.Add (current);
|
||||
}
|
||||
|
||||
string [] deps = (string []) realdeps.ToArray (typeof (string));
|
||||
string [] deps = (string []) assemblies.ToArray (typeof (string));
|
||||
cache.Insert (cachePrefix + key, results, new CacheDependency (deps));
|
||||
}
|
||||
|
||||
return results;
|
||||
}
|
||||
|
||||
public static Type CompileAndGetType (string typename, string language, string key,
|
||||
string file, ArrayList assemblies)
|
||||
{
|
||||
CompilerResults result = CachingCompiler.Compile (language, key, file, assemblies);
|
||||
if (result.NativeCompilerReturnValue != 0) {
|
||||
StreamReader reader = new StreamReader (file);
|
||||
throw new CompilationException (file, result.Errors, reader.ReadToEnd ());
|
||||
}
|
||||
|
||||
Assembly assembly = result.CompiledAssembly;
|
||||
if (assembly == null) {
|
||||
StreamReader reader = new StreamReader (file);
|
||||
throw new CompilationException (file, result.Errors, reader.ReadToEnd ());
|
||||
}
|
||||
|
||||
Type type = assembly.GetType (typename, true);
|
||||
InsertType (type, file);
|
||||
return type;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,42 +1,3 @@
|
||||
2004-09-08 Gonzalo Paniagua Javier <[email protected]>
|
||||
|
||||
* WebServiceCompiler.cs: fix buglet in my last commit.
|
||||
|
||||
2004-09-05 Gonzalo Paniagua Javier <[email protected]>
|
||||
|
||||
* BaseCompiler.cs:
|
||||
* CachingCompiler.cs:
|
||||
* WebServiceCompiler.cs: correctly cache Type instead of the assembly
|
||||
for ashx/asmx. Otherwise we need to open the file and check for the
|
||||
class name in there. Thanks to Ben for pointing this out.
|
||||
|
||||
2004-09-01 Gonzalo Paniagua Javier <[email protected]>
|
||||
|
||||
* CachingCompiler.cs: don't try to watch for changes in system
|
||||
assemblies. Fixes bug #64871.
|
||||
|
||||
2004-09-01 Gonzalo Paniagua Javier <[email protected]>
|
||||
|
||||
* AspGenerator.cs: handle builders that need to process inner text
|
||||
with tags.
|
||||
|
||||
* Location.cs: added setters for the properties.
|
||||
|
||||
2004-07-21 Gonzalo Paniagua Javier <[email protected]>
|
||||
|
||||
* AspGenerator.cs: the path for file was treated as virtual, but it's
|
||||
physical. Fixes bug #61524.
|
||||
|
||||
2004-07-16 Gonzalo Paniagua Javier <[email protected]>
|
||||
|
||||
* AspParser.cs: fixed case-sensitivity issues with #include and its
|
||||
attributes. Closes #61429.
|
||||
|
||||
2004-07-07 Gonzalo Paniagua Javier <[email protected]>
|
||||
|
||||
* BaseCompiler.cs:
|
||||
* WebServiceCompiler.cs: really create the dlls under DynamicBase
|
||||
|
||||
2004-06-19 Gonzalo Paniagua Javier <[email protected]>
|
||||
|
||||
* TemplateControlCompiler.cs: for system colors, use SystemColors class
|
||||
|
||||
@@ -1,42 +0,0 @@
|
||||
//
|
||||
// System.Web.Compilation.IImplicitResourceProvider.cs
|
||||
//
|
||||
// Authors:
|
||||
// Duncan Mak ([email protected])
|
||||
//
|
||||
// Permission is hereby granted, free of charge, to any person obtaining
|
||||
// a copy of this software and associated documentation files (the
|
||||
// "Software"), to deal in the Software without restriction, including
|
||||
// without limitation the rights to use, copy, modify, merge, publish,
|
||||
// distribute, sublicense, and/or sell copies of the Software, and to
|
||||
// permit persons to whom the Software is furnished to do so, subject to
|
||||
// the following conditions:
|
||||
//
|
||||
// The above copyright notice and this permission notice shall be
|
||||
// included in all copies or substantial portions of the Software.
|
||||
//
|
||||
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
|
||||
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
||||
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
//
|
||||
// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
|
||||
//
|
||||
|
||||
#if NET_2_0
|
||||
|
||||
using System.Collections;
|
||||
using System.Globalization;
|
||||
|
||||
namespace System.Web.Compilation
|
||||
{
|
||||
public interface IImplicitResourceProvider
|
||||
{
|
||||
object GetObject (ImplicitResourceKey key, CultureInfo culture);
|
||||
ICollection GetResources (string keyPrefix);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
@@ -1,39 +0,0 @@
|
||||
//
|
||||
// System.Web.Compilation.IResourceProvider.cs
|
||||
//
|
||||
// Authors:
|
||||
// Duncan Mak ([email protected])
|
||||
//
|
||||
// Permission is hereby granted, free of charge, to any person obtaining
|
||||
// a copy of this software and associated documentation files (the
|
||||
// "Software"), to deal in the Software without restriction, including
|
||||
// without limitation the rights to use, copy, modify, merge, publish,
|
||||
// distribute, sublicense, and/or sell copies of the Software, and to
|
||||
// permit persons to whom the Software is furnished to do so, subject to
|
||||
// the following conditions:
|
||||
//
|
||||
// The above copyright notice and this permission notice shall be
|
||||
// included in all copies or substantial portions of the Software.
|
||||
//
|
||||
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
|
||||
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
||||
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
//
|
||||
// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
|
||||
//
|
||||
|
||||
using System.Resources;
|
||||
|
||||
#if NET_2_0
|
||||
namespace System.Web.Compilation
|
||||
{
|
||||
public interface IResourceProvider
|
||||
{
|
||||
IResourceReader ResourceReader { get; }
|
||||
}
|
||||
}
|
||||
#endif
|
||||
@@ -1,43 +0,0 @@
|
||||
//
|
||||
// System.Web.Compilation.IImplicitResourceProvider.cs
|
||||
//
|
||||
// Authors:
|
||||
// Duncan Mak ([email protected])
|
||||
//
|
||||
// Permission is hereby granted, free of charge, to any person obtaining
|
||||
// a copy of this software and associated documentation files (the
|
||||
// "Software"), to deal in the Software without restriction, including
|
||||
// without limitation the rights to use, copy, modify, merge, publish,
|
||||
// distribute, sublicense, and/or sell copies of the Software, and to
|
||||
// permit persons to whom the Software is furnished to do so, subject to
|
||||
// the following conditions:
|
||||
//
|
||||
// The above copyright notice and this permission notice shall be
|
||||
// included in all copies or substantial portions of the Software.
|
||||
//
|
||||
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
|
||||
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
||||
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
//
|
||||
// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
|
||||
//
|
||||
|
||||
#if NET_2_0
|
||||
namespace System.Web.Compilation
|
||||
{
|
||||
public class ImplicitResourceKey
|
||||
{
|
||||
public ImplicitResourceKey ()
|
||||
{
|
||||
}
|
||||
|
||||
public string Filter;
|
||||
public string KeyPrefix;
|
||||
public string Property;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
@@ -65,27 +65,22 @@ namespace System.Web.Compilation
|
||||
|
||||
public int BeginLine {
|
||||
get { return beginLine; }
|
||||
set { beginLine = value; }
|
||||
}
|
||||
|
||||
public int EndLine {
|
||||
get { return endLine; }
|
||||
set { endLine = value; }
|
||||
}
|
||||
|
||||
public int BeginColumn {
|
||||
get { return beginColumn; }
|
||||
set { beginColumn = value; }
|
||||
}
|
||||
|
||||
public int EndColumn {
|
||||
get { return endColumn; }
|
||||
set { endColumn = value; }
|
||||
}
|
||||
|
||||
public string PlainText {
|
||||
get { return plainText; }
|
||||
set { plainText = value; }
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -59,15 +59,12 @@ namespace System.Web.Compilation
|
||||
|
||||
public override Type GetCompiledType ()
|
||||
{
|
||||
Type type = CachingCompiler.GetTypeFromCache (parser.PhysicalPath);
|
||||
Type type = CachingCompiler.GetTypeFromCache (parser.PhysicalPath, parser.ClassName);
|
||||
if (type != null)
|
||||
return type;
|
||||
|
||||
if (parser.Program.Trim () == "") {
|
||||
type = parser.GetTypeFromBin (parser.ClassName);
|
||||
CachingCompiler.InsertType (type, parser.PhysicalPath);
|
||||
return type;
|
||||
}
|
||||
if (parser.Program.Trim () == "")
|
||||
return parser.GetTypeFromBin (parser.ClassName);
|
||||
|
||||
string lang = parser.Language;
|
||||
CompilationConfiguration config;
|
||||
@@ -96,7 +93,7 @@ namespace System.Web.Compilation
|
||||
sw.WriteLine (parser.Program);
|
||||
sw.Close ();
|
||||
|
||||
string dllfilename = Path.GetFileName (tempcoll.AddExtension ("dll", true));
|
||||
string dllfilename = tempcoll.AddExtension ("dll", true);
|
||||
if (!Directory.Exists (dynamicBase))
|
||||
Directory.CreateDirectory (dynamicBase);
|
||||
|
||||
@@ -109,9 +106,7 @@ namespace System.Web.Compilation
|
||||
"No assembly returned after compilation!?");
|
||||
|
||||
results.TempFiles.Delete ();
|
||||
type = results.CompiledAssembly.GetType (parser.ClassName, true);
|
||||
CachingCompiler.InsertType (type, parser.PhysicalPath);
|
||||
return type;
|
||||
return results.CompiledAssembly.GetType (parser.ClassName, true);
|
||||
}
|
||||
|
||||
void CheckCompilerErrors (CompilerResults results)
|
||||
|
||||
@@ -1,8 +1,3 @@
|
||||
2004-08-22 Gonzalo Paniagua Javier <[email protected]>
|
||||
|
||||
* WebConfigurationSettings.cs: fix bug when processing empty location
|
||||
tags. Closes bug #63001.
|
||||
|
||||
2004-06-23 Gonzalo Paniagua Javier <[email protected]>
|
||||
|
||||
* AuthorizationConfig.cs: really fix bug #60482. Thanks David!
|
||||
|
||||
@@ -791,13 +791,16 @@ namespace System.Web.Configuration
|
||||
|
||||
void StoreLocation (string name, XmlTextReader reader)
|
||||
{
|
||||
if (locations == null) {
|
||||
locations = new Hashtable ();
|
||||
}
|
||||
|
||||
string path = null;
|
||||
bool haveAllow = false;
|
||||
bool allowOverride = true;
|
||||
string att = null;
|
||||
|
||||
while (reader.MoveToNextAttribute ()) {
|
||||
att = reader.Name;
|
||||
string att = reader.Name;
|
||||
|
||||
if (att == "path") {
|
||||
if (path != null)
|
||||
@@ -827,13 +830,8 @@ namespace System.Web.Configuration
|
||||
ThrowException ("Unrecognized attribute.", reader);
|
||||
}
|
||||
|
||||
if (att == null)
|
||||
return; // empty location tag
|
||||
|
||||
Location loc = new Location (this, path, allowOverride);
|
||||
if (locations == null)
|
||||
locations = new Hashtable ();
|
||||
else if (locations.ContainsKey (loc.Path))
|
||||
if (locations.ContainsKey (loc.Path))
|
||||
ThrowException ("Duplicated location path: " + loc.Path, reader);
|
||||
|
||||
reader.MoveToElement ();
|
||||
|
||||
@@ -1,7 +1,3 @@
|
||||
2004-07-02 Gonzalo Paniagua Javier <[email protected]>
|
||||
|
||||
* TraceHandler.cs: check that trace is enabled or throw.
|
||||
|
||||
2004-06-03 Gonzalo Paniagua Javier <[email protected]>
|
||||
|
||||
* TraceHandler.cs: Added protected missing members and attributes.
|
||||
|
||||
@@ -39,27 +39,16 @@ using System.Web.UI.WebControls;
|
||||
|
||||
namespace System.Web.Handlers
|
||||
{
|
||||
#if NET_2_0
|
||||
[Serializable]
|
||||
#endif
|
||||
class TraceNotAvailableException : HttpException
|
||||
{
|
||||
public TraceNotAvailableException () :
|
||||
base ("Trace Error") {}
|
||||
|
||||
internal override string Description {
|
||||
get { return "Trace.axd is not enabled in the configuration file for this application."; }
|
||||
}
|
||||
}
|
||||
|
||||
public class TraceHandler : IHttpHandler
|
||||
{
|
||||
void IHttpHandler.ProcessRequest (HttpContext context)
|
||||
{
|
||||
TraceManager manager = HttpRuntime.TraceManager;
|
||||
|
||||
if (!manager.Enabled || manager.LocalOnly && !context.Request.IsLocal) {
|
||||
throw new TraceNotAvailableException ();
|
||||
if (manager.LocalOnly && !context.Request.IsLocal) {
|
||||
// Need to figure out the error message that goes here
|
||||
// but I only have cassini for testing
|
||||
return;
|
||||
}
|
||||
|
||||
HtmlTextWriter output = new HtmlTextWriter (context.Response.Output);
|
||||
|
||||
@@ -1,16 +1,3 @@
|
||||
2004-08-30 Sanjay Gupta <[email protected]>
|
||||
|
||||
* MailMessage.cs:
|
||||
* MailMessageWrapper.cs:
|
||||
* SmtpClient.cs: Fields property of MailMessage from .Net 1.1 was not
|
||||
handled completely.
|
||||
|
||||
2004-08-10 Gonzalo Paniagua Javier <[email protected]>
|
||||
|
||||
* SmtpClient.cs: multipart mails default body format is now the same as
|
||||
the one used for single part mails instead of being forced to
|
||||
"text/plain".
|
||||
|
||||
2004-02-27 Gonzalo Paniagua Javier <[email protected]>
|
||||
|
||||
* MailMessage.cs: patch by John Luke that initialized the fields in
|
||||
|
||||
@@ -51,6 +51,7 @@ namespace System.Web.Mail
|
||||
private string to;
|
||||
private string urlContentBase;
|
||||
private string urlContentLocation;
|
||||
private Hashtable fields;
|
||||
|
||||
// Constructor
|
||||
public MailMessage ()
|
||||
@@ -58,9 +59,7 @@ namespace System.Web.Mail
|
||||
attachments = new ArrayList (8);
|
||||
headers = new ListDictionary ();
|
||||
bodyEncoding = Encoding.Default;
|
||||
#if NET_1_1
|
||||
fields = new Hashtable ();
|
||||
#endif
|
||||
}
|
||||
|
||||
// Properties
|
||||
@@ -128,8 +127,6 @@ namespace System.Web.Mail
|
||||
}
|
||||
|
||||
#if NET_1_1
|
||||
private Hashtable fields;
|
||||
|
||||
public IDictionary Fields {
|
||||
get {
|
||||
return (IDictionary) fields;
|
||||
|
||||
@@ -227,19 +227,6 @@ namespace System.Web.Mail {
|
||||
public string UrlContentLocation {
|
||||
get { return message.UrlContentLocation; }
|
||||
}
|
||||
|
||||
#if NET_1_1
|
||||
public MailHeader Fields {
|
||||
get {
|
||||
MailHeader bodyHeaders = new MailHeader();
|
||||
// Add Fields to MailHeader Object
|
||||
foreach( string key in message.Fields.Keys )
|
||||
bodyHeaders.Data[ key ] = (string)this.message.Fields[ key ];
|
||||
return bodyHeaders;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
@@ -140,7 +140,6 @@ namespace System.Web.Mail {
|
||||
string boundary = MailUtil.GenerateBoundary();
|
||||
|
||||
// set the Content-Type header to multipart/mixed
|
||||
string bodyContentType = msg.Header.ContentType;
|
||||
msg.Header.ContentType =
|
||||
String.Format( "multipart/mixed;\r\n boundary={0}" , boundary );
|
||||
|
||||
@@ -152,13 +151,7 @@ namespace System.Web.Mail {
|
||||
smtp.WriteBoundary( boundary );
|
||||
|
||||
MailHeader partHeader = new MailHeader();
|
||||
partHeader.ContentType = bodyContentType;
|
||||
|
||||
#if NET_1_1
|
||||
// Add all the custom headers to body part as specified in
|
||||
//Fields property of MailMessageWrapper
|
||||
partHeader.Data.Add(msg.Fields.Data);
|
||||
#endif
|
||||
partHeader.ContentType = "text/plain";
|
||||
|
||||
smtp.WriteHeader( partHeader );
|
||||
|
||||
|
||||
@@ -1,12 +1,3 @@
|
||||
2004-08-23 Gonzalo Paniagua Javier <[email protected]>
|
||||
|
||||
* FormsAuthentication.cs: patch by Jim Pease to fix the date on renewal.
|
||||
|
||||
2004-08-22 Gonzalo Paniagua Javier <[email protected]>
|
||||
|
||||
* FormsAuthenticationModule.cs: don't renew expired cookies. Only renew
|
||||
the cookie if SlidingExpiration is set. Thanks to Jim Pease.
|
||||
|
||||
2004-06-12 Pedro Martínez Juliá <[email protected]>
|
||||
|
||||
* FormsAuthentication.cs: Undo last change.
|
||||
|
||||
@@ -311,7 +311,7 @@ namespace System.Web.Security
|
||||
return tOld;
|
||||
|
||||
FormsAuthenticationTicket tNew = tOld.Clone ();
|
||||
tNew.SetDates (now, now + (tOld.Expiration - tOld.IssueDate));
|
||||
tNew.SetDates (now, now - toExpiration + toIssue);
|
||||
return tNew;
|
||||
}
|
||||
|
||||
|
||||
@@ -82,12 +82,7 @@ namespace System.Web.Security
|
||||
return;
|
||||
|
||||
FormsAuthenticationTicket ticket = FormsAuthentication.Decrypt (cookie.Value);
|
||||
if (ticket == null || ticket.Expired)
|
||||
return;
|
||||
|
||||
if (config.SlidingExpiration)
|
||||
ticket = FormsAuthentication.RenewTicketIfOld (ticket);
|
||||
|
||||
ticket = FormsAuthentication.RenewTicketIfOld (ticket);
|
||||
context.User = new GenericPrincipal (new FormsIdentity (ticket), new string [0]);
|
||||
|
||||
cookie.Value = FormsAuthentication.Encrypt (ticket);
|
||||
|
||||
@@ -1,8 +1,3 @@
|
||||
2004-07-07 Juraj Skripsky <[email protected]>
|
||||
|
||||
* SessionStateModule.cs: set path in session cookie to application
|
||||
path.
|
||||
|
||||
2004-06-18 Gert Driesen <[email protected]>
|
||||
|
||||
* IStateRuntime.cs: added missing marshalling attributes
|
||||
|
||||
@@ -158,7 +158,7 @@ namespace System.Web.SessionState
|
||||
} else if (isNew) {
|
||||
string id = context.Session.SessionID;
|
||||
HttpCookie cookie = new HttpCookie (CookieName, id);
|
||||
cookie.Path = UrlUtils.GetDirectory (context.Request.ApplicationPath);
|
||||
cookie.Path = UrlUtils.GetDirectory (context.Request.Path);
|
||||
context.Response.AppendCookie (cookie);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -192,9 +192,7 @@ namespace System.Web.UI.WebControls
|
||||
if(!Visible || (Visible && !Enabled))
|
||||
{
|
||||
IsValid = true;
|
||||
return;
|
||||
}
|
||||
|
||||
Control ctrl = Parent;
|
||||
while(ctrl != null)
|
||||
{
|
||||
|
||||
@@ -1,27 +1,6 @@
|
||||
2004-09-01 Gonzalo Paniagua Javier <[email protected]>
|
||||
|
||||
* Xml.cs: fixed get_DocumentContent (it was returning "" always!) and
|
||||
don't call MapPathSecure on the content itself.
|
||||
|
||||
* XmlBuilder.cs: handle XML documents written inside asp:xml. The
|
||||
document is checked at parse time and will be checked again at run time.
|
||||
|
||||
Fixes bug #63828.
|
||||
|
||||
2004-08-10 Gonzalo Paniagua Javier <[email protected]>
|
||||
|
||||
* Xml.cs: use MapPath in DocumentSource and documentContent. Fixes
|
||||
bug #62726.
|
||||
|
||||
2004-07-29 Gonzalo Paniagua Javier <[email protected]>
|
||||
|
||||
* BaseValidator.cs: in Validate(), when the control is not visible or
|
||||
enabled, return inmediately after setting IsValid to true. Fixes bug
|
||||
#61831.
|
||||
|
||||
2004-06-10 Alon Gazit <[email protected]>
|
||||
* WebControl.cs: fixed LoadViewState().
|
||||
Creates new attributes state bag only when the current is null.
|
||||
* WebControl.cs: fixed LoadViewState().
|
||||
Creates new attributes state bag only when the current is null.
|
||||
|
||||
2004-06-07 Gonzalo Paniagua Javier <[email protected]>
|
||||
|
||||
|
||||
@@ -116,7 +116,7 @@ namespace System.Web.UI.WebControls
|
||||
[WebSysDescription ("The XML content that is transformed for the XML Webcontrol.")]
|
||||
public string DocumentContent {
|
||||
get {
|
||||
return documentContent;
|
||||
return String.Empty;
|
||||
}
|
||||
set {
|
||||
document = null;
|
||||
@@ -189,6 +189,7 @@ namespace System.Web.UI.WebControls
|
||||
GetType().Name));
|
||||
}
|
||||
|
||||
[MonoTODO("security")]
|
||||
private void LoadXpathDoc ()
|
||||
{
|
||||
if (documentContent != null && documentContent.Length > 0) {
|
||||
@@ -197,11 +198,12 @@ namespace System.Web.UI.WebControls
|
||||
}
|
||||
|
||||
if (documentSource != null && documentSource.Length != 0) {
|
||||
xpathDoc = new XPathDocument (MapPathSecure (documentSource));
|
||||
xpathDoc = new XPathDocument (documentSource);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
[MonoTODO("security")]
|
||||
private void LoadTransform ()
|
||||
{
|
||||
if (transform != null)
|
||||
|
||||
Loaded 100 of 259 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user