merge in HEAD changes

This commit is contained in:
Neo-Desktop 2024-01-24 20:20:03 -08:00
commit a827844cbd
4 changed files with 40 additions and 9 deletions

View File

@ -24,18 +24,22 @@
push: push:
branches: [ "*" ] branches: [ "*" ]
paths-ignore: [ '**.md', 'doc/**', '.idea/**'] # If only these files are edited, skip paths-ignore: [ '**.md', 'doc/**', '.idea/**'] # If only these files are edited, skip
pull_request:
branches: [ "*" ]
paths-ignore: [ '**.md', 'doc/**', '.idea/**'] # If only these files are edited, skip
workflow_dispatch: workflow_dispatch:
jobs: jobs:
build: build:
runs-on: macos-latest runs-on: ubuntu-latest
name: build-x86_64 name: build-x86_64
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- name: Build & Test in FreeBSD - name: Build & Test in FreeBSD
id: test id: test
uses: vmactions/freebsd-vm@v0 uses: vmactions/freebsd-vm@v1
with: with:
envs: 'MYTOKEN MYTOKEN2' envs: 'MYTOKEN MYTOKEN2'
usesh: true usesh: true

View File

@ -52,11 +52,11 @@ jobs:
exit 1 exit 1
} }
- name: Download And Install 32-bit OpenSSL 3.1.3 - name: Download And Install 32-bit OpenSSL 3.1.4
run: | run: |
$installDir = "$Env:ProgramFiles\OpenSSL" $installDir = "$Env:ProgramFiles\OpenSSL"
$installerURL = "https://slproweb.com/download/Win32OpenSSL-3_1_3.exe" $installerURL = "https://slproweb.com/download/Win32OpenSSL-3_1_4.exe"
$installerName = "Win32OpenSSL-3_1_3.exe" $installerName = "Win32OpenSSL-3_1_4.exe"
$installerPath = Join-Path -Path "${env:Temp}" -ChildPath "$installerName" $installerPath = Join-Path -Path "${env:Temp}" -ChildPath "$installerName"
(New-Object System.Net.WebClient).DownloadFile($installerURL, $installerPath) (New-Object System.Net.WebClient).DownloadFile($installerURL, $installerPath)
@ -112,11 +112,11 @@ jobs:
exit 1 exit 1
} }
- name: Download And Install 64-bit OpenSSL 3.1.3 - name: Download And Install 64-bit OpenSSL 3.1.4
run: | run: |
$installDir = "$Env:ProgramFiles\OpenSSL" $installDir = "$Env:ProgramFiles\OpenSSL"
$installerURL = "https://slproweb.com/download/Win64OpenSSL-3_1_3.exe" $installerURL = "https://slproweb.com/download/Win64OpenSSL-3_1_4.exe"
$installerName = "Win64OpenSSL-3_1_3.exe" $installerName = "Win64OpenSSL-3_1_4.exe"
$installerPath = Join-Path -Path "${env:Temp}" -ChildPath "$installerName" $installerPath = Join-Path -Path "${env:Temp}" -ChildPath "$installerName"
(New-Object System.Net.WebClient).DownloadFile($installerURL, $installerPath) (New-Object System.Net.WebClient).DownloadFile($installerURL, $installerPath)

View File

@ -4,7 +4,7 @@
[![Zulip chat](https://img.shields.io/badge/zulip-join_chat-brightgreen.svg)](https://umskt.zulipchat.com) [![Zulip chat](https://img.shields.io/badge/zulip-join_chat-brightgreen.svg)](https://umskt.zulipchat.com)
[![libera.chat - #mspid](https://img.shields.io/badge/libera.chat-%23mspid-brightgreen)](https://web.libera.chat/gamja/?nick=Guest?#mspid) [![libera.chat - #mspid](https://img.shields.io/badge/libera.chat-%23mspid-brightgreen)](https://web.libera.chat/gamja/?nick=Guest?#mspid)
[![Discord](https://dcbadge.vercel.app/api/server/cUZxfNNSdt?style=flat)](https://umskt-invite.glitch.me/) [![Discord](https://dcbadge.vercel.app/api/server/cUZxfNNSdt?style=flat)](https://discord.gg/PpBSpuphWM)
**Build status** **Build status**

View File

@ -945,6 +945,18 @@
"79" "79"
] ]
}, },
"PASSPORTMGR": {
"meta": {
"type": "PIDGEN3",
"tags": [
"devtool"
]
},
"name": ".NET Passport Manager",
"BINK": [
"10"
]
},
"OFFICE2K7": { "OFFICE2K7": {
"meta": { "meta": {
"type": "PIDGEN3", "type": "PIDGEN3",
@ -1245,6 +1257,21 @@
"y": "12300711937755714474221683340048792628817501853269187222732097530965245794898485391792926982501341822327927281168157" "y": "12300711937755714474221683340048792628817501853269187222732097530965245794898485391792926982501341822327927281168157"
} }
}, },
"10": {
"a": "1",
"b": "0",
"g": {
"x": "18651628392962497698304079461858800038021595035623099589626558411789423821835513779530629747878048328422716050099296",
"y": "28457790016119433859033076174489680371110176047623886251847351799861435189214769185332948508935608870611015909181946"
},
"n": "63517138149940081",
"p": "34850883414891516310048088524473091032039735302322749072119923383901524249650054933039485488287948424536010614809529",
"priv": "42074657350570560",
"pub": {
"x": "14897248889444524585539298515527812307525445072093905045143283125792133561464628729391995919418984547359131800953862",
"y": "30590224388131521072842776697623219502924625149179219913459005347798492666726177600440842678766281012690402321113086"
}
},
"12": { "12": {
"a": "1", "a": "1",
"b": "0", "b": "0",