Browse code
Build on Win32
Shawn Webb authored on 2014/02/12 07:11:37Showing 32 changed files
- libclamav/7z/7zAlloc.c
- libclamav/7z/7zBuf2.c
- libclamav/7z/7zCrc.c
- libclamav/7z/7zCrcOpt.c
- libclamav/7z/7zDec.c
- libclamav/7z/7zIn.c
- libclamav/7z/CpuArch.c
- libclamav/7z/Xz.c
- libclamav/7z/XzDec.c
- libclamav/7z/XzIn.c
- libclamav/7z_iface.c
- libclamav/json.c
- win32/Setup-x86/Setup-x86.vdproj
- win32/clambc.vcxproj
- win32/clamconf.vcxproj
- win32/clamd.vcxproj
- win32/clamd.vcxproj.filters
- win32/clamdscan.vcxproj
- win32/clamdscan.vcxproj.filters
- win32/clamscan.vcxproj
- win32/clamscan.vcxproj.filters
- win32/compat/dirent.c
- win32/compat/w32_stat.c
- win32/freshclam.vcxproj
- win32/freshclam.vcxproj.filters
- win32/libclamav.def
- win32/libclamav.vcxproj
- win32/libclamav.vcxproj.filters
- win32/libclamavcxx.vcxproj
- win32/libclamavcxx.vcxproj.filters
- win32/sigtool.vcxproj
- win32/sigtool.vcxproj.filters
| ... | ... |
@@ -1,6 +1,11 @@ |
| 1 | 1 |
/* 7zCrcOpt.c -- CRC32 calculation : optimized version |
| 2 | 2 |
2009-11-23 : Igor Pavlov : Public domain */ |
| 3 | 3 |
|
| 4 |
+#if defined(_WIN32) |
|
| 5 |
+#include <WinSock2.h> |
|
| 6 |
+#include <Windows.h> |
|
| 7 |
+#endif |
|
| 8 |
+ |
|
| 4 | 9 |
#include <openssl/ssl.h> |
| 5 | 10 |
#include <openssl/err.h> |
| 6 | 11 |
#include "libclamav/crypto.h" |
| ... | ... |
@@ -69,134 +69,146 @@ |
| 69 | 69 |
} |
| 70 | 70 |
"Entry" |
| 71 | 71 |
{
|
| 72 |
- "MsmKey" = "8:_59DC2980739C4FDAA8EC96CD313429EF" |
|
| 73 |
- "OwnerKey" = "8:_129947045FE24C5AAEE6467547A6FBBB" |
|
| 72 |
+ "MsmKey" = "8:_4FC55746B30C48D59E9FE8557C108069" |
|
| 73 |
+ "OwnerKey" = "8:_UNDEFINED" |
|
| 74 | 74 |
"MsmSig" = "8:_UNDEFINED" |
| 75 | 75 |
} |
| 76 | 76 |
"Entry" |
| 77 | 77 |
{
|
| 78 |
- "MsmKey" = "8:_59DC2980739C4FDAA8EC96CD313429EF" |
|
| 79 |
- "OwnerKey" = "8:_E6AAF8DB843A4CDCBD12F62B44F0D947" |
|
| 78 |
+ "MsmKey" = "8:_572E52797C0A4873ACFC45E53ED1FB78" |
|
| 79 |
+ "OwnerKey" = "8:_UNDEFINED" |
|
| 80 | 80 |
"MsmSig" = "8:_UNDEFINED" |
| 81 | 81 |
} |
| 82 | 82 |
"Entry" |
| 83 | 83 |
{
|
| 84 |
- "MsmKey" = "8:_59DC2980739C4FDAA8EC96CD313429EF" |
|
| 85 |
- "OwnerKey" = "8:_C3F868E2F86F4F22914EBB33174331CF" |
|
| 84 |
+ "MsmKey" = "8:_5C115FFB3D1542998DEB88C97B348F59" |
|
| 85 |
+ "OwnerKey" = "8:_UNDEFINED" |
|
| 86 | 86 |
"MsmSig" = "8:_UNDEFINED" |
| 87 | 87 |
} |
| 88 | 88 |
"Entry" |
| 89 | 89 |
{
|
| 90 |
- "MsmKey" = "8:_59DC2980739C4FDAA8EC96CD313429EF" |
|
| 91 |
- "OwnerKey" = "8:_AA48472048A74261A786515933650C63" |
|
| 90 |
+ "MsmKey" = "8:_64B5C4E9452F43349FB4D53DEE15C87D" |
|
| 91 |
+ "OwnerKey" = "8:_UNDEFINED" |
|
| 92 | 92 |
"MsmSig" = "8:_UNDEFINED" |
| 93 | 93 |
} |
| 94 | 94 |
"Entry" |
| 95 | 95 |
{
|
| 96 |
- "MsmKey" = "8:_59DC2980739C4FDAA8EC96CD313429EF" |
|
| 97 |
- "OwnerKey" = "8:_86FBE3D4BB5F42609082FB54D8079705" |
|
| 96 |
+ "MsmKey" = "8:_6D1F45F66466453998A8B163691BAD84" |
|
| 97 |
+ "OwnerKey" = "8:_UNDEFINED" |
|
| 98 | 98 |
"MsmSig" = "8:_UNDEFINED" |
| 99 | 99 |
} |
| 100 | 100 |
"Entry" |
| 101 | 101 |
{
|
| 102 |
- "MsmKey" = "8:_59DC2980739C4FDAA8EC96CD313429EF" |
|
| 103 |
- "OwnerKey" = "8:_64B5C4E9452F43349FB4D53DEE15C87D" |
|
| 102 |
+ "MsmKey" = "8:_6E6776606E994FD99CC36CB5C62935CF" |
|
| 103 |
+ "OwnerKey" = "8:_UNDEFINED" |
|
| 104 | 104 |
"MsmSig" = "8:_UNDEFINED" |
| 105 | 105 |
} |
| 106 | 106 |
"Entry" |
| 107 | 107 |
{
|
| 108 |
- "MsmKey" = "8:_59DC2980739C4FDAA8EC96CD313429EF" |
|
| 109 |
- "OwnerKey" = "8:_42222ACB125B4398B7BF9C030F7DF8FB" |
|
| 108 |
+ "MsmKey" = "8:_70FC345C7A6C47D799FD1EC7CD5F20D9" |
|
| 109 |
+ "OwnerKey" = "8:_UNDEFINED" |
|
| 110 | 110 |
"MsmSig" = "8:_UNDEFINED" |
| 111 | 111 |
} |
| 112 | 112 |
"Entry" |
| 113 | 113 |
{
|
| 114 |
- "MsmKey" = "8:_59DC2980739C4FDAA8EC96CD313429EF" |
|
| 115 |
- "OwnerKey" = "8:_4053CC7DC75C48E98893BCEA2D692E55" |
|
| 114 |
+ "MsmKey" = "8:_86FBE3D4BB5F42609082FB54D8079705" |
|
| 115 |
+ "OwnerKey" = "8:_UNDEFINED" |
|
| 116 | 116 |
"MsmSig" = "8:_UNDEFINED" |
| 117 | 117 |
} |
| 118 | 118 |
"Entry" |
| 119 | 119 |
{
|
| 120 |
- "MsmKey" = "8:_59DC2980739C4FDAA8EC96CD313429EF" |
|
| 121 |
- "OwnerKey" = "8:_32F4158C158142089DB13F5F29F91589" |
|
| 120 |
+ "MsmKey" = "8:_893ED45A96044D8B94FDF0BF5DD2476B" |
|
| 121 |
+ "OwnerKey" = "8:_UNDEFINED" |
|
| 122 | 122 |
"MsmSig" = "8:_UNDEFINED" |
| 123 | 123 |
} |
| 124 | 124 |
"Entry" |
| 125 | 125 |
{
|
| 126 |
- "MsmKey" = "8:_59DC2980739C4FDAA8EC96CD313429EF" |
|
| 127 |
- "OwnerKey" = "8:_29583B2B37A44A71864FFD88DFED2C8F" |
|
| 126 |
+ "MsmKey" = "8:_9365183139E941EA8C13A61D5EA82D2C" |
|
| 127 |
+ "OwnerKey" = "8:_UNDEFINED" |
|
| 128 | 128 |
"MsmSig" = "8:_UNDEFINED" |
| 129 | 129 |
} |
| 130 | 130 |
"Entry" |
| 131 | 131 |
{
|
| 132 |
- "MsmKey" = "8:_5C115FFB3D1542998DEB88C97B348F59" |
|
| 132 |
+ "MsmKey" = "8:_AA48472048A74261A786515933650C63" |
|
| 133 | 133 |
"OwnerKey" = "8:_UNDEFINED" |
| 134 | 134 |
"MsmSig" = "8:_UNDEFINED" |
| 135 | 135 |
} |
| 136 | 136 |
"Entry" |
| 137 | 137 |
{
|
| 138 |
- "MsmKey" = "8:_64B5C4E9452F43349FB4D53DEE15C87D" |
|
| 139 |
- "OwnerKey" = "8:_UNDEFINED" |
|
| 138 |
+ "MsmKey" = "8:_B15174FB733CFDB87929A99EF031FE60" |
|
| 139 |
+ "OwnerKey" = "8:_29583B2B37A44A71864FFD88DFED2C8F" |
|
| 140 | 140 |
"MsmSig" = "8:_UNDEFINED" |
| 141 | 141 |
} |
| 142 | 142 |
"Entry" |
| 143 | 143 |
{
|
| 144 |
- "MsmKey" = "8:_6D1F45F66466453998A8B163691BAD84" |
|
| 144 |
+ "MsmKey" = "8:_C3F868E2F86F4F22914EBB33174331CF" |
|
| 145 | 145 |
"OwnerKey" = "8:_UNDEFINED" |
| 146 | 146 |
"MsmSig" = "8:_UNDEFINED" |
| 147 | 147 |
} |
| 148 | 148 |
"Entry" |
| 149 | 149 |
{
|
| 150 |
- "MsmKey" = "8:_6E6776606E994FD99CC36CB5C62935CF" |
|
| 150 |
+ "MsmKey" = "8:_C53272351C914F09989E6CB992D9BE44" |
|
| 151 | 151 |
"OwnerKey" = "8:_UNDEFINED" |
| 152 | 152 |
"MsmSig" = "8:_UNDEFINED" |
| 153 | 153 |
} |
| 154 | 154 |
"Entry" |
| 155 | 155 |
{
|
| 156 |
- "MsmKey" = "8:_70FC345C7A6C47D799FD1EC7CD5F20D9" |
|
| 157 |
- "OwnerKey" = "8:_UNDEFINED" |
|
| 156 |
+ "MsmKey" = "8:_E26F0CDAA61C437B9CC7EF502F84731E" |
|
| 157 |
+ "OwnerKey" = "8:_129947045FE24C5AAEE6467547A6FBBB" |
|
| 158 | 158 |
"MsmSig" = "8:_UNDEFINED" |
| 159 | 159 |
} |
| 160 | 160 |
"Entry" |
| 161 | 161 |
{
|
| 162 |
- "MsmKey" = "8:_86FBE3D4BB5F42609082FB54D8079705" |
|
| 163 |
- "OwnerKey" = "8:_UNDEFINED" |
|
| 162 |
+ "MsmKey" = "8:_E26F0CDAA61C437B9CC7EF502F84731E" |
|
| 163 |
+ "OwnerKey" = "8:_E6AAF8DB843A4CDCBD12F62B44F0D947" |
|
| 164 | 164 |
"MsmSig" = "8:_UNDEFINED" |
| 165 | 165 |
} |
| 166 | 166 |
"Entry" |
| 167 | 167 |
{
|
| 168 |
- "MsmKey" = "8:_893ED45A96044D8B94FDF0BF5DD2476B" |
|
| 169 |
- "OwnerKey" = "8:_UNDEFINED" |
|
| 168 |
+ "MsmKey" = "8:_E26F0CDAA61C437B9CC7EF502F84731E" |
|
| 169 |
+ "OwnerKey" = "8:_C3F868E2F86F4F22914EBB33174331CF" |
|
| 170 | 170 |
"MsmSig" = "8:_UNDEFINED" |
| 171 | 171 |
} |
| 172 | 172 |
"Entry" |
| 173 | 173 |
{
|
| 174 |
- "MsmKey" = "8:_9365183139E941EA8C13A61D5EA82D2C" |
|
| 175 |
- "OwnerKey" = "8:_UNDEFINED" |
|
| 174 |
+ "MsmKey" = "8:_E26F0CDAA61C437B9CC7EF502F84731E" |
|
| 175 |
+ "OwnerKey" = "8:_AA48472048A74261A786515933650C63" |
|
| 176 | 176 |
"MsmSig" = "8:_UNDEFINED" |
| 177 | 177 |
} |
| 178 | 178 |
"Entry" |
| 179 | 179 |
{
|
| 180 |
- "MsmKey" = "8:_AA48472048A74261A786515933650C63" |
|
| 181 |
- "OwnerKey" = "8:_UNDEFINED" |
|
| 180 |
+ "MsmKey" = "8:_E26F0CDAA61C437B9CC7EF502F84731E" |
|
| 181 |
+ "OwnerKey" = "8:_86FBE3D4BB5F42609082FB54D8079705" |
|
| 182 | 182 |
"MsmSig" = "8:_UNDEFINED" |
| 183 | 183 |
} |
| 184 | 184 |
"Entry" |
| 185 | 185 |
{
|
| 186 |
- "MsmKey" = "8:_B15174FB733CFDB87929A99EF031FE60" |
|
| 187 |
- "OwnerKey" = "8:_29583B2B37A44A71864FFD88DFED2C8F" |
|
| 186 |
+ "MsmKey" = "8:_E26F0CDAA61C437B9CC7EF502F84731E" |
|
| 187 |
+ "OwnerKey" = "8:_64B5C4E9452F43349FB4D53DEE15C87D" |
|
| 188 | 188 |
"MsmSig" = "8:_UNDEFINED" |
| 189 | 189 |
} |
| 190 | 190 |
"Entry" |
| 191 | 191 |
{
|
| 192 |
- "MsmKey" = "8:_C3F868E2F86F4F22914EBB33174331CF" |
|
| 193 |
- "OwnerKey" = "8:_UNDEFINED" |
|
| 192 |
+ "MsmKey" = "8:_E26F0CDAA61C437B9CC7EF502F84731E" |
|
| 193 |
+ "OwnerKey" = "8:_42222ACB125B4398B7BF9C030F7DF8FB" |
|
| 194 | 194 |
"MsmSig" = "8:_UNDEFINED" |
| 195 | 195 |
} |
| 196 | 196 |
"Entry" |
| 197 | 197 |
{
|
| 198 |
- "MsmKey" = "8:_C53272351C914F09989E6CB992D9BE44" |
|
| 199 |
- "OwnerKey" = "8:_UNDEFINED" |
|
| 198 |
+ "MsmKey" = "8:_E26F0CDAA61C437B9CC7EF502F84731E" |
|
| 199 |
+ "OwnerKey" = "8:_4053CC7DC75C48E98893BCEA2D692E55" |
|
| 200 |
+ "MsmSig" = "8:_UNDEFINED" |
|
| 201 |
+ } |
|
| 202 |
+ "Entry" |
|
| 203 |
+ {
|
|
| 204 |
+ "MsmKey" = "8:_E26F0CDAA61C437B9CC7EF502F84731E" |
|
| 205 |
+ "OwnerKey" = "8:_32F4158C158142089DB13F5F29F91589" |
|
| 206 |
+ "MsmSig" = "8:_UNDEFINED" |
|
| 207 |
+ } |
|
| 208 |
+ "Entry" |
|
| 209 |
+ {
|
|
| 210 |
+ "MsmKey" = "8:_E26F0CDAA61C437B9CC7EF502F84731E" |
|
| 211 |
+ "OwnerKey" = "8:_29583B2B37A44A71864FFD88DFED2C8F" |
|
| 200 | 212 |
"MsmSig" = "8:_UNDEFINED" |
| 201 | 213 |
} |
| 202 | 214 |
"Entry" |
| ... | ... |
@@ -223,6 +235,66 @@ |
| 223 | 223 |
"OwnerKey" = "8:_42222ACB125B4398B7BF9C030F7DF8FB" |
| 224 | 224 |
"MsmSig" = "8:_UNDEFINED" |
| 225 | 225 |
} |
| 226 |
+ "Entry" |
|
| 227 |
+ {
|
|
| 228 |
+ "MsmKey" = "8:_UNDEFINED" |
|
| 229 |
+ "OwnerKey" = "8:_129947045FE24C5AAEE6467547A6FBBB" |
|
| 230 |
+ "MsmSig" = "8:_UNDEFINED" |
|
| 231 |
+ } |
|
| 232 |
+ "Entry" |
|
| 233 |
+ {
|
|
| 234 |
+ "MsmKey" = "8:_UNDEFINED" |
|
| 235 |
+ "OwnerKey" = "8:_E6AAF8DB843A4CDCBD12F62B44F0D947" |
|
| 236 |
+ "MsmSig" = "8:_UNDEFINED" |
|
| 237 |
+ } |
|
| 238 |
+ "Entry" |
|
| 239 |
+ {
|
|
| 240 |
+ "MsmKey" = "8:_UNDEFINED" |
|
| 241 |
+ "OwnerKey" = "8:_C3F868E2F86F4F22914EBB33174331CF" |
|
| 242 |
+ "MsmSig" = "8:_UNDEFINED" |
|
| 243 |
+ } |
|
| 244 |
+ "Entry" |
|
| 245 |
+ {
|
|
| 246 |
+ "MsmKey" = "8:_UNDEFINED" |
|
| 247 |
+ "OwnerKey" = "8:_AA48472048A74261A786515933650C63" |
|
| 248 |
+ "MsmSig" = "8:_UNDEFINED" |
|
| 249 |
+ } |
|
| 250 |
+ "Entry" |
|
| 251 |
+ {
|
|
| 252 |
+ "MsmKey" = "8:_UNDEFINED" |
|
| 253 |
+ "OwnerKey" = "8:_86FBE3D4BB5F42609082FB54D8079705" |
|
| 254 |
+ "MsmSig" = "8:_UNDEFINED" |
|
| 255 |
+ } |
|
| 256 |
+ "Entry" |
|
| 257 |
+ {
|
|
| 258 |
+ "MsmKey" = "8:_UNDEFINED" |
|
| 259 |
+ "OwnerKey" = "8:_64B5C4E9452F43349FB4D53DEE15C87D" |
|
| 260 |
+ "MsmSig" = "8:_UNDEFINED" |
|
| 261 |
+ } |
|
| 262 |
+ "Entry" |
|
| 263 |
+ {
|
|
| 264 |
+ "MsmKey" = "8:_UNDEFINED" |
|
| 265 |
+ "OwnerKey" = "8:_42222ACB125B4398B7BF9C030F7DF8FB" |
|
| 266 |
+ "MsmSig" = "8:_UNDEFINED" |
|
| 267 |
+ } |
|
| 268 |
+ "Entry" |
|
| 269 |
+ {
|
|
| 270 |
+ "MsmKey" = "8:_UNDEFINED" |
|
| 271 |
+ "OwnerKey" = "8:_4053CC7DC75C48E98893BCEA2D692E55" |
|
| 272 |
+ "MsmSig" = "8:_UNDEFINED" |
|
| 273 |
+ } |
|
| 274 |
+ "Entry" |
|
| 275 |
+ {
|
|
| 276 |
+ "MsmKey" = "8:_UNDEFINED" |
|
| 277 |
+ "OwnerKey" = "8:_32F4158C158142089DB13F5F29F91589" |
|
| 278 |
+ "MsmSig" = "8:_UNDEFINED" |
|
| 279 |
+ } |
|
| 280 |
+ "Entry" |
|
| 281 |
+ {
|
|
| 282 |
+ "MsmKey" = "8:_UNDEFINED" |
|
| 283 |
+ "OwnerKey" = "8:_29583B2B37A44A71864FFD88DFED2C8F" |
|
| 284 |
+ "MsmSig" = "8:_UNDEFINED" |
|
| 285 |
+ } |
|
| 226 | 286 |
} |
| 227 | 287 |
"Configurations" |
| 228 | 288 |
{
|
| ... | ... |
@@ -248,6 +320,19 @@ |
| 248 | 248 |
"PrerequisitesLocation" = "2:1" |
| 249 | 249 |
"Url" = "8:" |
| 250 | 250 |
"ComponentsUrl" = "8:" |
| 251 |
+ "Items" |
|
| 252 |
+ {
|
|
| 253 |
+ "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:.NETFramework,Version=v4.0,Profile=Client"
|
|
| 254 |
+ {
|
|
| 255 |
+ "Name" = "8:Microsoft .NET Framework 4 Client Profile (x86 and x64)" |
|
| 256 |
+ "ProductCode" = "8:.NETFramework,Version=v4.0,Profile=Client" |
|
| 257 |
+ } |
|
| 258 |
+ "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:Microsoft.Windows.Installer.3.1"
|
|
| 259 |
+ {
|
|
| 260 |
+ "Name" = "8:Windows Installer 3.1" |
|
| 261 |
+ "ProductCode" = "8:Microsoft.Windows.Installer.3.1" |
|
| 262 |
+ } |
|
| 263 |
+ } |
|
| 251 | 264 |
} |
| 252 | 265 |
} |
| 253 | 266 |
"Release" |
| ... | ... |
@@ -272,6 +357,19 @@ |
| 272 | 272 |
"PrerequisitesLocation" = "2:1" |
| 273 | 273 |
"Url" = "8:" |
| 274 | 274 |
"ComponentsUrl" = "8:" |
| 275 |
+ "Items" |
|
| 276 |
+ {
|
|
| 277 |
+ "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:.NETFramework,Version=v4.0,Profile=Client"
|
|
| 278 |
+ {
|
|
| 279 |
+ "Name" = "8:Microsoft .NET Framework 4 Client Profile (x86 and x64)" |
|
| 280 |
+ "ProductCode" = "8:.NETFramework,Version=v4.0,Profile=Client" |
|
| 281 |
+ } |
|
| 282 |
+ "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:Microsoft.Windows.Installer.3.1"
|
|
| 283 |
+ {
|
|
| 284 |
+ "Name" = "8:Windows Installer 3.1" |
|
| 285 |
+ "ProductCode" = "8:Microsoft.Windows.Installer.3.1" |
|
| 286 |
+ } |
|
| 287 |
+ } |
|
| 275 | 288 |
} |
| 276 | 289 |
} |
| 277 | 290 |
} |
| ... | ... |
@@ -290,6 +388,14 @@ |
| 290 | 290 |
{
|
| 291 | 291 |
"LaunchCondition" |
| 292 | 292 |
{
|
| 293 |
+ "{A06ECF26-33A3-4562-8140-9B0E340D4F24}:_C692B08A77FF4D50B94635F349068667"
|
|
| 294 |
+ {
|
|
| 295 |
+ "Name" = "8:.NET Framework" |
|
| 296 |
+ "Message" = "8:[VSDNETMSG]" |
|
| 297 |
+ "FrameworkVersion" = "8:.NETFramework,Version=v4.0,Profile=Client" |
|
| 298 |
+ "AllowLaterVersions" = "11:FALSE" |
|
| 299 |
+ "InstallUrl" = "8:http://go.microsoft.com/fwlink/?LinkId=131000" |
|
| 300 |
+ } |
|
| 293 | 301 |
} |
| 294 | 302 |
} |
| 295 | 303 |
"File" |
| ... | ... |
@@ -374,6 +480,46 @@ |
| 374 | 374 |
"IsDependency" = "11:FALSE" |
| 375 | 375 |
"IsolateTo" = "8:" |
| 376 | 376 |
} |
| 377 |
+ "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_4FC55746B30C48D59E9FE8557C108069"
|
|
| 378 |
+ {
|
|
| 379 |
+ "SourcePath" = "8:C:\\clamdeps\\win32\\openssl\\lib\\ssleay32.dll" |
|
| 380 |
+ "TargetName" = "8:ssleay32.dll" |
|
| 381 |
+ "Tag" = "8:" |
|
| 382 |
+ "Folder" = "8:_C751D6577C584B05A32BF01390F14B9F" |
|
| 383 |
+ "Condition" = "8:" |
|
| 384 |
+ "Transitive" = "11:FALSE" |
|
| 385 |
+ "Vital" = "11:TRUE" |
|
| 386 |
+ "ReadOnly" = "11:FALSE" |
|
| 387 |
+ "Hidden" = "11:FALSE" |
|
| 388 |
+ "System" = "11:FALSE" |
|
| 389 |
+ "Permanent" = "11:FALSE" |
|
| 390 |
+ "SharedLegacy" = "11:FALSE" |
|
| 391 |
+ "PackageAs" = "3:1" |
|
| 392 |
+ "Register" = "3:1" |
|
| 393 |
+ "Exclude" = "11:FALSE" |
|
| 394 |
+ "IsDependency" = "11:FALSE" |
|
| 395 |
+ "IsolateTo" = "8:" |
|
| 396 |
+ } |
|
| 397 |
+ "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_572E52797C0A4873ACFC45E53ED1FB78"
|
|
| 398 |
+ {
|
|
| 399 |
+ "SourcePath" = "8:C:\\clamdeps\\win32\\openssl\\lib\\libeay32.dll" |
|
| 400 |
+ "TargetName" = "8:libeay32.dll" |
|
| 401 |
+ "Tag" = "8:" |
|
| 402 |
+ "Folder" = "8:_C751D6577C584B05A32BF01390F14B9F" |
|
| 403 |
+ "Condition" = "8:" |
|
| 404 |
+ "Transitive" = "11:FALSE" |
|
| 405 |
+ "Vital" = "11:TRUE" |
|
| 406 |
+ "ReadOnly" = "11:FALSE" |
|
| 407 |
+ "Hidden" = "11:FALSE" |
|
| 408 |
+ "System" = "11:FALSE" |
|
| 409 |
+ "Permanent" = "11:FALSE" |
|
| 410 |
+ "SharedLegacy" = "11:FALSE" |
|
| 411 |
+ "PackageAs" = "3:1" |
|
| 412 |
+ "Register" = "3:1" |
|
| 413 |
+ "Exclude" = "11:FALSE" |
|
| 414 |
+ "IsDependency" = "11:FALSE" |
|
| 415 |
+ "IsolateTo" = "8:" |
|
| 416 |
+ } |
|
| 377 | 417 |
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_5C115FFB3D1542998DEB88C97B348F59"
|
| 378 | 418 |
{
|
| 379 | 419 |
"SourcePath" = "8:..\\..\\COPYING.unrar" |
| ... | ... |
@@ -651,7 +797,7 @@ |
| 651 | 651 |
"Name" = "8:Microsoft Visual Studio" |
| 652 | 652 |
"ProductName" = "8:ClamAV" |
| 653 | 653 |
"ProductCode" = "8:{088E38E4-6B8C-4603-8AB2-1E0762440E11}"
|
| 654 |
- "PackageCode" = "8:{BD0C7A7A-99CC-4995-9B9C-CEFDD48B9A47}"
|
|
| 654 |
+ "PackageCode" = "8:{9A34A1A1-9677-44FC-BC23-3B168131B094}"
|
|
| 655 | 655 |
"UpgradeCode" = "8:{B65ED295-87F7-4870-8017-E3A594DDADF8}"
|
| 656 | 656 |
"AspNetVersion" = "8:4.0.30319.0" |
| 657 | 657 |
"RestartWWWService" = "11:FALSE" |
| ... | ... |
@@ -1167,7 +1313,7 @@ |
| 1167 | 1167 |
} |
| 1168 | 1168 |
"MergeModule" |
| 1169 | 1169 |
{
|
| 1170 |
- "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_59DC2980739C4FDAA8EC96CD313429EF"
|
|
| 1170 |
+ "{CEE29DC0-9FBA-4B99-8D47-5BC643D9B626}:_E26F0CDAA61C437B9CC7EF502F84731E"
|
|
| 1171 | 1171 |
{
|
| 1172 | 1172 |
"UseDynamicProperties" = "11:TRUE" |
| 1173 | 1173 |
"IsDependency" = "11:TRUE" |
| ... | ... |
@@ -1,5 +1,4 @@ |
| 1 |
-<?xml version="1.0" encoding="utf-8"?> |
|
| 2 |
- |
|
| 1 |
+<?xml version="1.0" encoding="utf-8"?> |
|
| 3 | 2 |
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
| 4 | 3 |
<ItemGroup Label="ProjectConfigurations"> |
| 5 | 4 |
<ProjectConfiguration Include="Debug|Win32"> |
| ... | ... |
@@ -24,7 +23,7 @@ |
| 24 | 24 |
<Keyword>Win32Proj</Keyword> |
| 25 | 25 |
<RootNamespace>clambc</RootNamespace> |
| 26 | 26 |
</PropertyGroup> |
| 27 |
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props"/> |
|
| 27 |
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> |
|
| 28 | 28 |
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> |
| 29 | 29 |
<ConfigurationType>Application</ConfigurationType> |
| 30 | 30 |
<UseDebugLibraries>true</UseDebugLibraries> |
| ... | ... |
@@ -47,22 +46,22 @@ |
| 47 | 47 |
<WholeProgramOptimization>true</WholeProgramOptimization> |
| 48 | 48 |
<CharacterSet>MultiByte</CharacterSet> |
| 49 | 49 |
</PropertyGroup> |
| 50 |
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props"/> |
|
| 50 |
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> |
|
| 51 | 51 |
<ImportGroup Label="ExtensionSettings"> |
| 52 | 52 |
</ImportGroup> |
| 53 | 53 |
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> |
| 54 |
- <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
|
|
| 54 |
+ <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
|
|
| 55 | 55 |
</ImportGroup> |
| 56 | 56 |
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> |
| 57 |
- <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
|
|
| 57 |
+ <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
|
|
| 58 | 58 |
</ImportGroup> |
| 59 | 59 |
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> |
| 60 |
- <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
|
|
| 60 |
+ <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
|
|
| 61 | 61 |
</ImportGroup> |
| 62 | 62 |
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> |
| 63 |
- <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
|
|
| 63 |
+ <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
|
|
| 64 | 64 |
</ImportGroup> |
| 65 |
- <PropertyGroup Label="UserMacros"/> |
|
| 65 |
+ <PropertyGroup Label="UserMacros" /> |
|
| 66 | 66 |
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> |
| 67 | 67 |
<LinkIncremental>true</LinkIncremental> |
| 68 | 68 |
<IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir> |
| ... | ... |
@@ -89,13 +88,14 @@ |
| 89 | 89 |
<WarningLevel>Level3</WarningLevel> |
| 90 | 90 |
<Optimization>Disabled</Optimization> |
| 91 | 91 |
<PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| 92 |
- <AdditionalIncludeDirectories>"$(SolutionDir)";"$(SolutionDir)..\libclamav";"$(SolutionDir)compat";"$(SolutionDir)3rdparty\zlib";"$(SolutionDir)3rdparty\pthreads";"$(SolutionDir)3rdparty\bzip2";"$(SolutionDir).."</AdditionalIncludeDirectories> |
|
| 92 |
+ <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)..;C:\clamdeps\win32\openssl\include</AdditionalIncludeDirectories> |
|
| 93 | 93 |
<CompileAs>CompileAsC</CompileAs> |
| 94 | 94 |
<DisableSpecificWarnings>4996;4244</DisableSpecificWarnings> |
| 95 | 95 |
</ClCompile> |
| 96 | 96 |
<Link> |
| 97 | 97 |
<SubSystem>Console</SubSystem> |
| 98 | 98 |
<GenerateDebugInformation>true</GenerateDebugInformation> |
| 99 |
+ <AdditionalLibraryDirectories>C:\clamdeps\win32\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 99 | 100 |
</Link> |
| 100 | 101 |
</ItemDefinitionGroup> |
| 101 | 102 |
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> |
| ... | ... |
@@ -152,18 +152,18 @@ |
| 152 | 152 |
</Link> |
| 153 | 153 |
</ItemDefinitionGroup> |
| 154 | 154 |
<ItemGroup> |
| 155 |
- <ClCompile Include="..\clambc\bcrun.c"/> |
|
| 156 |
- <ClCompile Include="..\shared\misc.c"/> |
|
| 155 |
+ <ClCompile Include="..\clambc\bcrun.c" /> |
|
| 156 |
+ <ClCompile Include="..\shared\misc.c" /> |
|
| 157 | 157 |
</ItemGroup> |
| 158 | 158 |
<ItemGroup> |
| 159 |
- <ResourceCompile Include="res\clambc.rc"/> |
|
| 159 |
+ <ResourceCompile Include="res\clambc.rc" /> |
|
| 160 | 160 |
</ItemGroup> |
| 161 | 161 |
<ItemGroup> |
| 162 | 162 |
<ProjectReference Include="libclamav.vcxproj"> |
| 163 | 163 |
<Project>{09d341e9-7372-46e9-b0d7-caaf77984190}</Project>
|
| 164 | 164 |
</ProjectReference> |
| 165 | 165 |
</ItemGroup> |
| 166 |
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/> |
|
| 166 |
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> |
|
| 167 | 167 |
<ImportGroup Label="ExtensionTargets"> |
| 168 | 168 |
</ImportGroup> |
| 169 |
-</Project> |
|
| 169 |
+</Project> |
|
| 170 | 170 |
\ No newline at end of file |
| ... | ... |
@@ -1,5 +1,4 @@ |
| 1 |
-<?xml version="1.0" encoding="utf-8"?> |
|
| 2 |
- |
|
| 1 |
+<?xml version="1.0" encoding="utf-8"?> |
|
| 3 | 2 |
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
| 4 | 3 |
<ItemGroup Label="ProjectConfigurations"> |
| 5 | 4 |
<ProjectConfiguration Include="Debug|Win32"> |
| ... | ... |
@@ -24,7 +23,7 @@ |
| 24 | 24 |
<Keyword>Win32Proj</Keyword> |
| 25 | 25 |
<RootNamespace>clamconf</RootNamespace> |
| 26 | 26 |
</PropertyGroup> |
| 27 |
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props"/> |
|
| 27 |
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> |
|
| 28 | 28 |
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> |
| 29 | 29 |
<ConfigurationType>Application</ConfigurationType> |
| 30 | 30 |
<UseDebugLibraries>true</UseDebugLibraries> |
| ... | ... |
@@ -47,22 +46,22 @@ |
| 47 | 47 |
<WholeProgramOptimization>true</WholeProgramOptimization> |
| 48 | 48 |
<CharacterSet>MultiByte</CharacterSet> |
| 49 | 49 |
</PropertyGroup> |
| 50 |
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props"/> |
|
| 50 |
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> |
|
| 51 | 51 |
<ImportGroup Label="ExtensionSettings"> |
| 52 | 52 |
</ImportGroup> |
| 53 | 53 |
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> |
| 54 |
- <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
|
|
| 54 |
+ <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
|
|
| 55 | 55 |
</ImportGroup> |
| 56 | 56 |
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> |
| 57 |
- <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
|
|
| 57 |
+ <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
|
|
| 58 | 58 |
</ImportGroup> |
| 59 | 59 |
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> |
| 60 |
- <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
|
|
| 60 |
+ <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
|
|
| 61 | 61 |
</ImportGroup> |
| 62 | 62 |
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> |
| 63 |
- <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
|
|
| 63 |
+ <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
|
|
| 64 | 64 |
</ImportGroup> |
| 65 |
- <PropertyGroup Label="UserMacros"/> |
|
| 65 |
+ <PropertyGroup Label="UserMacros" /> |
|
| 66 | 66 |
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> |
| 67 | 67 |
<LinkIncremental>true</LinkIncremental> |
| 68 | 68 |
<IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir> |
| ... | ... |
@@ -89,13 +88,14 @@ |
| 89 | 89 |
<WarningLevel>Level3</WarningLevel> |
| 90 | 90 |
<Optimization>Disabled</Optimization> |
| 91 | 91 |
<PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| 92 |
- <AdditionalIncludeDirectories>"$(SolutionDir)";"$(SolutionDir)..\libclamav";"$(SolutionDir)compat";"$(SolutionDir)3rdparty\zlib";"$(SolutionDir)3rdparty\pthreads";"$(SolutionDir)3rdparty\bzip2";"$(SolutionDir).."</AdditionalIncludeDirectories> |
|
| 92 |
+ <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)..;C:\clamdeps\win32\openssl\include</AdditionalIncludeDirectories> |
|
| 93 | 93 |
<CompileAs>CompileAsC</CompileAs> |
| 94 | 94 |
<DisableSpecificWarnings>4996;4244</DisableSpecificWarnings> |
| 95 | 95 |
</ClCompile> |
| 96 | 96 |
<Link> |
| 97 | 97 |
<SubSystem>Console</SubSystem> |
| 98 | 98 |
<GenerateDebugInformation>true</GenerateDebugInformation> |
| 99 |
+ <AdditionalLibraryDirectories>C:\clamdeps\win32\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 99 | 100 |
</Link> |
| 100 | 101 |
</ItemDefinitionGroup> |
| 101 | 102 |
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> |
| ... | ... |
@@ -152,18 +152,18 @@ |
| 152 | 152 |
</Link> |
| 153 | 153 |
</ItemDefinitionGroup> |
| 154 | 154 |
<ItemGroup> |
| 155 |
- <ClCompile Include="..\clamconf\clamconf.c"/> |
|
| 156 |
- <ClCompile Include="..\shared\misc.c"/> |
|
| 155 |
+ <ClCompile Include="..\clamconf\clamconf.c" /> |
|
| 156 |
+ <ClCompile Include="..\shared\misc.c" /> |
|
| 157 | 157 |
</ItemGroup> |
| 158 | 158 |
<ItemGroup> |
| 159 |
- <ResourceCompile Include="res\clamconf.rc"/> |
|
| 159 |
+ <ResourceCompile Include="res\clamconf.rc" /> |
|
| 160 | 160 |
</ItemGroup> |
| 161 | 161 |
<ItemGroup> |
| 162 | 162 |
<ProjectReference Include="libclamav.vcxproj"> |
| 163 | 163 |
<Project>{09d341e9-7372-46e9-b0d7-caaf77984190}</Project>
|
| 164 | 164 |
</ProjectReference> |
| 165 | 165 |
</ItemGroup> |
| 166 |
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/> |
|
| 166 |
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> |
|
| 167 | 167 |
<ImportGroup Label="ExtensionTargets"> |
| 168 | 168 |
</ImportGroup> |
| 169 |
-</Project> |
|
| 169 |
+</Project> |
|
| 170 | 170 |
\ No newline at end of file |
| ... | ... |
@@ -1,5 +1,4 @@ |
| 1 |
-<?xml version="1.0" encoding="utf-8"?> |
|
| 2 |
- |
|
| 1 |
+<?xml version="1.0" encoding="utf-8"?> |
|
| 3 | 2 |
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
| 4 | 3 |
<ItemGroup Label="ProjectConfigurations"> |
| 5 | 4 |
<ProjectConfiguration Include="Debug|Win32"> |
| ... | ... |
@@ -24,7 +23,7 @@ |
| 24 | 24 |
<Keyword>Win32Proj</Keyword> |
| 25 | 25 |
<RootNamespace>clamd</RootNamespace> |
| 26 | 26 |
</PropertyGroup> |
| 27 |
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props"/> |
|
| 27 |
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> |
|
| 28 | 28 |
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> |
| 29 | 29 |
<ConfigurationType>Application</ConfigurationType> |
| 30 | 30 |
<UseDebugLibraries>true</UseDebugLibraries> |
| ... | ... |
@@ -47,22 +46,22 @@ |
| 47 | 47 |
<WholeProgramOptimization>true</WholeProgramOptimization> |
| 48 | 48 |
<CharacterSet>MultiByte</CharacterSet> |
| 49 | 49 |
</PropertyGroup> |
| 50 |
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props"/> |
|
| 50 |
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> |
|
| 51 | 51 |
<ImportGroup Label="ExtensionSettings"> |
| 52 | 52 |
</ImportGroup> |
| 53 | 53 |
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> |
| 54 |
- <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
|
|
| 54 |
+ <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
|
|
| 55 | 55 |
</ImportGroup> |
| 56 | 56 |
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> |
| 57 |
- <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
|
|
| 57 |
+ <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
|
|
| 58 | 58 |
</ImportGroup> |
| 59 | 59 |
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> |
| 60 |
- <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
|
|
| 60 |
+ <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
|
|
| 61 | 61 |
</ImportGroup> |
| 62 | 62 |
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> |
| 63 |
- <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
|
|
| 63 |
+ <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
|
|
| 64 | 64 |
</ImportGroup> |
| 65 |
- <PropertyGroup Label="UserMacros"/> |
|
| 65 |
+ <PropertyGroup Label="UserMacros" /> |
|
| 66 | 66 |
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> |
| 67 | 67 |
<LinkIncremental>true</LinkIncremental> |
| 68 | 68 |
<IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir> |
| ... | ... |
@@ -89,13 +88,14 @@ |
| 89 | 89 |
<WarningLevel>Level3</WarningLevel> |
| 90 | 90 |
<Optimization>Disabled</Optimization> |
| 91 | 91 |
<PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| 92 |
- <AdditionalIncludeDirectories>"$(SolutionDir)";"$(SolutionDir)..\libclamav";"$(SolutionDir)compat";"$(SolutionDir)3rdparty\zlib";"$(SolutionDir)3rdparty\pthreads";"$(SolutionDir)3rdparty\bzip2";"$(SolutionDir).."</AdditionalIncludeDirectories> |
|
| 92 |
+ <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)..;C:\clamdeps\win32\openssl\include</AdditionalIncludeDirectories> |
|
| 93 | 93 |
<CompileAs>CompileAsC</CompileAs> |
| 94 | 94 |
<DisableSpecificWarnings>4996;4244;4090;4018;4101</DisableSpecificWarnings> |
| 95 | 95 |
</ClCompile> |
| 96 | 96 |
<Link> |
| 97 | 97 |
<SubSystem>Console</SubSystem> |
| 98 | 98 |
<GenerateDebugInformation>true</GenerateDebugInformation> |
| 99 |
+ <AdditionalLibraryDirectories>C:\clamdeps\win32\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 99 | 100 |
</Link> |
| 100 | 101 |
</ItemDefinitionGroup> |
| 101 | 102 |
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> |
| ... | ... |
@@ -152,27 +152,27 @@ |
| 152 | 152 |
</Link> |
| 153 | 153 |
</ItemDefinitionGroup> |
| 154 | 154 |
<ItemGroup> |
| 155 |
- <ResourceCompile Include="res\clamd.rc"/> |
|
| 155 |
+ <ResourceCompile Include="res\clamd.rc" /> |
|
| 156 | 156 |
</ItemGroup> |
| 157 | 157 |
<ItemGroup> |
| 158 |
- <ClCompile Include="..\clamd\fan.c"/> |
|
| 159 |
- <ClCompile Include="..\clamd\clamd.c"/> |
|
| 160 |
- <ClCompile Include="..\clamd\localserver.c"/> |
|
| 161 |
- <ClCompile Include="..\clamd\others.c"/> |
|
| 162 |
- <ClCompile Include="..\clamd\scanner.c"/> |
|
| 163 |
- <ClCompile Include="..\clamd\server-th.c"/> |
|
| 164 |
- <ClCompile Include="..\clamd\session.c"/> |
|
| 165 |
- <ClCompile Include="..\clamd\tcpserver.c"/> |
|
| 166 |
- <ClCompile Include="..\clamd\thrmgr.c"/> |
|
| 167 |
- <ClCompile Include="..\shared\misc.c"/> |
|
| 168 |
- <ClCompile Include="..\shared\output.c"/> |
|
| 158 |
+ <ClCompile Include="..\clamd\fan.c" /> |
|
| 159 |
+ <ClCompile Include="..\clamd\clamd.c" /> |
|
| 160 |
+ <ClCompile Include="..\clamd\localserver.c" /> |
|
| 161 |
+ <ClCompile Include="..\clamd\others.c" /> |
|
| 162 |
+ <ClCompile Include="..\clamd\scanner.c" /> |
|
| 163 |
+ <ClCompile Include="..\clamd\server-th.c" /> |
|
| 164 |
+ <ClCompile Include="..\clamd\session.c" /> |
|
| 165 |
+ <ClCompile Include="..\clamd\tcpserver.c" /> |
|
| 166 |
+ <ClCompile Include="..\clamd\thrmgr.c" /> |
|
| 167 |
+ <ClCompile Include="..\shared\misc.c" /> |
|
| 168 |
+ <ClCompile Include="..\shared\output.c" /> |
|
| 169 | 169 |
</ItemGroup> |
| 170 | 170 |
<ItemGroup> |
| 171 | 171 |
<ProjectReference Include="libclamav.vcxproj"> |
| 172 | 172 |
<Project>{09d341e9-7372-46e9-b0d7-caaf77984190}</Project>
|
| 173 | 173 |
</ProjectReference> |
| 174 | 174 |
</ItemGroup> |
| 175 |
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/> |
|
| 175 |
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> |
|
| 176 | 176 |
<ImportGroup Label="ExtensionTargets"> |
| 177 | 177 |
</ImportGroup> |
| 178 |
-</Project> |
|
| 178 |
+</Project> |
|
| 179 | 179 |
\ No newline at end of file |
| ... | ... |
@@ -1,5 +1,4 @@ |
| 1 |
-<?xml version="1.0" encoding="utf-8"?> |
|
| 2 |
- |
|
| 1 |
+<?xml version="1.0" encoding="utf-8"?> |
|
| 3 | 2 |
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
| 4 | 3 |
<ItemGroup Label="ProjectConfigurations"> |
| 5 | 4 |
<ProjectConfiguration Include="Debug|Win32"> |
| ... | ... |
@@ -24,7 +23,7 @@ |
| 24 | 24 |
<Keyword>Win32Proj</Keyword> |
| 25 | 25 |
<RootNamespace>clamdscan</RootNamespace> |
| 26 | 26 |
</PropertyGroup> |
| 27 |
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props"/> |
|
| 27 |
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> |
|
| 28 | 28 |
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> |
| 29 | 29 |
<ConfigurationType>Application</ConfigurationType> |
| 30 | 30 |
<UseDebugLibraries>true</UseDebugLibraries> |
| ... | ... |
@@ -47,22 +46,22 @@ |
| 47 | 47 |
<WholeProgramOptimization>true</WholeProgramOptimization> |
| 48 | 48 |
<CharacterSet>MultiByte</CharacterSet> |
| 49 | 49 |
</PropertyGroup> |
| 50 |
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props"/> |
|
| 50 |
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> |
|
| 51 | 51 |
<ImportGroup Label="ExtensionSettings"> |
| 52 | 52 |
</ImportGroup> |
| 53 | 53 |
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> |
| 54 |
- <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
|
|
| 54 |
+ <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
|
|
| 55 | 55 |
</ImportGroup> |
| 56 | 56 |
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> |
| 57 |
- <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
|
|
| 57 |
+ <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
|
|
| 58 | 58 |
</ImportGroup> |
| 59 | 59 |
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> |
| 60 |
- <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
|
|
| 60 |
+ <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
|
|
| 61 | 61 |
</ImportGroup> |
| 62 | 62 |
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> |
| 63 |
- <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
|
|
| 63 |
+ <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
|
|
| 64 | 64 |
</ImportGroup> |
| 65 |
- <PropertyGroup Label="UserMacros"/> |
|
| 65 |
+ <PropertyGroup Label="UserMacros" /> |
|
| 66 | 66 |
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> |
| 67 | 67 |
<LinkIncremental>true</LinkIncremental> |
| 68 | 68 |
<IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir> |
| ... | ... |
@@ -89,13 +88,14 @@ |
| 89 | 89 |
<WarningLevel>Level3</WarningLevel> |
| 90 | 90 |
<Optimization>Disabled</Optimization> |
| 91 | 91 |
<PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| 92 |
- <AdditionalIncludeDirectories>"$(SolutionDir)";"$(SolutionDir)..\libclamav";"$(SolutionDir)compat";"$(SolutionDir)3rdparty\zlib";"$(SolutionDir)3rdparty\pthreads";"$(SolutionDir)3rdparty\bzip2";"$(SolutionDir).."</AdditionalIncludeDirectories> |
|
| 92 |
+ <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)..;C:\clamdeps\win32\openssl\include</AdditionalIncludeDirectories> |
|
| 93 | 93 |
<CompileAs>CompileAsC</CompileAs> |
| 94 | 94 |
<DisableSpecificWarnings>4996;4244</DisableSpecificWarnings> |
| 95 | 95 |
</ClCompile> |
| 96 | 96 |
<Link> |
| 97 | 97 |
<SubSystem>Console</SubSystem> |
| 98 | 98 |
<GenerateDebugInformation>true</GenerateDebugInformation> |
| 99 |
+ <AdditionalLibraryDirectories>C:\clamdeps\win32\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 99 | 100 |
</Link> |
| 100 | 101 |
</ItemDefinitionGroup> |
| 101 | 102 |
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> |
| ... | ... |
@@ -152,23 +152,23 @@ |
| 152 | 152 |
</Link> |
| 153 | 153 |
</ItemDefinitionGroup> |
| 154 | 154 |
<ItemGroup> |
| 155 |
- <ResourceCompile Include="res\clamdscan.rc"/> |
|
| 155 |
+ <ResourceCompile Include="res\clamdscan.rc" /> |
|
| 156 | 156 |
</ItemGroup> |
| 157 | 157 |
<ItemGroup> |
| 158 |
- <ClCompile Include="..\shared\clamdcom.c"/> |
|
| 159 |
- <ClCompile Include="..\clamdscan\clamdscan.c"/> |
|
| 160 |
- <ClCompile Include="..\clamdscan\client.c"/> |
|
| 161 |
- <ClCompile Include="..\clamdscan\proto.c"/> |
|
| 162 |
- <ClCompile Include="..\shared\actions.c"/> |
|
| 163 |
- <ClCompile Include="..\shared\misc.c"/> |
|
| 164 |
- <ClCompile Include="..\shared\output.c"/> |
|
| 158 |
+ <ClCompile Include="..\shared\clamdcom.c" /> |
|
| 159 |
+ <ClCompile Include="..\clamdscan\clamdscan.c" /> |
|
| 160 |
+ <ClCompile Include="..\clamdscan\client.c" /> |
|
| 161 |
+ <ClCompile Include="..\clamdscan\proto.c" /> |
|
| 162 |
+ <ClCompile Include="..\shared\actions.c" /> |
|
| 163 |
+ <ClCompile Include="..\shared\misc.c" /> |
|
| 164 |
+ <ClCompile Include="..\shared\output.c" /> |
|
| 165 | 165 |
</ItemGroup> |
| 166 | 166 |
<ItemGroup> |
| 167 | 167 |
<ProjectReference Include="libclamav.vcxproj"> |
| 168 | 168 |
<Project>{09d341e9-7372-46e9-b0d7-caaf77984190}</Project>
|
| 169 | 169 |
</ProjectReference> |
| 170 | 170 |
</ItemGroup> |
| 171 |
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/> |
|
| 171 |
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> |
|
| 172 | 172 |
<ImportGroup Label="ExtensionTargets"> |
| 173 | 173 |
</ImportGroup> |
| 174 |
-</Project> |
|
| 174 |
+</Project> |
|
| 175 | 175 |
\ No newline at end of file |
| ... | ... |
@@ -37,5 +37,8 @@ |
| 37 | 37 |
<ClCompile Include="..\shared\misc.c"> |
| 38 | 38 |
<Filter>Source Files\shared</Filter> |
| 39 | 39 |
</ClCompile> |
| 40 |
+ <ClCompile Include="..\shared\clamdcom.c"> |
|
| 41 |
+ <Filter>Source Files</Filter> |
|
| 42 |
+ </ClCompile> |
|
| 40 | 43 |
</ItemGroup> |
| 41 | 44 |
</Project> |
| 42 | 45 |
\ No newline at end of file |
| ... | ... |
@@ -1,5 +1,4 @@ |
| 1 |
-<?xml version="1.0" encoding="utf-8"?> |
|
| 2 |
- |
|
| 1 |
+<?xml version="1.0" encoding="utf-8"?> |
|
| 3 | 2 |
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
| 4 | 3 |
<ItemGroup Label="ProjectConfigurations"> |
| 5 | 4 |
<ProjectConfiguration Include="Debug|Win32"> |
| ... | ... |
@@ -24,7 +23,7 @@ |
| 24 | 24 |
<Keyword>Win32Proj</Keyword> |
| 25 | 25 |
<RootNamespace>clamscan</RootNamespace> |
| 26 | 26 |
</PropertyGroup> |
| 27 |
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props"/> |
|
| 27 |
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> |
|
| 28 | 28 |
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> |
| 29 | 29 |
<ConfigurationType>Application</ConfigurationType> |
| 30 | 30 |
<UseDebugLibraries>true</UseDebugLibraries> |
| ... | ... |
@@ -47,22 +46,22 @@ |
| 47 | 47 |
<WholeProgramOptimization>true</WholeProgramOptimization> |
| 48 | 48 |
<CharacterSet>MultiByte</CharacterSet> |
| 49 | 49 |
</PropertyGroup> |
| 50 |
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props"/> |
|
| 50 |
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> |
|
| 51 | 51 |
<ImportGroup Label="ExtensionSettings"> |
| 52 | 52 |
</ImportGroup> |
| 53 | 53 |
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> |
| 54 |
- <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
|
|
| 54 |
+ <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
|
|
| 55 | 55 |
</ImportGroup> |
| 56 | 56 |
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> |
| 57 |
- <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
|
|
| 57 |
+ <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
|
|
| 58 | 58 |
</ImportGroup> |
| 59 | 59 |
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> |
| 60 |
- <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
|
|
| 60 |
+ <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
|
|
| 61 | 61 |
</ImportGroup> |
| 62 | 62 |
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> |
| 63 |
- <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
|
|
| 63 |
+ <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
|
|
| 64 | 64 |
</ImportGroup> |
| 65 |
- <PropertyGroup Label="UserMacros"/> |
|
| 65 |
+ <PropertyGroup Label="UserMacros" /> |
|
| 66 | 66 |
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> |
| 67 | 67 |
<LinkIncremental>true</LinkIncremental> |
| 68 | 68 |
<IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir> |
| ... | ... |
@@ -89,7 +88,7 @@ |
| 89 | 89 |
<WarningLevel>Level3</WarningLevel> |
| 90 | 90 |
<Optimization>Disabled</Optimization> |
| 91 | 91 |
<PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| 92 |
- <AdditionalIncludeDirectories>"$(SolutionDir)";"$(SolutionDir)..\libclamav";"$(SolutionDir)compat";"$(SolutionDir)3rdparty\zlib";"$(SolutionDir)3rdparty\pthreads";"$(SolutionDir)3rdparty\bzip2";"$(SolutionDir).."</AdditionalIncludeDirectories> |
|
| 92 |
+ <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)..;C:\clamdeps\win32\openssl\include</AdditionalIncludeDirectories> |
|
| 93 | 93 |
<CompileAs>CompileAsC</CompileAs> |
| 94 | 94 |
<DisableSpecificWarnings>4996;4244</DisableSpecificWarnings> |
| 95 | 95 |
</ClCompile> |
| ... | ... |
@@ -152,21 +151,21 @@ |
| 152 | 152 |
</Link> |
| 153 | 153 |
</ItemDefinitionGroup> |
| 154 | 154 |
<ItemGroup> |
| 155 |
- <ResourceCompile Include="res\clamscan.rc"/> |
|
| 155 |
+ <ResourceCompile Include="res\clamscan.rc" /> |
|
| 156 | 156 |
</ItemGroup> |
| 157 | 157 |
<ItemGroup> |
| 158 |
- <ClCompile Include="..\clamscan\clamscan.c"/> |
|
| 159 |
- <ClCompile Include="..\clamscan\manager.c"/> |
|
| 160 |
- <ClCompile Include="..\shared\actions.c"/> |
|
| 161 |
- <ClCompile Include="..\shared\misc.c"/> |
|
| 162 |
- <ClCompile Include="..\shared\output.c"/> |
|
| 158 |
+ <ClCompile Include="..\clamscan\clamscan.c" /> |
|
| 159 |
+ <ClCompile Include="..\clamscan\manager.c" /> |
|
| 160 |
+ <ClCompile Include="..\shared\actions.c" /> |
|
| 161 |
+ <ClCompile Include="..\shared\misc.c" /> |
|
| 162 |
+ <ClCompile Include="..\shared\output.c" /> |
|
| 163 | 163 |
</ItemGroup> |
| 164 | 164 |
<ItemGroup> |
| 165 | 165 |
<ProjectReference Include="libclamav.vcxproj"> |
| 166 | 166 |
<Project>{09d341e9-7372-46e9-b0d7-caaf77984190}</Project>
|
| 167 | 167 |
</ProjectReference> |
| 168 | 168 |
</ItemGroup> |
| 169 |
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/> |
|
| 169 |
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> |
|
| 170 | 170 |
<ImportGroup Label="ExtensionTargets"> |
| 171 | 171 |
</ImportGroup> |
| 172 |
-</Project> |
|
| 172 |
+</Project> |
|
| 173 | 173 |
\ No newline at end of file |
| ... | ... |
@@ -19,6 +19,11 @@ |
| 19 | 19 |
*/ |
| 20 | 20 |
|
| 21 | 21 |
#include <errno.h> |
| 22 |
+ |
|
| 23 |
+#include <openssl/ssl.h> |
|
| 24 |
+#include <openssl/err.h> |
|
| 25 |
+#include "libclamav/crypto.h" |
|
| 26 |
+ |
|
| 22 | 27 |
#include "others.h" |
| 23 | 28 |
#include "dirent.h" |
| 24 | 29 |
#include "w32_stat.h" |
| ... | ... |
@@ -100,4 +105,4 @@ int closedir(DIR *dirp) {
|
| 100 | 100 |
rewinddir(dirp); |
| 101 | 101 |
free(dirp); |
| 102 | 102 |
return 0; |
| 103 |
-} |
|
| 104 | 103 |
\ No newline at end of file |
| 104 |
+} |
| ... | ... |
@@ -1,5 +1,4 @@ |
| 1 |
-<?xml version="1.0" encoding="utf-8"?> |
|
| 2 |
- |
|
| 1 |
+<?xml version="1.0" encoding="utf-8"?> |
|
| 3 | 2 |
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
| 4 | 3 |
<ItemGroup Label="ProjectConfigurations"> |
| 5 | 4 |
<ProjectConfiguration Include="Debug|Win32"> |
| ... | ... |
@@ -24,7 +23,7 @@ |
| 24 | 24 |
<Keyword>Win32Proj</Keyword> |
| 25 | 25 |
<RootNamespace>freshclam</RootNamespace> |
| 26 | 26 |
</PropertyGroup> |
| 27 |
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props"/> |
|
| 27 |
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> |
|
| 28 | 28 |
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> |
| 29 | 29 |
<ConfigurationType>Application</ConfigurationType> |
| 30 | 30 |
<UseDebugLibraries>true</UseDebugLibraries> |
| ... | ... |
@@ -47,22 +46,22 @@ |
| 47 | 47 |
<WholeProgramOptimization>true</WholeProgramOptimization> |
| 48 | 48 |
<CharacterSet>MultiByte</CharacterSet> |
| 49 | 49 |
</PropertyGroup> |
| 50 |
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props"/> |
|
| 50 |
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> |
|
| 51 | 51 |
<ImportGroup Label="ExtensionSettings"> |
| 52 | 52 |
</ImportGroup> |
| 53 | 53 |
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> |
| 54 |
- <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
|
|
| 54 |
+ <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
|
|
| 55 | 55 |
</ImportGroup> |
| 56 | 56 |
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> |
| 57 |
- <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
|
|
| 57 |
+ <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
|
|
| 58 | 58 |
</ImportGroup> |
| 59 | 59 |
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> |
| 60 |
- <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
|
|
| 60 |
+ <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
|
|
| 61 | 61 |
</ImportGroup> |
| 62 | 62 |
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> |
| 63 |
- <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
|
|
| 63 |
+ <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
|
|
| 64 | 64 |
</ImportGroup> |
| 65 |
- <PropertyGroup Label="UserMacros"/> |
|
| 65 |
+ <PropertyGroup Label="UserMacros" /> |
|
| 66 | 66 |
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> |
| 67 | 67 |
<LinkIncremental>true</LinkIncremental> |
| 68 | 68 |
<IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir> |
| ... | ... |
@@ -89,7 +88,7 @@ |
| 89 | 89 |
<WarningLevel>Level3</WarningLevel> |
| 90 | 90 |
<Optimization>Disabled</Optimization> |
| 91 | 91 |
<PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| 92 |
- <AdditionalIncludeDirectories>"$(SolutionDir)";"$(SolutionDir)..\libclamav";"$(SolutionDir)compat";"$(SolutionDir)3rdparty\zlib";"$(SolutionDir)3rdparty\pthreads";"$(SolutionDir)3rdparty\bzip2";"$(SolutionDir).."</AdditionalIncludeDirectories> |
|
| 92 |
+ <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)..;C:\clamdeps\win32\openssl\include</AdditionalIncludeDirectories> |
|
| 93 | 93 |
<CompileAs>CompileAsC</CompileAs> |
| 94 | 94 |
<DisableSpecificWarnings>4996;4244;4101;4102;4018</DisableSpecificWarnings> |
| 95 | 95 |
</ClCompile> |
| ... | ... |
@@ -97,6 +96,7 @@ |
| 97 | 97 |
<SubSystem>Console</SubSystem> |
| 98 | 98 |
<GenerateDebugInformation>true</GenerateDebugInformation> |
| 99 | 99 |
<AdditionalDependencies>dnsapi.lib;%(AdditionalDependencies)</AdditionalDependencies> |
| 100 |
+ <AdditionalLibraryDirectories>C:\clamdeps\win32\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 100 | 101 |
</Link> |
| 101 | 102 |
</ItemDefinitionGroup> |
| 102 | 103 |
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> |
| ... | ... |
@@ -156,30 +156,34 @@ |
| 156 | 156 |
</Link> |
| 157 | 157 |
</ItemDefinitionGroup> |
| 158 | 158 |
<ItemGroup> |
| 159 |
- <ResourceCompile Include="res\freshclam.rc"/> |
|
| 159 |
+ <ResourceCompile Include="res\freshclam.rc" /> |
|
| 160 | 160 |
</ItemGroup> |
| 161 | 161 |
<ItemGroup> |
| 162 |
- <ClCompile Include="..\shared\clamdcom.c"/> |
|
| 163 |
- <ClCompile Include="..\freshclam\dns.c"/> |
|
| 164 |
- <ClCompile Include="..\freshclam\execute.c"/> |
|
| 165 |
- <ClCompile Include="..\freshclam\freshclam.c"/> |
|
| 166 |
- <ClCompile Include="..\freshclam\manager.c"/> |
|
| 167 |
- <ClCompile Include="..\freshclam\mirman.c"/> |
|
| 168 |
- <ClCompile Include="..\freshclam\nonblock.c"/> |
|
| 169 |
- <ClCompile Include="..\freshclam\notify.c"/> |
|
| 170 |
- <ClCompile Include="..\shared\cdiff.c"/> |
|
| 171 |
- <ClCompile Include="..\shared\misc.c"/> |
|
| 172 |
- <ClCompile Include="..\shared\output.c"/> |
|
| 173 |
- <ClCompile Include="..\shared\tar.c"/> |
|
| 174 |
- <ClCompile Include="compat\resolv.c"/> |
|
| 175 |
- <ClCompile Include="compat\strptime.c"/> |
|
| 162 |
+ <ClCompile Include="..\shared\clamdcom.c" /> |
|
| 163 |
+ <ClCompile Include="..\freshclam\dns.c" /> |
|
| 164 |
+ <ClCompile Include="..\freshclam\execute.c" /> |
|
| 165 |
+ <ClCompile Include="..\freshclam\freshclam.c" /> |
|
| 166 |
+ <ClCompile Include="..\freshclam\manager.c" /> |
|
| 167 |
+ <ClCompile Include="..\freshclam\mirman.c" /> |
|
| 168 |
+ <ClCompile Include="..\freshclam\nonblock.c" /> |
|
| 169 |
+ <ClCompile Include="..\freshclam\notify.c" /> |
|
| 170 |
+ <ClCompile Include="..\shared\cdiff.c" /> |
|
| 171 |
+ <ClCompile Include="..\shared\misc.c" /> |
|
| 172 |
+ <ClCompile Include="..\shared\output.c" /> |
|
| 173 |
+ <ClCompile Include="..\shared\tar.c" /> |
|
| 174 |
+ <ClCompile Include="compat\resolv.c" /> |
|
| 175 |
+ <ClCompile Include="compat\strptime.c" /> |
|
| 176 | 176 |
</ItemGroup> |
| 177 | 177 |
<ItemGroup> |
| 178 | 178 |
<ProjectReference Include="libclamav.vcxproj"> |
| 179 | 179 |
<Project>{09d341e9-7372-46e9-b0d7-caaf77984190}</Project>
|
| 180 | 180 |
</ProjectReference> |
| 181 | 181 |
</ItemGroup> |
| 182 |
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/> |
|
| 182 |
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> |
|
| 183 | 183 |
<ImportGroup Label="ExtensionTargets"> |
| 184 | 184 |
</ImportGroup> |
| 185 |
-</Project> |
|
| 185 |
+ <ItemGroup> |
|
| 186 |
+ <Library Include="libeay32.lib" /> |
|
| 187 |
+ <Library Include="ssleay32.lib" /> |
|
| 188 |
+ </ItemGroup> |
|
| 189 |
+</Project> |
|
| 186 | 190 |
\ No newline at end of file |
| ... | ... |
@@ -61,5 +61,12 @@ |
| 61 | 61 |
<ClCompile Include="compat\resolv.c"> |
| 62 | 62 |
<Filter>Source Files\compat</Filter> |
| 63 | 63 |
</ClCompile> |
| 64 |
+ <ClCompile Include="..\shared\clamdcom.c"> |
|
| 65 |
+ <Filter>Source Files</Filter> |
|
| 66 |
+ </ClCompile> |
|
| 67 |
+ </ItemGroup> |
|
| 68 |
+ <ItemGroup> |
|
| 69 |
+ <Library Include="libeay32.lib" /> |
|
| 70 |
+ <Library Include="ssleay32.lib" /> |
|
| 64 | 71 |
</ItemGroup> |
| 65 | 72 |
</Project> |
| 66 | 73 |
\ No newline at end of file |
| ... | ... |
@@ -51,7 +51,25 @@ EXPORTS cl_engine_set_clcb_stats_flush @43 |
| 51 | 51 |
EXPORTS cl_engine_set_clcb_stats_get_num @44 |
| 52 | 52 |
EXPORTS cl_engine_set_clcb_stats_get_size @45 |
| 53 | 53 |
EXPORTS cl_engine_set_clcb_stats_get_hostid @46 |
| 54 |
- |
|
| 54 |
+EXPORTS cl_hash_data @47 |
|
| 55 |
+EXPORTS cl_initialize_crypto @48 |
|
| 56 |
+EXPORTS cl_cleanup_crypto @49 |
|
| 57 |
+EXPORTS cl_hash_file_fd @50 |
|
| 58 |
+EXPORTS cl_hash_file_fp @51 |
|
| 59 |
+EXPORTS cl_sha256 @52 |
|
| 60 |
+EXPORTS cl_sha1 @53 |
|
| 61 |
+EXPORTS cl_verify_signature @54 |
|
| 62 |
+EXPORTS cl_verify_signature_x509_keyfile @55 |
|
| 63 |
+EXPORTS cl_verify_signature_x509 @56 |
|
| 64 |
+EXPORTS cl_sign_data_keyfile @57 |
|
| 65 |
+EXPORTS cl_sign_data @58 |
|
| 66 |
+EXPORTS cl_sign_file_fd @59 |
|
| 67 |
+EXPORTS cl_sign_file_fp @60 |
|
| 68 |
+EXPORTS cl_get_x509_from_mem @61 |
|
| 69 |
+EXPORTS cl_validate_certificate_chain @62 |
|
| 70 |
+EXPORTS cl_load_cert @63 |
|
| 71 |
+EXPORTS cl_ASN1_GetTimeT @64 |
|
| 72 |
+EXPORTS cl_load_crl @65 |
|
| 55 | 73 |
|
| 56 | 74 |
; path variables |
| 57 | 75 |
; -------------- |
| ... | ... |
@@ -150,13 +168,6 @@ EXPORTS readdir @44273 NONAME |
| 150 | 150 |
EXPORTS closedir @44274 NONAME |
| 151 | 151 |
EXPORTS safe_open @44275 NONAME |
| 152 | 152 |
EXPORTS snprintf @44276 NONAME |
| 153 |
-; SHA1 numbers reused from mp_* functions |
|
| 154 |
-EXPORTS SHA1Init @44277 NONAME |
|
| 155 |
-EXPORTS SHA1Update @44278 NONAME |
|
| 156 |
-EXPORTS SHA1Final @44279 NONAME |
|
| 157 |
-EXPORTS sha256_init @44280 NONAME |
|
| 158 |
-EXPORTS sha256_update @44281 NONAME |
|
| 159 |
-EXPORTS sha256_final @44282 NONAME |
|
| 160 | 153 |
EXPORTS optget @44283 NONAME |
| 161 | 154 |
EXPORTS optparse @44284 NONAME |
| 162 | 155 |
EXPORTS optfree @44285 NONAME |
| ... | ... |
@@ -88,7 +88,7 @@ |
| 88 | 88 |
<WarningLevel>Level3</WarningLevel> |
| 89 | 89 |
<Optimization>Disabled</Optimization> |
| 90 | 90 |
<PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;PTW32_STATIC_LIB;THIS_IS_LIBCLAMAV;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBCLAMAV_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| 91 |
- <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\libxml2;$(SolutionDir)3rdparty\libxml2\include;$(SolutionDir)..</AdditionalIncludeDirectories> |
|
| 91 |
+ <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\libxml2;$(SolutionDir)3rdparty\libxml2\include;$(SolutionDir)..;C:\clamdeps\win32\openssl\include</AdditionalIncludeDirectories> |
|
| 92 | 92 |
<CompileAs>CompileAsC</CompileAs> |
| 93 | 93 |
<DisableSpecificWarnings>4996;4090;4244;4018;4101;4333;4146</DisableSpecificWarnings> |
| 94 | 94 |
</ClCompile> |
| ... | ... |
@@ -97,6 +97,7 @@ |
| 97 | 97 |
<GenerateDebugInformation>true</GenerateDebugInformation> |
| 98 | 98 |
<AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> |
| 99 | 99 |
<ModuleDefinitionFile>$(SolutionDir)libclamav.def</ModuleDefinitionFile> |
| 100 |
+ <AdditionalLibraryDirectories>C:\clamdeps\win32\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 100 | 101 |
</Link> |
| 101 | 102 |
</ItemDefinitionGroup> |
| 102 | 103 |
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> |
| ... | ... |
@@ -173,6 +174,8 @@ |
| 173 | 173 |
<ClCompile Include="..\libclamav\7z\XzCrc64.c" /> |
| 174 | 174 |
<ClCompile Include="..\libclamav\7z\XzDec.c" /> |
| 175 | 175 |
<ClCompile Include="..\libclamav\7z\XzIn.c" /> |
| 176 |
+ <ClCompile Include="..\libclamav\conv.c" /> |
|
| 177 |
+ <ClCompile Include="..\libclamav\crypto.c" /> |
|
| 176 | 178 |
<ClCompile Include="..\libclamav\fpu.c" /> |
| 177 | 179 |
<ClCompile Include="..\libclamav\hostid.c" /> |
| 178 | 180 |
<ClCompile Include="..\libclamav\json.c" /> |
| ... | ... |
@@ -276,7 +279,6 @@ |
| 276 | 276 |
<ClCompile Include="..\libclamav\jpeg.c" /> |
| 277 | 277 |
<ClCompile Include="..\libclamav\swf.c" /> |
| 278 | 278 |
<ClCompile Include="..\libclamav\matcher-hash.c" /> |
| 279 |
- <ClCompile Include="..\libclamav\sha1.c" /> |
|
| 280 | 279 |
<ClCompile Include="..\libclamav\events.c" /> |
| 281 | 280 |
<ClCompile Include="..\libclamav\bytecode_detect.c" /> |
| 282 | 281 |
<ClCompile Include="..\libclamav\regex_list.c" /> |
| ... | ... |
@@ -341,7 +343,6 @@ |
| 341 | 341 |
<ClCompile Include="..\libclamav\matcher-bm.c" /> |
| 342 | 342 |
<ClCompile Include="..\libclamav\matcher.c" /> |
| 343 | 343 |
<ClCompile Include="..\libclamav\mbox.c" /> |
| 344 |
- <ClCompile Include="..\libclamav\md5.c" /> |
|
| 345 | 344 |
<ClCompile Include="..\libclamav\message.c" /> |
| 346 | 345 |
<ClCompile Include="..\libclamav\mew.c" /> |
| 347 | 346 |
<ClCompile Include="..\libclamav\mpool.c" /> |
| ... | ... |
@@ -372,7 +373,6 @@ |
| 372 | 372 |
<ClCompile Include="..\libclamav\regex\regexec.c" /> |
| 373 | 373 |
<ClCompile Include="..\libclamav\regex\regfree.c" /> |
| 374 | 374 |
<ClCompile Include="..\libclamav\regex\strlcpy.c" /> |
| 375 |
- <ClCompile Include="..\libclamav\sha256.c" /> |
|
| 376 | 375 |
<ClCompile Include="..\libclamav\sis.c" /> |
| 377 | 376 |
<ClCompile Include="..\libclamav\special.c" /> |
| 378 | 377 |
<ClCompile Include="..\libclamav\spin.c" /> |
| ... | ... |
@@ -472,6 +472,7 @@ |
| 472 | 472 |
<ClCompile Include="compat\net.c" /> |
| 473 | 473 |
<ClCompile Include="compat\random.c" /> |
| 474 | 474 |
<ClCompile Include="compat\snprintf.c" /> |
| 475 |
+ <ClCompile Include="compat\strptime.c" /> |
|
| 475 | 476 |
<ClCompile Include="compat\utf8_util.c" /> |
| 476 | 477 |
<ClCompile Include="compat\w32_errno.c" /> |
| 477 | 478 |
<ClCompile Include="compat\w32_stat.c" /> |
| ... | ... |
@@ -494,6 +495,8 @@ |
| 494 | 494 |
</ProjectReference> |
| 495 | 495 |
</ItemGroup> |
| 496 | 496 |
<ItemGroup> |
| 497 |
+ <ClInclude Include="..\libclamav\conv.h" /> |
|
| 498 |
+ <ClInclude Include="..\libclamav\crypto.h" /> |
|
| 497 | 499 |
<ClInclude Include="..\libclamav\hostid.h" /> |
| 498 | 500 |
<ClInclude Include="..\libclamav\json.h" /> |
| 499 | 501 |
<ClInclude Include="..\libclamav\stats.h" /> |
| ... | ... |
@@ -502,4 +505,8 @@ |
| 502 | 502 |
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> |
| 503 | 503 |
<ImportGroup Label="ExtensionTargets"> |
| 504 | 504 |
</ImportGroup> |
| 505 |
-</Project> |
|
| 505 |
+ <ItemGroup> |
|
| 506 |
+ <Library Include="libeay32.lib" /> |
|
| 507 |
+ <Library Include="ssleay32.lib" /> |
|
| 508 |
+ </ItemGroup> |
|
| 509 |
+</Project> |
|
| 506 | 510 |
\ No newline at end of file |
| ... | ... |
@@ -174,9 +174,6 @@ |
| 174 | 174 |
<ClCompile Include="..\libclamav\mbox.c"> |
| 175 | 175 |
<Filter>Source Files</Filter> |
| 176 | 176 |
</ClCompile> |
| 177 |
- <ClCompile Include="..\libclamav\md5.c"> |
|
| 178 |
- <Filter>Source Files</Filter> |
|
| 179 |
- </ClCompile> |
|
| 180 | 177 |
<ClCompile Include="..\libclamav\message.c"> |
| 181 | 178 |
<Filter>Source Files</Filter> |
| 182 | 179 |
</ClCompile> |
| ... | ... |
@@ -294,9 +291,6 @@ |
| 294 | 294 |
<ClCompile Include="..\libclamav\xar.c"> |
| 295 | 295 |
<Filter>Source Files</Filter> |
| 296 | 296 |
</ClCompile> |
| 297 |
- <ClCompile Include="..\libclamav\sha256.c"> |
|
| 298 |
- <Filter>Source Files</Filter> |
|
| 299 |
- </ClCompile> |
|
| 300 | 297 |
<ClCompile Include="3rdparty\zlib\zutil.c"> |
| 301 | 298 |
<Filter>Source Files\zlib</Filter> |
| 302 | 299 |
</ClCompile> |
| ... | ... |
@@ -486,9 +480,6 @@ |
| 486 | 486 |
<ClCompile Include="..\libclamav\matcher-hash.c"> |
| 487 | 487 |
<Filter>Source Files</Filter> |
| 488 | 488 |
</ClCompile> |
| 489 |
- <ClCompile Include="..\libclamav\sha1.c"> |
|
| 490 |
- <Filter>Source Files</Filter> |
|
| 491 |
- </ClCompile> |
|
| 492 | 489 |
<ClCompile Include="..\libclamav\events.c"> |
| 493 | 490 |
<Filter>Source Files</Filter> |
| 494 | 491 |
</ClCompile> |
| ... | ... |
@@ -888,6 +879,15 @@ |
| 888 | 888 |
<ClCompile Include="..\libclamav\www.c"> |
| 889 | 889 |
<Filter>Source Files</Filter> |
| 890 | 890 |
</ClCompile> |
| 891 |
+ <ClCompile Include="..\libclamav\conv.c"> |
|
| 892 |
+ <Filter>Source Files</Filter> |
|
| 893 |
+ </ClCompile> |
|
| 894 |
+ <ClCompile Include="..\libclamav\crypto.c"> |
|
| 895 |
+ <Filter>Source Files</Filter> |
|
| 896 |
+ </ClCompile> |
|
| 897 |
+ <ClCompile Include="compat\strptime.c"> |
|
| 898 |
+ <Filter>Source Files\compat</Filter> |
|
| 899 |
+ </ClCompile> |
|
| 891 | 900 |
</ItemGroup> |
| 892 | 901 |
<ItemGroup> |
| 893 | 902 |
<ClInclude Include="..\libclamav\hostid.h"> |
| ... | ... |
@@ -902,5 +902,15 @@ |
| 902 | 902 |
<ClInclude Include="..\libclamav\www.h"> |
| 903 | 903 |
<Filter>Source Files</Filter> |
| 904 | 904 |
</ClInclude> |
| 905 |
+ <ClInclude Include="..\libclamav\conv.h"> |
|
| 906 |
+ <Filter>Source Files</Filter> |
|
| 907 |
+ </ClInclude> |
|
| 908 |
+ <ClInclude Include="..\libclamav\crypto.h"> |
|
| 909 |
+ <Filter>Source Files</Filter> |
|
| 910 |
+ </ClInclude> |
|
| 911 |
+ </ItemGroup> |
|
| 912 |
+ <ItemGroup> |
|
| 913 |
+ <Library Include="libeay32.lib" /> |
|
| 914 |
+ <Library Include="ssleay32.lib" /> |
|
| 905 | 915 |
</ItemGroup> |
| 906 |
-</Project> |
|
| 916 |
+</Project> |
|
| 907 | 917 |
\ No newline at end of file |
| ... | ... |
@@ -1,5 +1,4 @@ |
| 1 |
-<?xml version="1.0" encoding="utf-8"?> |
|
| 2 |
- |
|
| 1 |
+<?xml version="1.0" encoding="utf-8"?> |
|
| 3 | 2 |
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
| 4 | 3 |
<ItemGroup Label="ProjectConfigurations"> |
| 5 | 4 |
<ProjectConfiguration Include="Debug|Win32"> |
| ... | ... |
@@ -20,17 +19,17 @@ |
| 20 | 20 |
</ProjectConfiguration> |
| 21 | 21 |
</ItemGroup> |
| 22 | 22 |
<ItemGroup> |
| 23 |
- <ClCompile Include="..\libclamav\c++\PointerTracking.cpp"/> |
|
| 24 |
- <ClCompile Include="..\libclamav\c++\detect.cpp"/> |
|
| 25 |
- <ClCompile Include="..\libclamav\c++\bytecode2llvm.cpp"/> |
|
| 26 |
- <ClCompile Include="..\libclamav\c++\ClamBCRTChecks.cpp"/> |
|
| 23 |
+ <ClCompile Include="..\libclamav\c++\PointerTracking.cpp" /> |
|
| 24 |
+ <ClCompile Include="..\libclamav\c++\detect.cpp" /> |
|
| 25 |
+ <ClCompile Include="..\libclamav\c++\bytecode2llvm.cpp" /> |
|
| 26 |
+ <ClCompile Include="..\libclamav\c++\ClamBCRTChecks.cpp" /> |
|
| 27 | 27 |
</ItemGroup> |
| 28 | 28 |
<PropertyGroup Label="Globals"> |
| 29 | 29 |
<ProjectGuid>{3AE8051D-A188-4B11-95A4-14B8F0C290CB}</ProjectGuid>
|
| 30 | 30 |
<Keyword>Win32Proj</Keyword> |
| 31 | 31 |
<RootNamespace>libclamavcxx</RootNamespace> |
| 32 | 32 |
</PropertyGroup> |
| 33 |
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props"/> |
|
| 33 |
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> |
|
| 34 | 34 |
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> |
| 35 | 35 |
<ConfigurationType>StaticLibrary</ConfigurationType> |
| 36 | 36 |
<UseDebugLibraries>true</UseDebugLibraries> |
| ... | ... |
@@ -53,22 +52,22 @@ |
| 53 | 53 |
<WholeProgramOptimization>true</WholeProgramOptimization> |
| 54 | 54 |
<CharacterSet>MultiByte</CharacterSet> |
| 55 | 55 |
</PropertyGroup> |
| 56 |
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props"/> |
|
| 56 |
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> |
|
| 57 | 57 |
<ImportGroup Label="ExtensionSettings"> |
| 58 | 58 |
</ImportGroup> |
| 59 | 59 |
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> |
| 60 |
- <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
|
|
| 60 |
+ <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
|
|
| 61 | 61 |
</ImportGroup> |
| 62 | 62 |
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> |
| 63 |
- <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
|
|
| 63 |
+ <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
|
|
| 64 | 64 |
</ImportGroup> |
| 65 | 65 |
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> |
| 66 |
- <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
|
|
| 66 |
+ <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
|
|
| 67 | 67 |
</ImportGroup> |
| 68 | 68 |
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> |
| 69 |
- <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
|
|
| 69 |
+ <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
|
|
| 70 | 70 |
</ImportGroup> |
| 71 |
- <PropertyGroup Label="UserMacros"/> |
|
| 71 |
+ <PropertyGroup Label="UserMacros" /> |
|
| 72 | 72 |
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> |
| 73 | 73 |
<IntDir>$(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\</IntDir> |
| 74 | 74 |
<OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir> |
| ... | ... |
@@ -91,7 +90,7 @@ |
| 91 | 91 |
<WarningLevel>Level3</WarningLevel> |
| 92 | 92 |
<Optimization>Disabled</Optimization> |
| 93 | 93 |
<PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| 94 |
- <AdditionalIncludeDirectories>"$(SolutionDir)";"$(SolutionDir)..\libclamav\c++\llvm\include";"$(SolutionDir)llvmbuild\include";"$(SolutionDir)..\libclamav";"$(SolutionDir)compat";"$(SolutionDir)..";"$(SolutionDir)3rdparty\pthreads";"$(SolutionDir)3rdparty\zlib"</AdditionalIncludeDirectories> |
|
| 94 |
+ <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav\c++\llvm\include;$(SolutionDir)llvmbuild\include;$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)..;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\zlib;C:\clamdeps\win32\openssl\include</AdditionalIncludeDirectories> |
|
| 95 | 95 |
<CompileAs>CompileAsCpp</CompileAs> |
| 96 | 96 |
<DisableSpecificWarnings>4146;4800;4244;4996;4355</DisableSpecificWarnings> |
| 97 | 97 |
</ClCompile> |
| ... | ... |
@@ -153,7 +152,7 @@ |
| 153 | 153 |
<OptimizeReferences>true</OptimizeReferences> |
| 154 | 154 |
</Link> |
| 155 | 155 |
</ItemDefinitionGroup> |
| 156 |
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/> |
|
| 156 |
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> |
|
| 157 | 157 |
<ImportGroup Label="ExtensionTargets"> |
| 158 | 158 |
</ImportGroup> |
| 159 |
-</Project> |
|
| 159 |
+</Project> |
|
| 160 | 160 |
\ No newline at end of file |
| ... | ... |
@@ -13,5 +13,11 @@ |
| 13 | 13 |
<ClCompile Include="..\libclamav\c++\ClamBCRTChecks.cpp"> |
| 14 | 14 |
<Filter>Source Files</Filter> |
| 15 | 15 |
</ClCompile> |
| 16 |
+ <ClCompile Include="..\libclamav\c++\PointerTracking.cpp"> |
|
| 17 |
+ <Filter>Source Files</Filter> |
|
| 18 |
+ </ClCompile> |
|
| 19 |
+ <ClCompile Include="..\libclamav\c++\detect.cpp"> |
|
| 20 |
+ <Filter>Source Files</Filter> |
|
| 21 |
+ </ClCompile> |
|
| 16 | 22 |
</ItemGroup> |
| 17 | 23 |
</Project> |
| 18 | 24 |
\ No newline at end of file |
| ... | ... |
@@ -1,5 +1,4 @@ |
| 1 |
-<?xml version="1.0" encoding="utf-8"?> |
|
| 2 |
- |
|
| 1 |
+<?xml version="1.0" encoding="utf-8"?> |
|
| 3 | 2 |
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
| 4 | 3 |
<ItemGroup Label="ProjectConfigurations"> |
| 5 | 4 |
<ProjectConfiguration Include="Debug|Win32"> |
| ... | ... |
@@ -24,7 +23,7 @@ |
| 24 | 24 |
<Keyword>Win32Proj</Keyword> |
| 25 | 25 |
<RootNamespace>sigtool</RootNamespace> |
| 26 | 26 |
</PropertyGroup> |
| 27 |
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props"/> |
|
| 27 |
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> |
|
| 28 | 28 |
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> |
| 29 | 29 |
<ConfigurationType>Application</ConfigurationType> |
| 30 | 30 |
<UseDebugLibraries>true</UseDebugLibraries> |
| ... | ... |
@@ -47,22 +46,22 @@ |
| 47 | 47 |
<WholeProgramOptimization>true</WholeProgramOptimization> |
| 48 | 48 |
<CharacterSet>MultiByte</CharacterSet> |
| 49 | 49 |
</PropertyGroup> |
| 50 |
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props"/> |
|
| 50 |
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> |
|
| 51 | 51 |
<ImportGroup Label="ExtensionSettings"> |
| 52 | 52 |
</ImportGroup> |
| 53 | 53 |
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> |
| 54 |
- <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
|
|
| 54 |
+ <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
|
|
| 55 | 55 |
</ImportGroup> |
| 56 | 56 |
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> |
| 57 |
- <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
|
|
| 57 |
+ <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
|
|
| 58 | 58 |
</ImportGroup> |
| 59 | 59 |
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> |
| 60 |
- <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
|
|
| 60 |
+ <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
|
|
| 61 | 61 |
</ImportGroup> |
| 62 | 62 |
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> |
| 63 |
- <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
|
|
| 63 |
+ <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
|
|
| 64 | 64 |
</ImportGroup> |
| 65 |
- <PropertyGroup Label="UserMacros"/> |
|
| 65 |
+ <PropertyGroup Label="UserMacros" /> |
|
| 66 | 66 |
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> |
| 67 | 67 |
<LinkIncremental>true</LinkIncremental> |
| 68 | 68 |
<OutDir>$(SolutionDir)$(PlatformName)\$(Configuration)\</OutDir> |
| ... | ... |
@@ -89,13 +88,14 @@ |
| 89 | 89 |
<WarningLevel>Level3</WarningLevel> |
| 90 | 90 |
<Optimization>Disabled</Optimization> |
| 91 | 91 |
<PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| 92 |
- <AdditionalIncludeDirectories>"$(SolutionDir)";"$(SolutionDir)..\libclamav";"$(SolutionDir)compat";"$(SolutionDir)3rdparty\zlib";"$(SolutionDir)3rdparty\pthreads";"$(SolutionDir)3rdparty\bzip2";"$(SolutionDir).."</AdditionalIncludeDirectories> |
|
| 92 |
+ <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)..;C:\clamdeps\win32\openssl\include</AdditionalIncludeDirectories> |
|
| 93 | 93 |
<CompileAs>CompileAsC</CompileAs> |
| 94 | 94 |
<DisableSpecificWarnings>4996;4101;4244;4018</DisableSpecificWarnings> |
| 95 | 95 |
</ClCompile> |
| 96 | 96 |
<Link> |
| 97 | 97 |
<SubSystem>Console</SubSystem> |
| 98 | 98 |
<GenerateDebugInformation>true</GenerateDebugInformation> |
| 99 |
+ <AdditionalLibraryDirectories>C:\clamdeps\win32\openssl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
|
| 99 | 100 |
</Link> |
| 100 | 101 |
</ItemDefinitionGroup> |
| 101 | 102 |
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> |
| ... | ... |
@@ -152,22 +152,26 @@ |
| 152 | 152 |
</Link> |
| 153 | 153 |
</ItemDefinitionGroup> |
| 154 | 154 |
<ItemGroup> |
| 155 |
- <ResourceCompile Include="res\sigtool.rc"/> |
|
| 155 |
+ <ResourceCompile Include="res\sigtool.rc" /> |
|
| 156 | 156 |
</ItemGroup> |
| 157 | 157 |
<ItemGroup> |
| 158 |
- <ClCompile Include="..\shared\cdiff.c"/> |
|
| 159 |
- <ClCompile Include="..\shared\misc.c"/> |
|
| 160 |
- <ClCompile Include="..\shared\output.c"/> |
|
| 161 |
- <ClCompile Include="..\shared\tar.c"/> |
|
| 162 |
- <ClCompile Include="..\sigtool\sigtool.c"/> |
|
| 163 |
- <ClCompile Include="..\sigtool\vba.c"/> |
|
| 158 |
+ <ClCompile Include="..\shared\cdiff.c" /> |
|
| 159 |
+ <ClCompile Include="..\shared\misc.c" /> |
|
| 160 |
+ <ClCompile Include="..\shared\output.c" /> |
|
| 161 |
+ <ClCompile Include="..\shared\tar.c" /> |
|
| 162 |
+ <ClCompile Include="..\sigtool\sigtool.c" /> |
|
| 163 |
+ <ClCompile Include="..\sigtool\vba.c" /> |
|
| 164 | 164 |
</ItemGroup> |
| 165 | 165 |
<ItemGroup> |
| 166 | 166 |
<ProjectReference Include="libclamav.vcxproj"> |
| 167 | 167 |
<Project>{09d341e9-7372-46e9-b0d7-caaf77984190}</Project>
|
| 168 | 168 |
</ProjectReference> |
| 169 | 169 |
</ItemGroup> |
| 170 |
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/> |
|
| 170 |
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> |
|
| 171 | 171 |
<ImportGroup Label="ExtensionTargets"> |
| 172 | 172 |
</ImportGroup> |
| 173 |
-</Project> |
|
| 173 |
+ <ItemGroup> |
|
| 174 |
+ <Library Include="libeay32.lib" /> |
|
| 175 |
+ <Library Include="ssleay32.lib" /> |
|
| 176 |
+ </ItemGroup> |
|
| 177 |
+</Project> |
|
| 174 | 178 |
\ No newline at end of file |