[Dotgnu-pnet-commits] CVS: pnetlib/runtime/System/Security/Permissions PrincipalPermission.cs,1.3,1.4 PublisherIdentityPermissionAttribute.cs,1.1,1.2

[Rhys Weatherley <address@hidden>]

Update of /cvsroot/dotgnu-pnet/pnetlib/runtime/System/Security/Permissions
In directory subversions:/tmp/cvs-serv9383/runtime/System/Security/Permissions

Modified Files:
        PrincipalPermission.cs PublisherIdentityPermissionAttribute.cs 
Log Message:


Fix minor semantic compile errors discovered by csc.


Index: PrincipalPermission.cs
===================================================================
RCS file: 
/cvsroot/dotgnu-pnet/pnetlib/runtime/System/Security/Permissions/PrincipalPermission.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** PrincipalPermission.cs      1 Apr 2003 06:42:09 -0000       1.3
--- PrincipalPermission.cs      5 Apr 2003 06:28:32 -0000       1.4
***************
*** 126,130 ****
  
        // Convert an XML value into a permissions value.
!       public override void FromXml(SecurityElement esd)
                        {
                                String value;
--- 126,130 ----
  
        // Convert an XML value into a permissions value.
!       public void FromXml(SecurityElement esd)
                        {
                                String value;
***************
*** 162,166 ****
  
        // Convert this permissions object into an XML value.
!       public override SecurityElement ToXml()
                        {
                                SecurityElement element;
--- 162,166 ----
  
        // Convert this permissions object into an XML value.
!       public SecurityElement ToXml()
                        {
                                SecurityElement element;

Index: PublisherIdentityPermissionAttribute.cs
===================================================================
RCS file: 
/cvsroot/dotgnu-pnet/pnetlib/runtime/System/Security/Permissions/PublisherIdentityPermissionAttribute.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** PublisherIdentityPermissionAttribute.cs     1 Apr 2003 02:16:31 -0000       
1.1
--- PublisherIdentityPermissionAttribute.cs     5 Apr 2003 06:28:32 -0000       
1.2
***************
*** 109,118 ****
                                else if(certFile != null)
                                {
!                                       certificate = 
X509Certificate.CreateFromCertFile(certFile);
                                }
                                else
                                {
!                                       certificate = 
X509Certificate.CreateFromSignedFile
!                                               (signedFile);
                                }
                                return new 
PublisherIdentityPermission(certificate);
--- 109,121 ----
                                else if(certFile != null)
                                {
!                                       certificate =
!                                               
System.Security.Cryptography.X509Certificates
!                                                       
.X509Certificate.CreateFromCertFile(certFile);
                                }
                                else
                                {
!                                       certificate = 
!                                               
System.Security.Cryptography.X509Certificates
!                                                       
.X509Certificate.CreateFromSignedFile(signedFile);
                                }
                                return new 
PublisherIdentityPermission(certificate);