From fd2baf25a03ca84fbc710c26fd0c2e202b427f1e Mon Sep 17 00:00:00 2001 From: vnxme <46669194+vnxme@users.noreply.github.com> Date: Wed, 4 Dec 2024 14:42:31 +0300 Subject: [PATCH 1/2] Fix MIKRO_NPK_SIGN_PUBLIC_KEY spelling --- .github/workflows/mikrotik_patch_6.yml | 2 +- .github/workflows/mikrotik_patch_7.yml | 2 +- patch.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/mikrotik_patch_6.yml b/.github/workflows/mikrotik_patch_6.yml index ed982e6..428f411 100644 --- a/.github/workflows/mikrotik_patch_6.yml +++ b/.github/workflows/mikrotik_patch_6.yml @@ -17,7 +17,7 @@ env: CUSTOM_NPK_SIGN_PUBLIC_KEY: ${{ secrets.CUSTOM_NPK_SIGN_PUBLIC_KEY }} CUSTOM_CLOUD_PUBLIC_KEY: ${{ secrets.CUSTOM_CLOUD_PUBLIC_KEY }} MIKRO_LICENSE_PUBLIC_KEY: ${{ secrets.MIKRO_LICENSE_PUBLIC_KEY }} - MIKRO_NPK_SIGN_PUBLIC_LKEY: ${{ secrets.MIKRO_NPK_SIGN_PUBLIC_LKEY }} + MIKRO_NPK_SIGN_PUBLIC_KEY: ${{ secrets.MIKRO_NPK_SIGN_PUBLIC_KEY }} MIKRO_CLOUD_PUBLIC_KEY: ${{ secrets.MIKRO_CLOUD_PUBLIC_KEY }} MIKRO_LICENCE_URL: ${{ secrets.MIKRO_LICENCE_URL }} CUSTOM_LICENCE_URL: ${{ secrets.CUSTOM_LICENCE_URL }} diff --git a/.github/workflows/mikrotik_patch_7.yml b/.github/workflows/mikrotik_patch_7.yml index 18e209c..e480497 100644 --- a/.github/workflows/mikrotik_patch_7.yml +++ b/.github/workflows/mikrotik_patch_7.yml @@ -16,7 +16,7 @@ env: CUSTOM_NPK_SIGN_PUBLIC_KEY: ${{ secrets.CUSTOM_NPK_SIGN_PUBLIC_KEY }} CUSTOM_CLOUD_PUBLIC_KEY: ${{ secrets.CUSTOM_CLOUD_PUBLIC_KEY }} MIKRO_LICENSE_PUBLIC_KEY: ${{ secrets.MIKRO_LICENSE_PUBLIC_KEY }} - MIKRO_NPK_SIGN_PUBLIC_LKEY: ${{ secrets.MIKRO_NPK_SIGN_PUBLIC_LKEY }} + MIKRO_NPK_SIGN_PUBLIC_KEY: ${{ secrets.MIKRO_NPK_SIGN_PUBLIC_KEY }} MIKRO_CLOUD_PUBLIC_KEY: ${{ secrets.MIKRO_CLOUD_PUBLIC_KEY }} MIKRO_LICENCE_URL: ${{ secrets.MIKRO_LICENCE_URL }} CUSTOM_LICENCE_URL: ${{ secrets.CUSTOM_LICENCE_URL }} diff --git a/patch.py b/patch.py index d4c341c..65fb89c 100644 --- a/patch.py +++ b/patch.py @@ -331,7 +331,7 @@ if __name__ == '__main__': args = parser.parse_args() key_dict = { bytes.fromhex(os.environ['MIKRO_LICENSE_PUBLIC_KEY']):bytes.fromhex(os.environ['CUSTOM_LICENSE_PUBLIC_KEY']), - bytes.fromhex(os.environ['MIKRO_NPK_SIGN_PUBLIC_LKEY']):bytes.fromhex(os.environ['CUSTOM_NPK_SIGN_PUBLIC_KEY']) + bytes.fromhex(os.environ['MIKRO_NPK_SIGN_PUBLIC_KEY']):bytes.fromhex(os.environ['CUSTOM_NPK_SIGN_PUBLIC_KEY']) } kcdsa_private_key = bytes.fromhex(os.environ['CUSTOM_LICENSE_PRIVATE_KEY']) eddsa_private_key = bytes.fromhex(os.environ['CUSTOM_NPK_SIGN_PRIVATE_KEY']) From 29663ed17516b39f2e0e51e09863eb79de23e6a8 Mon Sep 17 00:00:00 2001 From: vnxme <46669194+vnxme@users.noreply.github.com> Date: Wed, 4 Dec 2024 14:45:22 +0300 Subject: [PATCH 2/2] Fix *_LICENSE_URL spelling --- .github/workflows/mikrotik_patch_6.yml | 4 ++-- .github/workflows/mikrotik_patch_7.yml | 4 ++-- patch.py | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/mikrotik_patch_6.yml b/.github/workflows/mikrotik_patch_6.yml index 428f411..7f387c8 100644 --- a/.github/workflows/mikrotik_patch_6.yml +++ b/.github/workflows/mikrotik_patch_6.yml @@ -19,8 +19,8 @@ env: MIKRO_LICENSE_PUBLIC_KEY: ${{ secrets.MIKRO_LICENSE_PUBLIC_KEY }} MIKRO_NPK_SIGN_PUBLIC_KEY: ${{ secrets.MIKRO_NPK_SIGN_PUBLIC_KEY }} MIKRO_CLOUD_PUBLIC_KEY: ${{ secrets.MIKRO_CLOUD_PUBLIC_KEY }} - MIKRO_LICENCE_URL: ${{ secrets.MIKRO_LICENCE_URL }} - CUSTOM_LICENCE_URL: ${{ secrets.CUSTOM_LICENCE_URL }} + MIKRO_LICENSE_URL: ${{ secrets.MIKRO_LICENSE_URL }} + CUSTOM_LICENSE_URL: ${{ secrets.CUSTOM_LICENSE_URL }} MIKRO_UPGRADE_URL: ${{ secrets.MIKRO_UPGRADE_URL }} CUSTOM_UPGRADE_URL: ${{ secrets.CUSTOM_UPGRADE_URL }} MIKRO_RENEW_URL: ${{ secrets.MIKRO_RENEW_URL }} diff --git a/.github/workflows/mikrotik_patch_7.yml b/.github/workflows/mikrotik_patch_7.yml index e480497..d17fb49 100644 --- a/.github/workflows/mikrotik_patch_7.yml +++ b/.github/workflows/mikrotik_patch_7.yml @@ -18,8 +18,8 @@ env: MIKRO_LICENSE_PUBLIC_KEY: ${{ secrets.MIKRO_LICENSE_PUBLIC_KEY }} MIKRO_NPK_SIGN_PUBLIC_KEY: ${{ secrets.MIKRO_NPK_SIGN_PUBLIC_KEY }} MIKRO_CLOUD_PUBLIC_KEY: ${{ secrets.MIKRO_CLOUD_PUBLIC_KEY }} - MIKRO_LICENCE_URL: ${{ secrets.MIKRO_LICENCE_URL }} - CUSTOM_LICENCE_URL: ${{ secrets.CUSTOM_LICENCE_URL }} + MIKRO_LICENSE_URL: ${{ secrets.MIKRO_LICENSE_URL }} + CUSTOM_LICENSE_URL: ${{ secrets.CUSTOM_LICENSE_URL }} MIKRO_UPGRADE_URL: ${{ secrets.MIKRO_UPGRADE_URL }} CUSTOM_UPGRADE_URL: ${{ secrets.CUSTOM_UPGRADE_URL }} MIKRO_RENEW_URL: ${{ secrets.MIKRO_RENEW_URL }} diff --git a/patch.py b/patch.py index 65fb89c..6eb870d 100644 --- a/patch.py +++ b/patch.py @@ -252,7 +252,7 @@ def patch_squashfs(path,key_dict): open(file,'wb').write(data) data = open(file,'rb').read() url_dict = { - os.environ['MIKRO_LICENCE_URL'].encode():os.environ['CUSTOM_LICENCE_URL'].encode(), + os.environ['MIKRO_LICENSE_URL'].encode():os.environ['CUSTOM_LICENSE_URL'].encode(), os.environ['MIKRO_UPGRADE_URL'].encode():os.environ['CUSTOM_UPGRADE_URL'].encode(), os.environ['MIKRO_CLOUD_URL'].encode():os.environ['CUSTOM_CLOUD_URL'].encode(), os.environ['MIKRO_CLOUD_PUBLIC_KEY'].encode():os.environ['CUSTOM_CLOUD_PUBLIC_KEY'].encode(),