Skip to content

Commit ade04b4

Browse files
committed
Revert "Include OpenSSL certs with PyInstaller recipe"
This reverts commit 50c39f4.
1 parent 50c39f4 commit ade04b4

3 files changed

Lines changed: 2 additions & 14 deletions

File tree

scripts/syncrypt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@ from syncrypt.config import AppConfig
1313
from syncrypt.models import Vault
1414
from syncrypt.utils.logging import setup_logging
1515

16-
if getattr(sys, 'frozen', False):
17-
os.environ['SSL_CERT_FILE'] = os.path.join(sys._MEIPASS, 'lib', 'cert.pem')
18-
1916
COPYRIGHT = '''Syncrypt v{version}
2017
(c) 2016-2017 Syncrypt UG | https://syncrypt.space
2118
Licensed under the GPLv3 | Source: https://github.com/syncrypt/client'''\

scripts/syncrypt_daemon

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@ from syncrypt.config import AppConfig, Config
1313
from syncrypt.utils.daemon import Daemon
1414
from syncrypt.utils.logging import setup_logging
1515

16-
if getattr(sys, 'frozen', False):
17-
os.environ['SSL_CERT_FILE'] = os.path.join(sys._MEIPASS, 'lib', 'cert.pem')
18-
1916
LOGLEVELS = ['CRITICAL', 'ERROR', 'WARN', 'INFO', 'DEBUG']
2017

2118
parser = argparse.ArgumentParser(description='Run Syncrypt client')

syncrypt.spec

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,13 @@
11
# -*- mode: python -*-
22

33
import os.path
4-
from PyInstaller.utils.hooks import exec_statement
5-
6-
cert_datas = exec_statement("""
7-
import ssl
8-
print(ssl.get_default_verify_paths().cafile)""").strip().split()
9-
cert_datas = [(f, 'lib') for f in cert_datas]
104

115
block_cipher = None
126

137
a = Analysis(['scripts/syncrypt'],
148
pathex=[os.path.abspath('.')],
159
binaries=None,
16-
datas=cert_datas,
10+
datas=None,
1711
hiddenimports=[
1812
'six',
1913
'packaging',
@@ -43,7 +37,7 @@ exe = EXE(pyz,
4337
b = Analysis(['scripts/syncrypt_daemon'],
4438
pathex=[os.path.abspath('.')],
4539
binaries=None,
46-
datas=cert_datas,
40+
datas=None,
4741
hiddenimports=[
4842
'six',
4943
'packaging',

0 commit comments

Comments
 (0)