Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix pfx generation with pyOpenSSL >= 24.1.0 #205

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix pfx generation with pyOpenSSL >= 24.1.0 #205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7d8af7f
Fix pfx generation with pyOpenSSL >= 24.1.0
Sp1l Sep 22, 2024
2b34415
Fix typo
Sp1l Sep 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 28 additions & 7 deletions butterfly.server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,15 @@ def b(s):
current_user = None

from OpenSSL import crypto
try:
from OpenSSL.crypto import PKCS12
log.info("Using PKCS12 from OpenSSL.crypto")
except:
from cryptography.hazmat.primitives.serialization import pkcs12 as PKCS12
from cryptography.hazmat.primitives.serialization import BestAvailableEncryption, NoEncryption
from cryptography.hazmat.primitives import serialization
from cryptography import x509
log.info("Using PKCS12 from py-cryptography")
if not all(map(os.path.exists, [ca, ca_key])):
print('Please generate certificates using --generate-certs before')
sys.exit(1)
Expand Down Expand Up @@ -308,12 +317,6 @@ def b(s):
client_cert.sign(client_pk, 'sha512')
client_cert.sign(ca_pk, 'sha512')

pfx = crypto.PKCS12()
pfx.set_certificate(client_cert)
pfx.set_privatekey(client_pk)
pfx.set_ca_certificates([ca_cert])
pfx.set_friendlyname(('%s cert for butterfly' % user).encode('utf-8'))

while True:
password = getpass.getpass('\nPKCS12 Password (can be blank): ')
password2 = getpass.getpass('Verify Password (can be blank): ')
Expand All @@ -322,7 +325,25 @@ def b(s):
print('Passwords do not match.')

print('')
write(pkcs12 % user, pfx.export(password.encode('utf-8')))

if isintance(PKCS12, OpenSSL.crypto.PKCS12):
pfx = crypto.PKCS12()
pfx.set_certificate(client_cert)
pfx.set_privatekey(client_pk)
pfx.set_ca_certificates([ca_cert])
pfx.set_friendlyname(('%s cert for butterfly' % user).encode('utf-8'))
pfx = pfx.export(password.encode('utf-8'))
else:
key = serialization.load_pem_private_key(crypto.dump_privatekey(crypto.FILETYPE_PEM, client_pk), None)
cert = x509.load_pem_x509_certificate(crypto.dump_certificate(crypto.FILETYPE_PEM,client_cert))
cas = x509.load_pem_x509_certificate(crypto.dump_certificate(crypto.FILETYPE_PEM,ca_cert))
encryption = NoEncryption() if password == '' else BestAvailableEncryption(password.encode('utf-8'))
pfx = PKCS12.serialize_key_and_certificates(
f'{user} cert for butterfly'.encode('utf-8'),
key, cert, [cas], encryption
)

write(pkcs12 % user, pfx)
os.chmod(pkcs12 % user, stat.S_IRUSR | stat.S_IWUSR) # 0o600 perms
sys.exit(0)

Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
platforms="Any",
scripts=['butterfly.server.py', 'scripts/butterfly', 'scripts/b'],
packages=['butterfly'],
install_requires=["tornado>=3.2", "pyOpenSSL"],
install_requires=["tornado>=3.2", "pyOpenSSL", "cryptography"],
extras_require={
'themes': ["libsass"],
'systemd': ['tornado_systemd'],
Expand Down