Index: mswin32/Makefile
===================================================================
--- mswin32/Makefile	(revision 7357)
+++ mswin32/Makefile	(working copy)
@@ -5,6 +5,7 @@
 COMMA_VERSION=$(shell echo $(NMAP_NUM_VERSION) | tr '.' ',')
 LOGLOC=c:nmapbuild.log
 NSE_FILES = scripts/script.db scripts/*.nse
+OPENSSL_DIR=/c/OpenSSL
 
 winbuild:
 # VCExpress.exe is devenv.com with the commercial Visual Studio suite instead of VC++ Express
@@ -22,6 +23,7 @@
 	rm -rf nmap-$(NMAP_VERSION)
 	mkdir nmap-$(NMAP_VERSION)
 	cd Release && cp -r ../../CHANGELOG ../../COPYING nmap-mac-prefixes nmap-os-db nmap-protocols nmap-rpc nmap-service-probes nmap-services nmap.exe nmap.xsl ../nmap_performance.reg ../../README-WIN32 ../nmap-$(NMAP_VERSION)/
+	cp -f $(OPENSSL_DIR)/bin/libeay32.dll $(OPENSSL_DIR)/bin/ssleay32.dll ./nmap-$(NMAP_VERSION)/
 	mkdir nmap-$(NMAP_VERSION)/scripts
 	cd Release && cp -f $(NSE_FILES) ../nmap-$(NMAP_VERSION)/scripts/
 	mkdir nmap-$(NMAP_VERSION)/nselib
Index: mswin32/nmap.vcproj
===================================================================
--- mswin32/nmap.vcproj	(revision 7357)
+++ mswin32/nmap.vcproj	(working copy)
@@ -44,7 +44,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\liblua;.;..;../nbase;../libpcre;winip;..\nsock\include;&quot;pcap-include&quot;;&quot;..\libdnet-stripped\include&quot;"
+				AdditionalIncludeDirectories="..\liblua;.;..;../nbase;../libpcre;winip;..\nsock\include;&quot;pcap-include&quot;;&quot;..\libdnet-stripped\include&quot;;C:\OpenSSL\include;"
 				PreprocessorDefinitions="WIN32;_CONSOLE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -66,11 +66,11 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="liblua.lib nsock.lib libpcre.lib nbase.lib libdnet-stripped.lib ws2_32.lib IPHlpAPI.Lib wpcap.lib packet.lib advapi32.lib $(NOINHERIT)"
+				AdditionalDependencies="liblua.lib nsock.lib libpcre.lib nbase.lib libdnet-stripped.lib ws2_32.lib IPHlpAPI.Lib wpcap.lib packet.lib advapi32.lib libeay32.lib ssleay32.lib $(NOINHERIT)"
 				OutputFile=".\Debug\nmap.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="lib;..\liblua;..\libpcre;..\nsock;..\nbase;&quot;..\libdnet-stripped&quot;"
+				AdditionalLibraryDirectories="lib;..\liblua;..\libpcre;..\nsock;..\nbase;&quot;..\libdnet-stripped&quot;;C:\OpenSSL\lib;"
 				IgnoreDefaultLibraryNames=""
 				DelayLoadDLLs="packet.dll,wpcap.dll,iphlpapi.dll"
 				GenerateDebugInformation="true"
@@ -102,7 +102,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="xcopy &quot;$(SolutionDir)..\scripts&quot; &quot;.\$(ConfigurationName)\scripts\&quot; /e /y &amp;&amp; xcopy &quot;$(SolutionDir)..\nselib\*.lua&quot; &quot;$(SolutionDir)\$(ConfigurationName)\nselib\&quot;  /y"
+				CommandLine="xcopy &quot;$(SolutionDir)..\scripts&quot; &quot;.\$(ConfigurationName)\scripts\&quot; /e /y &amp;&amp; xcopy &quot;$(SolutionDir)..\nselib\*.lua&quot; &quot;$(SolutionDir)\$(ConfigurationName)\nselib\&quot; /y &amp;&amp; xcopy &quot;\OpenSSL\bin\*.dll&quot; &quot;$(SolutionDir)\$(ConfigurationName)&quot; /y"
 			/>
 		</Configuration>
 		<Configuration
@@ -136,7 +136,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories=".;..;../liblua;../nbase;../libpcre;winip;..\nsock\include;&quot;pcap-include&quot;;&quot;..\libdnet-stripped\include&quot;"
+				AdditionalIncludeDirectories=".;..;../liblua;../nbase;../libpcre;winip;..\nsock\include;&quot;pcap-include&quot;;&quot;..\libdnet-stripped\include&quot;;C:\OpenSSL\include;"
 				PreprocessorDefinitions="WIN32;_CONSOLE"
 				StringPooling="true"
 				RuntimeLibrary="0"
@@ -157,11 +157,11 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="liblua.lib nsock.lib libpcre.lib nbase.lib libdnet-stripped.lib ws2_32.lib IPHlpAPI.Lib wpcap.lib packet.lib advapi32.lib $(NOINHERIT)"
+				AdditionalDependencies="liblua.lib nsock.lib libpcre.lib nbase.lib libdnet-stripped.lib ws2_32.lib IPHlpAPI.Lib wpcap.lib packet.lib advapi32.lib libeay32.lib ssleay32.lib $(NOINHERIT)"
 				OutputFile=".\Release/nmap.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="lib;..\liblua;..\libpcre;..\nsock;..\nbase;&quot;..\libdnet-stripped&quot;"
+				AdditionalLibraryDirectories="lib;..\liblua;..\libpcre;..\nsock;..\nbase;&quot;..\libdnet-stripped&quot;;C:\OpenSSL\lib;"
 				IgnoreDefaultLibraryNames=""
 				DelayLoadDLLs="packet.dll,wpcap.dll,iphlpapi.dll"
 				ProgramDatabaseFile=".\Release/nmap.pdb"
@@ -192,7 +192,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="xcopy &quot;$(SolutionDir)..\scripts&quot; &quot;.\$(ConfigurationName)\scripts\&quot; /e /y &amp;&amp; xcopy &quot;$(SolutionDir)..\nselib\*.lua&quot; &quot;$(SolutionDir)\$(ConfigurationName)\nselib\&quot;  /y"
+				CommandLine="xcopy &quot;$(SolutionDir)..\scripts&quot; &quot;.\$(ConfigurationName)\scripts\&quot; /e /y &amp;&amp; xcopy &quot;$(SolutionDir)..\nselib\*.lua&quot; &quot;$(SolutionDir)\$(ConfigurationName)\nselib\&quot; /y &amp;&amp; xcopy &quot;\OpenSSL\bin\*.dll&quot; &quot;$(SolutionDir)\$(ConfigurationName)&quot; /y"
 			/>
 		</Configuration>
 	</Configurations>
Index: mswin32/nsis/Nmap.nsi
===================================================================
--- mswin32/nsis/Nmap.nsi	(revision 7357)
+++ mswin32/nsis/Nmap.nsi	(working copy)
@@ -152,6 +152,8 @@
   File ..\..\docs\nmap.xsl 
   File ..\nmap_performance.reg 
   File ..\..\README-WIN32 
+  File libeay32.dll
+  File ssleay32.dll
   File /r /x mswin32 /x .svn ..\..\scripts
   File /r /x mswin32 /x .svn ..\Release\nselib
   File /r /x mswin32 /x .svn ..\Release\nselib-bin
@@ -267,6 +269,8 @@
   Delete "$INSTDIR\nmap_performance.reg" 
   Delete "$INSTDIR\README-WIN32" 
   Delete "$INSTDIR\icon1.ico"
+  Delete "$INSTDIR\libeay32.dll"
+  Delete "$INSTDIR\ssleay32.dll"
   Delete "$INSTDIR\winpcap-nmap*.exe"
   ;Delete specific subfolders (NB: custom scripts in scripts folder will be lost)
   RMDir /r "$INSTDIR\nselib"
Index: nmap_winconfig.h
===================================================================
--- nmap_winconfig.h	(revision 7357)
+++ nmap_winconfig.h	(working copy)
@@ -111,6 +111,7 @@
 #define NMAP_PLATFORM "i686-pc-windows-windows"
 #define NMAPDATADIR "c:\\nmap" /* FIXME: I really need to make this dynamic */
 
