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.

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 build with LibreSSL 3.3.2 #5988

Merged
merged 4 commits into from Apr 19, 2021
Merged

Fix build with LibreSSL 3.3.2 #5988

merged 4 commits into from Apr 19, 2021

Conversation

@vishwin
Copy link
Contributor

@vishwin vishwin commented Apr 19, 2021

LibreSSL 3.3.2 added support for SSL_OP_NO_DTLS*. Not opposed to using LESS_THAN instead of OR_GREATER for the preprocessor guards.

vishwin added 2 commits Apr 19, 2021
DTLS_set_link_mtu and DTLS_get_link_min_mtu are not part of 3.3.2
Copy link
Member

@alex alex left a comment

Thanks!

#define CRYPTOGRAPHY_LIBRESSL_332_OR_GREATER \
(LIBRESSL_VERSION_NUMBER >= 0x3030200f)
Comment on lines 36 to 37

This comment has been minimized.

@alex

alex Apr 19, 2021
Member

Please don't indent defines like this.

This comment has been minimized.

@vishwin

vishwin Apr 19, 2021
Author Contributor

I went by an older style from when we supported some older library versions, hopefully this is better.

src/_cffi_src/openssl/ssl.py Outdated Show resolved Hide resolved
@@ -59,6 +66,8 @@
static const int CRYPTOGRAPHY_NEEDS_OSRANDOM_ENGINE;
static const int CRYPTOGRAPHY_IS_LIBRESSL;
static const int CRYPTOGRAPHY_LIBRESSL_LESS_THAN_332;

This comment has been minimized.

@alex

alex Apr 19, 2021
Member

This can be removed, it's not actually used from Python.

@vishwin vishwin force-pushed the vishwin:main branch from 6e23f07 to fc59d22 Apr 19, 2021
While here, fix indents
@vishwin vishwin force-pushed the vishwin:main branch from fc59d22 to 7d03d44 Apr 19, 2021
The variable is not actually used from Python
@alex
alex approved these changes Apr 19, 2021
@alex alex merged commit 94590a9 into pyca:main Apr 19, 2021
58 checks passed
58 checks passed
@github-actions
flake,rust,docs
Details
@github-actions
pypy3-nocoverage
Details
@github-actions
pypy3-nocoverage
Details
@github-actions
py39 openssl 1.1.0l
Details
@github-actions
py39 openssl 1.1.1j
Details
@github-actions
py39-ssh openssl 1.1.1j
Details
@github-actions
py39 openssl 1.1.1j no-engine no-rc2 no-srtp no-ct
Details
@github-actions
py39 libressl 2.9.2
Details
@github-actions
py39 libressl 3.0.2
Details
@github-actions
py39 libressl 3.1.5
Details
@github-actions
py39 libressl 3.2.5
Details
@github-actions
py39 libressl 3.3.2
Details
@github-actions
py36 on centos8
Details
@github-actions
py36 on centos8-fips
Details
@github-actions
py37 on buster
Details
@github-actions
py39 on bullseye
Details
@github-actions
py39 on sid
Details
@github-actions
py36 on ubuntu-bionic
Details
@github-actions
py38 on ubuntu-focal
Details
@github-actions
py38 on ubuntu-rolling
Details
@github-actions
py38-randomorder on ubuntu-rolling
Details
@github-actions
py39 on fedora
Details
@github-actions
py38 on alpine
Details
@github-actions
py39 with Rust 1.41.0
Details
@github-actions
py39 with Rust 1.45.0
Details
@github-actions
py39 with Rust beta
Details
@github-actions
py39 with Rust nightly
Details
@github-actions
Rust Coverage
Details
@github-actions
py36 on macOS
Details
@github-actions
py39 on macOS
Details
@github-actions
py36 on win32 (part 0)
Details
@github-actions
py36 on win32 (part 1)
Details
@github-actions
py36 on win32 (part 2)
Details
@github-actions
py36 on win32 (part 3)
Details
@github-actions
py39 on win32 (part 0)
Details
@github-actions
py39 on win32 (part 1)
Details
@github-actions
py39 on win32 (part 2)
Details
@github-actions
py39 on win32 (part 3)
Details
@github-actions
py36 on win64 (part 0)
Details
@github-actions
py36 on win64 (part 1)
Details
@github-actions
py36 on win64 (part 2)
Details
@github-actions
py36 on win64 (part 3)
Details
@github-actions
py39 on win64 (part 0)
Details
@github-actions
py39 on win64 (part 1)
Details
@github-actions
py39 on win64 (part 2)
Details
@github-actions
py39 on win64 (part 3)
Details
@github-actions
Downstream tests for paramiko
Details
@github-actions
Downstream tests for pyopenssl
Details
@github-actions
Downstream tests for twisted
Details
@github-actions
Downstream tests for aws-encryption-sdk
Details
@github-actions
Downstream tests for dynamodb-encryption-sdk
Details
@github-actions
Downstream tests for certbot
Details
@github-actions
Downstream tests for certbot-josepy
Details
@github-actions
linkcheck
Details
@codecov
codecov/patch Coverage not affected when comparing 6db4e0f...843ef2d
Details
@codecov
codecov/project 100.00% (target 100.00%)
Details
docs/readthedocs.org:cryptography Read the Docs build succeeded!
Details
@opendev-zuul
pyca/check Summary
Details
vishwin added a commit to vishwin/freebsd-ports that referenced this pull request Apr 20, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants