dnsmail-cvs

[Ethem E. <et...@us...>]

Update of /cvsroot/dnsmail/dnsmail
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv11100/dnsmail

Modified Files:
	UnsafeNativeMethods.cs 
Log Message:
Merged from DNSMAIL_0200

Index: UnsafeNativeMethods.cs
===================================================================
RCS file: /cvsroot/dnsmail/dnsmail/UnsafeNativeMethods.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** UnsafeNativeMethods.cs	6 Mar 2006 15:33:04 -0000	1.2
--- UnsafeNativeMethods.cs	22 May 2006 10:27:56 -0000	1.3
***************
*** 98,104 ****
  			[In,	MarshalAs(UnmanagedType.U2)]	UInt16 wType,
  			[In,	MarshalAs(UnmanagedType.U4)]	UInt32 fOptions,
! 			[In]									IntPtr aipServers,
! 			[In, Out]							ref IntPtr ppQueryResults,
! 			[In, Out]								IntPtr pReserved
  		);
  		#endregion
--- 98,104 ----
  			[In,	MarshalAs(UnmanagedType.U2)]	UInt16 wType,
  			[In,	MarshalAs(UnmanagedType.U4)]	UInt32 fOptions,
! 			[In]					IntPtr aipServers,
! 			[In, Out]				ref IntPtr ppQueryResults,
! 			[In, Out]				IntPtr pReserved
  		);
  		#endregion
***************
*** 171,175 ****
  				}
  				else
!                     return new string[0]{}; //length=0
  			}
  			finally
--- 171,175 ----
  				}
  				else
! 					return new string[0]{}; //length=0
  			}
  			finally
***************
*** 183,187 ****
  			}
  		}
! 		#endregion		
  	}
  
--- 183,187 ----
  			}
  		}
! 		#endregion
  	}
  
***************
*** 190,194 ****
  		private UnsafeOpenSsl(){}
  		private const String LIB_EAY = @"libeay32.dll";
! 		private const String LIB_SSL = @"ssleay32.dll";		
  
  		[DllImport(LIB_SSL)] internal static extern int		SSL_library_init();
--- 190,194 ----
  		private UnsafeOpenSsl(){}
  		private const String LIB_EAY = @"libeay32.dll";
! 		private const String LIB_SSL = @"ssleay32.dll";
  
  		[DllImport(LIB_SSL)] internal static extern int		SSL_library_init();
***************
*** 206,210 ****
  		[DllImport(LIB_SSL)] internal static extern int		SSL_read(IntPtr ssl, byte* buf, int num);
  		[DllImport(LIB_SSL)] internal static extern int		SSL_write(IntPtr ssl, byte* buf, int num);
! 		[DllImport(LIB_SSL)] internal static extern	IntPtr	SSL_get_peer_certificate(IntPtr ssl);
  		[DllImport(LIB_SSL)] internal static extern int		SSL_get_error(IntPtr ssl, int ret);
  
--- 206,210 ----
  		[DllImport(LIB_SSL)] internal static extern int		SSL_read(IntPtr ssl, byte* buf, int num);
  		[DllImport(LIB_SSL)] internal static extern int		SSL_write(IntPtr ssl, byte* buf, int num);
! 		[DllImport(LIB_SSL)] internal static extern IntPtr	SSL_get_peer_certificate(IntPtr ssl);
  		[DllImport(LIB_SSL)] internal static extern int		SSL_get_error(IntPtr ssl, int ret);
  
***************
*** 213,218 ****
  		[DllImport(LIB_EAY)] internal static extern int		ERR_peek_error();
  		[DllImport(LIB_EAY)] internal static extern String	ERR_error_string_n(int e, System.Text.StringBuilder sb, int l);
! 		[DllImport(LIB_EAY)] internal static extern	void	X509_free(IntPtr x509);
! 		[DllImport(LIB_EAY)] internal static extern	int		i2d_X509(IntPtr cer, byte** ppOut);
  	}
  };
--- 213,218 ----
  		[DllImport(LIB_EAY)] internal static extern int		ERR_peek_error();
  		[DllImport(LIB_EAY)] internal static extern String	ERR_error_string_n(int e, System.Text.StringBuilder sb, int l);
! 		[DllImport(LIB_EAY)] internal static extern void	X509_free(IntPtr x509);
! 		[DllImport(LIB_EAY)] internal static extern int		i2d_X509(IntPtr cer, byte** ppOut);
  	}
  };