infosecn1nja
/
C3
mirror of https://github.com/infosecn1nja/C3.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
310 Commits
3 Branches
3 Tags
39 MiB
Commit Graph

245 Commits (c137d0c700aa361a85c32ee9a33cf925e4c4bdf2)

Author SHA1 Message Date
Grzegorz Rychlik 2e27198936 Update build script 2020-02-25 14:25:13 +01:00
Grzegorz Rychlik 088d2d47b0 Downgrade ResourceGenerator to dotnet 2.1 (LTS) to match WebController 2020-02-24 16:12:52 +01:00
Grzegorz Rychlik 66c671c169 Merge branch 'CovenantIntegrationMerge' into RC1.1 2020-02-24 16:01:39 +01:00
Grzegorz Rychlik f9122902bd Remove artifact from Common.vcxitems.filters 2020-02-24 12:50:24 +00:00
Grzegorz Rychlik 0e7925dc6a Declare destructors virtual where applicable 2020-02-24 11:26:05 +01:00
Grzegorz Rychlik 69f1691e9e Fix member lookup 2020-02-24 10:25:28 +01:00
Grzegorz Rychlik 7417140f67 Fix member name qualifacation 2020-02-21 15:56:44 +01:00
Grzegorz Rychlik f43ba11206 Fix some clang compilation waringns 2020-02-21 15:56:43 +01:00
Grzegorz Rychlik 6ac4e2de75 Fix RouteId constructor 2020-02-21 15:56:43 +01:00
Grzegorz Rychlik c23fd1a123 [Clang] Fix NodeRelayConsoleExe 2020-02-21 15:54:16 +01:00
Grzegorz Rychlik 2493f27e90 Workaround the disallowed structutured binding capture 2020-02-21 15:54:16 +01:00
Grzegorz Rychlik 11e07bdf39 Change logger callback to accept string_view instead of pointer 2020-02-21 15:54:16 +01:00
Grzegorz Rychlik 3f2ddcc3e8 Fix ambiguous conversions, unqalified lookup and others 2020-02-21 15:54:16 +01:00
Grzegorz Rychlik d095870f2a [Clang] Fix the overly implicit conversions 2020-02-21 15:54:15 +01:00
Grzegorz Rychlik a5e517f9f2 Fix Query - related compilation warnings and errors 2020-02-21 15:54:15 +01:00
Grzegorz Rychlik 34c73a078a Update Byte containers 2020-02-21 15:54:15 +01:00
Grzegorz Rychlik 53df1570f6 Add inline and noexcept to basic_string specializations 2020-02-21 15:54:15 +01:00
Grzegorz Rychlik 793c6c3449 Update libsodium to 1.0.18 for clang support 2020-02-21 15:54:15 +01:00
tim.carrington 6a7f726f35 Merge branch 'CovenantIntegrationMerge' of git.f-secure.com:C3/C3 into CovenantIntegrationMerge 2020-02-21 09:51:38 +00:00
tim.carrington f9018412be update listening address for use with c2-bridge 2020-02-21 09:50:55 +00:00
Grzegorz Rychlik 727ee98f50 Merge branch 'Shellcode' into RC1.1 2020-02-19 15:20:02 +01:00
Grzegorz Rychlik 471ea7cc7a Add detailed help to channel linter 2020-02-19 15:04:37 +01:00
Grzegorz Rychlik e0b253f6aa Improve capability parsing error messages and add command execution logging 2020-02-19 12:14:46 +01:00
Grzegorz Rychlik a658af4e70 Better channel IO testing 2020-02-19 09:59:07 +01:00
Grzegorz Rychlik 22b15fc6e1 Better error message for missing form properties 2020-02-18 16:09:28 +01:00
Grzegorz Rychlik 3e9ca203c4 Add better error message for case typos 2020-02-18 15:54:09 +01:00
Grzegorz Rychlik a57c7b8559 Wipe DOS and NT heades after loading 2020-02-18 14:15:57 +01:00
Grzegorz Rychlik ec9a6cba21 Enable inline function expanstion for rwdi x86 2020-02-18 14:13:20 +01:00
Grzegorz Rychlik c7a18cec0d Merge branch 'Dotnet2.1' 2020-02-18 13:54:05 +01:00
Pawel Kurowski 3eb69d9780 Fix crash on shared_from_this 2020-02-07 17:37:32 +01:00
Grzegorz Rychlik 2262bf8f71 Downgrade WebController target framework to 2.1 2020-01-30 12:36:03 +01:00
Grzegorz Rychlik af219394af Detour GetModuleHandleExW function in x86 
vcruntime dispatches tasks to Windows thread pool. When task finishes
the completion callback is invoked. In order to ensure the dll that
contais that callback code is still loaded, the refcount for the dll is
incremented (via GetModuleHandleExW) when task is scheduled, and
decremented (vie FreeLibrary) after callback finishes.

