From 79fa5e0e1dd97c0c4edffee926e15b1c6abdc6a0 Mon Sep 17 00:00:00 2001 From: david Date: Wed, 29 Apr 2009 03:36:26 +0000 Subject: [PATCH] Add a default bundle of trusted CA certificates for Ncat, extracted from Windows. Use this bundle if no other was specified with --ssl-trustfile. Instructions for extracting the certificates are included. I have to go back now and make this compile on Unix. --- mswin32/Makefile | 1 + mswin32/nmap.sln | 1 + mswin32/nsis/Nmap.nsi | 1 + 3 files changed, 3 insertions(+) diff --git a/mswin32/Makefile b/mswin32/Makefile index 16aaccf44..df4f90845 100644 --- a/mswin32/Makefile +++ b/mswin32/Makefile @@ -31,6 +31,7 @@ winbuild: cp winpcap/winpcap-nmap-*.exe nmap-$(NMAP_VERSION) cp vcredist_x86.exe nmap-$(NMAP_VERSION) cp ../ncat/Release/ncat.exe nmap-$(NMAP_VERSION) + cp ../ncat/Release/ca-bundle.crt nmap-$(NMAP_VERSION) # Install the ndiff batch file wrapper in the zip distribution. cp ../ndiff/ndiff nmap-$(NMAP_VERSION)/ndiff.py cp python-wrap.bat nmap-$(NMAP_VERSION)/ndiff.bat diff --git a/mswin32/nmap.sln b/mswin32/nmap.sln index be1a7c6ed..3b476f8e9 100644 --- a/mswin32/nmap.sln +++ b/mswin32/nmap.sln @@ -25,6 +25,7 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ncat", "..\ncat\ncat.vcproj", "{C1E04411-E021-468B-83F1-CB624BBA7589}" ProjectSection(ProjectDependencies) = postProject {F8D6D1E3-D4EA-402C-98AA-168E5309BAF4} = {F8D6D1E3-D4EA-402C-98AA-168E5309BAF4} + {B630C8F7-3138-43E8-89ED-78742FA2AC5F} = {B630C8F7-3138-43E8-89ED-78742FA2AC5F} EndProjectSection EndProject Global diff --git a/mswin32/nsis/Nmap.nsi b/mswin32/nsis/Nmap.nsi index 5faa483ed..ae6001404 100644 --- a/mswin32/nsis/Nmap.nsi +++ b/mswin32/nsis/Nmap.nsi @@ -251,6 +251,7 @@ Section "Ncat (Modern Netcat reincarnation)" SecNcat SetOutPath "$INSTDIR" SetOverwrite on File ..\nmap-${VERSION}\ncat.exe + File ..\nmap-${VERSION}\ca-bundle.crt SectionEnd Section "Ndiff (Scan comparison tool)" SecNdiff