admin/Ne0nd0g-merlin
1
0
Fork 0
mirror of https://github.com/Ne0nd0g/merlin synced 2026-06-08 11:59:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Commit Graph

  • 384c061434 Added gosec nosec main v2.1.4 dev Russel Van Tuyl 2025-04-17 11:03:08 -04:00
  • 24435b2ee3 Added gosec nosec Russel Van Tuyl 2025-04-17 10:57:40 -04:00
  • 1cea683518 v2.1.4 Russel Van Tuyl 2025-04-17 10:52:25 -04:00
  • c3ab4b63c4 Update go version Russel Van Tuyl 2025-04-17 10:49:01 -04:00
  • 46ed260cbc Upgraded packages and Go Russel Van Tuyl 2025-04-17 10:45:31 -04:00
  • b8f7ae8563 Bump github.com/go-jose/go-jose/v3 from 3.0.3 to 3.0.4 dependabot/go_modules/github.com/go-jose/go-jose/v3-3.0.4 dependabot[bot] 2025-02-26 22:19:34 +00:00
  • b1bf30b4b0 Bump golang.org/x/crypto from 0.22.0 to 0.31.0 dependabot/go_modules/golang.org/x/crypto-0.31.0 dependabot[bot] 2024-12-11 23:57:59 +00:00
  • a9c676fee0 Bump github.com/quic-go/quic-go from 0.42.0 to 0.48.2 dependabot/go_modules/github.com/quic-go/quic-go-0.48.2 dependabot[bot] 2024-12-02 17:53:55 +00:00
  • 30bb87f081 Lock agents repo map on Get issue_163 Russel Van Tuyl 2024-10-15 08:53:11 -04:00
  • 90ef16b57e Upgraded packages v2.1.3 Russel Van Tuyl 2024-04-23 01:09:23 -04:00
  • 5ac5aa5c45 Merge pull request #157 from Ne0nd0g/dependabot/go_modules/golang.org/x/net-0.23.0 Russel Van Tuyl 2024-04-23 00:12:30 -04:00
  • 43e605b082 Removed explicit Qodana linter flag Russel Van Tuyl 2024-04-23 00:04:22 -04:00
  • 2d737cddca Update actions/checkout to v4 Russel Van Tuyl 2024-04-22 23:55:36 -04:00
  • b80007e244 Bump golang.org/x/net from 0.22.0 to 0.23.0 dependabot[bot] 2024-04-19 13:23:37 +00:00
  • 9558b37f56 Restored import string to original k33pn3xtlvl-main Russel Van Tuyl 2024-04-05 07:42:16 -04:00
  • 0294af0130 Updated Copyright year to 2024 Russel Van Tuyl 2024-03-22 07:52:31 -04:00
  • 7aaf2ffcb3 Rebase Russel Van Tuyl 2024-03-21 08:13:01 -04:00
  • dae00f7ba6 Fixed SOCKS issues Russel Van Tuyl 2024-03-21 07:56:50 -04:00
  • e19141874f Fixed SOCKS data handling bugs Russel Van Tuyl 2024-03-07 07:26:07 -05:00
  • c45826a9d5 Fixed SOCKS data handling bugs Russel Van Tuyl 2024-03-07 07:24:43 -05:00
  • a8d69e9c1c Updated version to v2.1.2 v2.1.2 config_file Russel Van Tuyl 2024-03-25 08:21:51 -04:00
  • 050f99442c Updated version to v2.4.0 Russel Van Tuyl 2024-03-23 12:38:22 -04:00
  • df3230f4fb Updated Copyright year to 2024 Russel Van Tuyl 2024-03-22 07:52:31 -04:00
  • d3015d94fa Upgraded libraries Russel Van Tuyl 2024-03-21 08:13:01 -04:00
  • 321286cdf5 Merge branch 'issue_socks' into dev Russel Van Tuyl 2024-03-21 07:58:47 -04:00
  • 51dad96018 Fixed SOCKS issues issue_socks Russel Van Tuyl 2024-03-21 07:56:50 -04:00
  • 360980a30b Fixed bug, duplicate listeners in persistent file k33pn3xtlvl 2024-03-07 19:56:10 +01:00
  • 6ef04d4683 Fixed SOCKS data handling bugs Russel Van Tuyl 2024-03-07 07:26:07 -05:00
  • 0c10f6eef0 Fixed SOCKS data handling bugs Russel Van Tuyl 2024-03-07 07:24:43 -05:00
  • cb5db6293e Fix function description k33pn3xtlvl 2024-02-26 21:00:21 +01:00
  • 297299456d Persist listeners between reboots k33pn3xtlvl 2024-02-24 22:58:37 +01:00
  • b279c6a372 Fixed release workflow v2.1.1 Russel Van Tuyl 2024-01-04 10:26:20 -05:00
  • e5fe83be42 v2.1.1 Russel Van Tuyl 2024-01-04 10:10:59 -05:00
  • fc57f87a20 Upgraded Go modules and Dockerfile Russel Van Tuyl 2024-01-03 09:41:47 -05:00
  • d4144736c5 Merge pull request #149 from Ne0nd0g/dependabot/go_modules/golang.org/x/crypto-0.17.0 Russel Van Tuyl 2024-01-02 18:53:22 -05:00
  • 938d8e8223 Bump golang.org/x/crypto from 0.14.0 to 0.17.0 dependabot[bot] 2023-12-18 23:49:16 +00:00
  • caaea3b8af Fixes #148 v2.1.0 Russel Van Tuyl 2023-12-14 08:44:32 -05:00
  • 626f85bfa5 Merge pull request #147 from Ne0nd0g/dependabot/go_modules/github.com/go-jose/go-jose/v3-3.0.1 Russel Van Tuyl 2023-12-01 07:16:22 -05:00
  • 32ad02ab88 Action workflow updates Russel Van Tuyl 2023-11-28 08:08:00 -05:00
  • 48ebff878e Action workflow updates Russel Van Tuyl 2023-11-28 07:56:34 -05:00
  • b23a4b8f37 Bump github.com/go-jose/go-jose/v3 from 3.0.0 to 3.0.1 dependabot[bot] 2023-11-21 22:24:51 +00:00
  • e80c47a7e4 Updated CHANGELOG.MD v2.0.0 date v2.0.0 Russel Van Tuyl 2023-11-05 17:39:25 -05:00
  • b097f4c49a Troubleshooting release action Russel Van Tuyl 2023-11-05 17:19:38 -05:00
  • d2515bc159 Troubleshooting release action Russel Van Tuyl 2023-11-05 17:07:03 -05:00
  • cda117d91f Troubleshooting release action Russel Van Tuyl 2023-11-05 17:03:40 -05:00
  • 129138f7a8 Seriously, homer? Russel Van Tuyl 2023-11-05 16:56:48 -05:00
  • 9a6d4f9341 Troubleshooting release action Russel Van Tuyl 2023-11-05 06:12:25 -05:00
  • 21f6e21cfa Troubleshooting release action Russel Van Tuyl 2023-11-05 06:08:47 -05:00
  • 7ddc3be033 Troubleshooting release action Russel Van Tuyl 2023-11-05 06:04:23 -05:00
  • 293617a28e Troubleshooting release action Russel Van Tuyl 2023-11-05 05:57:18 -05:00
  • a11db34fe7 Troubleshooting release action Russel Van Tuyl 2023-11-04 07:12:06 -04:00
  • 7087c857a4 Troubleshooting release action Russel Van Tuyl 2023-11-04 07:08:51 -04:00
  • 2fc6461108 Troubleshooting release action Russel Van Tuyl 2023-11-04 06:57:24 -04:00
  • b316a5e59b Troubleshooting release action Russel Van Tuyl 2023-11-04 06:53:53 -04:00
  • 5c6f0c9981 Troubleshooting release action Russel Van Tuyl 2023-11-04 06:51:48 -04:00
  • 8d1b14e81d Updated release action Russel Van Tuyl 2023-11-04 06:48:04 -04:00
  • 4318be41d1 Updated release action Russel Van Tuyl 2023-11-04 06:44:25 -04:00
  • 1ce46c6f54 Updated release action working-directory Russel Van Tuyl 2023-11-04 06:40:58 -04:00
  • fff15e2530 Updated version and date Russel Van Tuyl 2023-11-04 06:32:05 -04:00
  • a786246f2f Updated v2 release date Russel Van Tuyl 2023-11-04 06:10:33 -04:00
  • b61ae731f7 Updated go module to use "v2" Russel Van Tuyl 2023-11-04 06:07:50 -04:00
  • 732c20ddeb Update release action Russel Van Tuyl 2023-11-03 08:10:33 -04:00
  • 32e6ccdb73 Fix test error & updated CHANGELOG.MD Russel Van Tuyl 2023-11-03 07:46:07 -04:00
  • 8b0777e095 Fix workflow errors Russel Van Tuyl 2023-11-02 09:03:29 -04:00
  • 918eba3438 Merged p2p branch into dev Russel Van Tuyl 2023-11-02 08:58:13 -04:00
  • 705cc348ab Added "parrot" command, removed CodeQL action file in favor of built-in advanced security bot Russel Van Tuyl 2023-11-02 08:32:29 -04:00
  • ad7fa63fd3 Update grpc & quic-go Russel Van Tuyl 2023-10-29 17:13:34 -04:00
  • b5b555d4d0 Added GH Workflows Russel Van Tuyl 2023-10-29 16:29:58 -04:00
  • e007065ab6 Upgrade UUID package Russel Van Tuyl 2023-10-29 15:24:44 -04:00
  • 394994622e Updated Makefile Russel Van Tuyl 2023-10-29 14:39:38 -04:00
  • 7262b93784 Updated go-jose package Russel Van Tuyl 2023-10-27 16:05:09 -04:00
  • 11a5cacfe2 Updated trace logging Russel Van Tuyl 2023-10-27 11:00:25 -04:00
  • d0dda6f3c4 code quality and security fixes Russel Van Tuyl 2023-10-18 19:55:30 -04:00
  • a0565f3d66 Seperated OPAQUE structures to merlin-message package Russel Van Tuyl 2023-10-18 06:47:01 -04:00
  • 32b57695cf Updated for merlin-message package Russel Van Tuyl 2023-10-17 19:47:33 -04:00
  • 1365a6e189 Refactored cli and server to use gRPC Russel Van Tuyl 2023-10-17 08:13:43 -04:00
  • faab438aa5 Updated CHANGELOG.MD Russel Van Tuyl 2023-08-27 11:46:19 -04:00
  • e58cf15658 Filter help to only commands for the agent's OS Russel Van Tuyl 2023-08-27 11:29:20 -04:00
  • ed7d4eb3f4 wip: commands Russel Van Tuyl 2023-08-27 10:43:19 -04:00
  • 40874a20d3 WIP Russel Van Tuyl 2023-07-11 09:10:19 -04:00
  • 73c08fdaba wip: commands Russel Van Tuyl 2023-06-16 20:43:58 -04:00
  • 4bc57d12cc wip: CLI commands Ne0nd0g 2023-06-13 08:05:58 -04:00
  • 2ce8fad7ca Removed sphinx documentation to merlin-documentation repository Ne0nd0g 2023-05-15 20:25:27 -04:00
  • ae37ed6125 Added JWT leeway configuration option Ne0nd0g 2023-05-15 20:07:37 -04:00
  • 407334b484 Added link remove command Ne0nd0g 2023-05-15 08:09:11 -04:00
  • 031337c37f Added connect command and handling for switching between different servers Ne0nd0g 2023-05-15 07:42:35 -04:00
  • 49d4341194 P2P Recovery & Error Handling Ne0nd0g 2023-05-02 22:51:47 -04:00
  • 537d109f08 Support Go 1.20 & upgraded quic-go Ne0nd0g 2023-04-23 09:32:00 -04:00
  • ffb9feb58c Sphinx documentation files v1.5.1 Ne0nd0g 2023-03-08 08:50:07 -05:00
  • fb0d913f8a Fix conflicts Ne0nd0g 2023-03-08 08:44:06 -05:00
  • 620ab0c915 Updated Changelog Ne0nd0g 2023-03-08 08:39:46 -05:00
  • 02d7c971be Updated Sphinx documentation files Ne0nd0g 2023-03-08 08:30:56 -05:00
  • 36b3dee681 Merge pull request #140 from Ne0nd0g/dependabot/go_modules/golang.org/x/net-0.7.0 Russel Van Tuyl 2023-03-08 08:20:44 -05:00
  • 9b4ad2e4db Bump golang.org/x/net from 0.1.0 to 0.7.0 dependabot[bot] 2023-03-08 13:20:08 +00:00
  • 20e6d31b81 Merge pull request #136 from HuskyHacks/dev Russel Van Tuyl 2023-03-08 08:18:11 -05:00
  • 419edfa382 Merge branch 'dev' into dev Russel Van Tuyl 2023-03-08 07:52:16 -05:00
  • ebc796e311 Merge pull request #139 from Ne0nd0g/dependabot/go_modules/golang.org/x/crypto-0.1.0 Russel Van Tuyl 2023-03-08 07:49:23 -05:00
  • fd7c3aca7a Bump golang.org/x/crypto from 0.0.0-20200709230013-948cd5f35899 to 0.1.0 dependabot[bot] 2023-03-08 12:48:17 +00:00
  • a9f7289923 Merge pull request #138 from Ne0nd0g/dependabot/go_modules/golang.org/x/net-0.7.0 Russel Van Tuyl 2023-03-08 07:44:42 -05:00
  • ea153dd06d Merge branch 'dev' into dependabot/go_modules/golang.org/x/net-0.7.0 Russel Van Tuyl 2023-03-08 07:44:30 -05:00