FreeLibrary called with a handle to unregistered module returns an
error, which is converted into unhandled exception and resulting in
crash.
 2020-01-29 15:17:55 +01:00
Grzegorz Rychlik ba5617a5e1 Exclude RtlPcToFileHeader hook from x86 builds 
Exception info on x86 is absolute rather than relative (as x64) so
exception creation doesn't require this call.

Additionally Win8.1 SDK doesn't export `RtlPcToFileHeader` in
kernel32.lib for static linking, which causes linking to fail
 2020-01-28 10:50:25 +01:00
Grzegorz Rychlik f0e7ece23d Hook RtlPcToFileHeader function 
RtlPcToFileHeader is called when throwing exceptions, and creating
std::exception_ptrs.
Insert hook as import function address, not actual ntdll hook.
 2020-01-27 17:07:29 +01:00
Grzegorz Rychlik 1775a3980a Move Loader to separate file 2020-01-27 16:22:29 +01:00
Grzegorz Rychlik 820467f83b Separarte PE image utils 2020-01-27 15:55:11 +01:00
Andras Toth 2f3052a5c1 yarn build 2020-01-23 10:48:43 +00:00
Andras Toth 3ce4693570 Enable EDIT CONFIG on create gateway 2020-01-23 10:45:39 +00:00
Grzegorz Rychlik 8df9c1f62a Update Donut runtime libs 2020-01-22 13:30:15 +01:00
Grzegorz Rychlik e136b04b03 [UI][donut] yarn build 2020-01-21 12:47:53 +01:00
Grzegorz Rychlik ca9b5b24b2 [UI][Donut] Add aPLib to donut options 2020-01-21 12:39:10 +01:00
Grzegorz Rychlik ca7c5efba0 [WebController][Donut] Add aPLib compression 2020-01-21 12:19:13 +01:00
tim.carrington f8fc919b61 Fix socket error on peripheral close 2020-01-20 10:22:25 +00:00
tim.carrington 94bc1b9d16 Removal of redundant listenerId code 2020-01-17 16:13:24 +00:00
Grzegorz Rychlik 596c107e8e Remove RVA macro 2020-01-17 16:38:41 +01:00
Grzegorz Rychlik 7ff0c13f45 Update dev notes 2020-01-17 16:33:32 +01:00
Grzegorz Rychlik 5b265ebcaa Update License files 2020-01-17 16:32:54 +01:00
Grzegorz Rychlik 15102cbb66 Add CebuLoader's dev notes 2020-01-17 15:25:55 +01:00
tim.carrington 7cf2e0671f Attempt 3 ;) 2020-01-17 13:30:24 +00:00
tim.carrington aea013bb95 missed UpdateListenerId edit 2020-01-17 13:23:07 +00:00
Grzegorz Rychlik 41b16a3c32 Fix not-null terminated section names 2020-01-17 14:02:38 +01:00
tim.carrington ac52b22c05 removal of redundant else statements and change GetListenerId to UpdateListenerId 2020-01-17 12:53:54 +00:00
tim.carrington 3576a1631b update 2020-01-17 11:48:06 +00:00
tim.carrington 86244b322d update in response to merge comments. Covenant connector now looks for C3Bridge listener before creating one. User now only supplies listener port, url, username and password 2020-01-16 16:40:45 +00:00
Grzegorz Rychlik fb849016ea Fix pre-build command for paths with spaces 2020-01-16 16:40:12 +01:00
Grzegorz Rychlik 911a8d4a97 Replace abort with QuietAbort 2020-01-16 14:38:30 +01:00
Grzegorz Rychlik e56118514d Merge branch 'WebControllerCheckCppRedist' into 'master' 
Load libsodium at startup

See merge request C3/C3!155
 2020-01-16 10:36:58 +00:00
Grzegorz Rychlik acce0ddf1b Merge branch 'ShareFileLock' into 'master' 
Use lock file in UncShareFile channel to avoid rename-read races

See merge request C3/C3!153
 2020-01-16 10:34:39 +00:00
Grzegorz Rychlik a88597cac9 [Loader] Update unexported win api for W7 and 8 
- Win7's wow64 ntdll sections are aligned to 64k which leaves empty
pages (reserved but inaccessible)
- Update calling convetions, and offset data
 2020-01-15 18:49:01 +01:00
