diff options
| author | Sebastien Pouliot <sebastien@ximian.com> | 2004-09-07 16:25:36 +0400 |
|---|---|---|
| committer | Sebastien Pouliot <sebastien@ximian.com> | 2004-09-07 16:25:36 +0400 |
| commit | 3da5e0153a88705fd87365a156cb9c2ae8e894b8 (patch) | |
| tree | 567d3d3c9bed921b50dfd5a7b4574e07aef501bc /mcs | |
| parent | 52ef8cd96cb71e123409f25c277bab7afc48f1a1 (diff) | |
2004-09-07 Sebastien Pouliot <sebastien@ximian.com>
* X509Chain.cs: Merge bug fixes from HEAD.
svn path=/branches/mono-1-0/mcs/; revision=33510
Diffstat (limited to 'mcs')
| -rw-r--r-- | mcs/class/corlib/Mono.Security.X509/ChangeLog | 4 | ||||
| -rwxr-xr-x | mcs/class/corlib/Mono.Security.X509/X509Chain.cs | 9 |
2 files changed, 7 insertions, 6 deletions
diff --git a/mcs/class/corlib/Mono.Security.X509/ChangeLog b/mcs/class/corlib/Mono.Security.X509/ChangeLog index 5cfdfbd7a78..add41ab01a7 100644 --- a/mcs/class/corlib/Mono.Security.X509/ChangeLog +++ b/mcs/class/corlib/Mono.Security.X509/ChangeLog @@ -1,3 +1,7 @@ +2004-09-07 Sebastien Pouliot <sebastien@ximian.com> + + * X509Chain.cs: Merge bug fixes from HEAD. + 2004-05-27 Sebastien Pouliot <sebastien@ximian.com> * X509Certificate.cs: Rethrow original exception when parsing X.509 diff --git a/mcs/class/corlib/Mono.Security.X509/X509Chain.cs b/mcs/class/corlib/Mono.Security.X509/X509Chain.cs index 0ff5d875ac5..f8035e6c661 100755 --- a/mcs/class/corlib/Mono.Security.X509/X509Chain.cs +++ b/mcs/class/corlib/Mono.Security.X509/X509Chain.cs @@ -9,10 +9,6 @@ // Sebastien Pouliot <sebastien@ximian.com> // // (C) 2003 Motus Technologies Inc. (http://www.motus.com) -// (C) 2004 Novell (http://www.novell.com) -// - -// // Copyright (C) 2004 Novell, Inc (http://www.novell.com) // // Permission is hereby granted, free of charge, to any person obtaining @@ -136,7 +132,7 @@ namespace Mono.Security.X509 { tmp = FindCertificateParent (x); if (x != null) { _chain.Add (x); - tmp = x; // last valid + x = tmp; // last valid } } // find a trusted root @@ -193,7 +189,8 @@ namespace Mono.Security.X509 { _status = X509ChainStatusFlags.NoError; roots = null; // this force a reload certs.Clear (); - _chain.Clear (); + if (_chain != null) + _chain.Clear (); } // private stuff |