+#define HAVE_OPENSSL 1
 /* Apparently __func__ isn't yet supported */
 #define __func__ __FUNCTION__
 
Index: nsock/include/nsock.h
===================================================================
--- nsock/include/nsock.h	(revision 7357)
+++ nsock/include/nsock.h	(working copy)
@@ -60,6 +60,7 @@
  * Pcap support code is currently unstable, so we give
  * you a choice. In future this #define will be removed.*/
 #define HAVE_PCAP 1
+#define HAVE_OPENSSL 1
 
 #ifndef NSOCK_H
 #define NSOCK_H
Index: nsock/nsock.vcproj
===================================================================
--- nsock/nsock.vcproj	(revision 7357)
+++ nsock/nsock.vcproj	(working copy)
@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\nbase\;include;..\mswin32\pcap-include;..\mswin32;..\"
+				AdditionalIncludeDirectories="..\nbase\;include;..\mswin32\pcap-include;..\mswin32;..\;C:\OpenSSL\include;"
 				PreprocessorDefinitions="WIN32;_LIB"
 				MinimalRebuild="true"
 				ExceptionHandling="0"
@@ -108,7 +108,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/D &quot;_CRT_SECURE_NO_DEPRECATE&quot;"
-				AdditionalIncludeDirectories="..\nbase\;include;..\mswin32\pcap-include;..\mswin32;..\"
+				AdditionalIncludeDirectories="..\nbase\;include;..\mswin32\pcap-include;..\mswin32;..\;C:\OpenSSL\include;"
 				PreprocessorDefinitions="WIN32;_LIB"
 				ExceptionHandling="0"
 				RuntimeLibrary="0"
@@ -201,6 +201,10 @@
 				>
 			</File>
 			<File
+				RelativePath=".\src\nsock_ssl.c"
+				>
+			</File>
+			<File
 				RelativePath=".\src\nsock_timers.c"
 				>
 			</File>
@@ -247,6 +251,10 @@
 				>
 			</File>
 			<File
+				RelativePath=".\src\nsock_ssl.h"
+				>
+			</File>
+			<File
 				RelativePath=".\src\nsock_utils.h"
 				>
 			</File>