Pawel Kurowski 6a7598c814 Use Compression in Covenant.cpp 2020-01-14 17:45:23 +01:00
Pawel Kurowski 8ae59871a8 Merge branch 'zlib' into CovenantIntegrationMerge 2020-01-14 17:42:33 +01:00
Pawel Kurowski 45a8bf9589 Use raw deflate format in Compression.cpp for C# DeflateStream compatibility 2020-01-14 17:40:30 +01:00
Grzegorz Rychlik 2e290a1947 Fix generated relay extention 2020-01-14 17:21:47 +01:00
Grzegorz Rychlik f1fee131f7 Merge branch 'donut-front' into Shellcode 2020-01-14 17:07:58 +01:00
Andras Toth 0446be46e5 yarn build 2020-01-14 15:47:41 +00:00
Andras Toth c53b369123 Add donut front-end form 2020-01-14 15:45:58 +00:00
Pawel Kurowski 70673b1c49 Use zlib with static CRT 2020-01-14 15:18:37 +01:00
Pawel Kurowski bde88c85b5 Add zlib and Compression 2020-01-14 15:18:22 +01:00
Grzegorz Rychlik 91c3daa42b Fix cleanup code 2020-01-14 11:52:19 +01:00
Grzegorz Rychlik cfa8782ebf Add doxygen comments 2020-01-14 11:05:17 +01:00
Grzegorz Rychlik cd5962409a Hide details of Unexported WinApi calls 2020-01-13 17:04:06 +01:00
Grzegorz Rychlik f8e7dcb689 Fix code style 2020-01-13 17:02:09 +01:00
Pawel Kurowski 8cc2dc26b2 Grunt.h will be included in project, but not compiled separately 2020-01-13 10:24:45 +01:00
tim.carrington 7204bd4091 Add files to project 2020-01-10 16:51:09 +00:00
tim.carrington 0732b0c11c update id 2020-01-10 16:17:40 +00:00
tim.carrington 5fa511404d update 2020-01-10 16:16:29 +00:00
Grzegorz Rychlik 352d54f2fc Add support for x86 exceptions 2020-01-10 16:35:39 +01:00
tim.carrington b833cda1fc Merge branch 'CovenantIntegrationMerge' of git.f-secure.com:C3/C3 into CovenantIntegrationMerge 2020-01-10 11:56:13 +00:00
tim.carrington b97aced4f6 automatically setup listener in covenant 2020-01-10 11:54:58 +00:00
Grzegorz Rychlik a0835b6877 [Loader] Add x86 static TLS support 2020-01-10 11:15:22 +01:00
Tim Carrington a4bda08189 Update Covenant.cpp 2020-01-10 08:53:18 +00:00
Grzegorz Rychlik 6aec395e30 Update resource generation and access to match C style 2020-01-09 17:31:53 +01:00
Grzegorz Rychlik 98d00b1034 Fix resource path 2020-01-09 17:25:25 +01:00
Grzegorz Rychlik 07f6e3eae0 Return status codes from ResourceGenerator 2020-01-09 17:23:27 +01:00
Grzegorz Rychlik 58dca25974 Load libsodium at startup 
Sodium was loaded when gatway tried to connect to controller, and
loading could fail if no VC++ redist package is installed
 2020-01-08 17:50:33 +01:00
Andras Toth c4a5d84f45 yarn build 2020-01-08 16:05:49 +00:00
Andras Toth 36ce1e93e2 Change favicon colour 2020-01-08 16:05:08 +00:00
Andras Toth 4b008d986f yarn build 2020-01-08 15:48:18 +00:00
Andras Toth 54a74f7a2c Change C3 green to green 2020-01-08 15:47:42 +00:00
Andras Toth 8338cfc8a5 yarn build 2020-01-08 14:58:40 +00:00
Andras Toth 17637a227b Fix tests 2020-01-08 14:57:42 +00:00
Andras Toth a9d1b00d90 Remove F-Secure Font 2020-01-08 14:33:35 +00:00
Andras Toth 6d3bc04db9 linting 2020-01-08 14:31:27 +00:00
Grzegorz Rychlik 02dbe3198d Use lock file in UncShareFile channel to avoid rename-read races 2020-01-08 14:56:34 +01:00
tim.carrington c6f53cebc1 Merge branch 'master' of git.f-secure.com:C3/C3 into CovenantIntegrationMerge 2020-01-08 13:25:13 +00:00
Grzegorz Rychlik 474662bc8e Merge branch 'master' into Shellcode 2020-01-07 18:02:23 +01:00
Grzegorz Rychlik ded70af1df Change default Donut compression 2020-01-07 17:54:14 +01:00
Andras Toth 50db8fefc3 yarn build 2020-01-07 16:52:10 +00:00
Andras Toth 3a0d821c3e yarn upgrade 2020-01-07 16:50:34 +00:00
Grzegorz Rychlik 70955f1a94 Simplify debug code 2020-01-07 17:46:17 +01:00