Skip to content

Commit

Permalink
Merge pull request #8 from gloriosus/fixes-20221117
Browse files Browse the repository at this point in the history
Fixes 20221117
  • Loading branch information
vecryd authored Nov 17, 2022
2 parents d6cffa6 + 8cb7113 commit 66bdb8a
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 4 deletions.
4 changes: 3 additions & 1 deletion build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,11 @@ Invoke-WebRequest "https://www.python.org/ftp/python/3.8.10/python-3.8.10-embed-
Expand-Archive "python-3.8.10-embed-win32.zip" -DestinationPath "bin"
Remove-Item -Path "python-3.8.10-embed-win32.zip"

$scripts = Get-ChildItem -Path "src/*" -Include *.py
Invoke-WebRequest "http://download.microsoft.com/download/9/3/F/93FCF1E7-E6A4-478B-96E7-D4B285925B00/vc_redist.x64.exe" -OutFile (New-Item -Path "deps\vc_redist.x64.exe" -Force)
Invoke-WebRequest "http://download.microsoft.com/download/9/3/F/93FCF1E7-E6A4-478B-96E7-D4B285925B00/vc_redist.x86.exe" -OutFile (New-Item -Path "deps\vc_redist.x86.exe" -Force)

$WshShell = New-Object -comObject WScript.Shell
$scripts = Get-ChildItem -Path "src/*" -Include *.py

foreach ($script in $scripts)
{
Expand Down
10 changes: 8 additions & 2 deletions src/copy_pkeycontainer.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import winreg, random, string, os
import winreg, random, string, os, sys


def generate_container_name(length: int) -> str:
Expand All @@ -8,7 +8,13 @@ def generate_container_name(length: int) -> str:

containers = dict()
users_path = "SOFTWARE\\Crypto Pro\\Settings\\Users"
users = winreg.OpenKey(winreg.HKEY_LOCAL_MACHINE, users_path)

try:
users = winreg.OpenKey(winreg.HKEY_LOCAL_MACHINE, users_path)
except:
print("Программа не нашла необходимых записей в реестре. Возможно КриптоПро не установлен на этом компьютере")
input()
sys.exit()

for i in range(1024):
try:
Expand Down
2 changes: 1 addition & 1 deletion version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Product version: 1.0.4
Product version: 1.0.6

0 comments on commit 66bdb8a

Please sign in to comment.