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

Jump to bottom

Backport x509_up_ref #4029

Merged
merged 2 commits into from
Nov 29, 2017
Merged

Backport x509_up_ref #4029

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
c204edd
pytest 3.3.0 has an issue with parametrized null bytes again (#4026)
reaperhulk Nov 28, 2017
e2d9d1c
add X509_up_ref (#4028)
reaperhulk Nov 29, 2017
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
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 @@ -45,7 +45,7 @@
setup_requirements.append("cffi>=1.7")

test_requirements = [
"pytest>=3.2.1",
"pytest>=3.2.1,!=3.3.0",
"pretend",
"iso8601",
"pytz",
Expand Down
5 changes: 5 additions & 0 deletions src/_cffi_src/openssl/x509.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@
void X509_free(X509 *);
X509 *X509_dup(X509 *);
int X509_cmp(const X509 *, const X509 *);
int X509_up_ref(X509 *);
int X509_print_ex(BIO *, X509 *, unsigned long, unsigned long);
Expand Down Expand Up @@ -382,6 +383,10 @@
opaquing. */
#if CRYPTOGRAPHY_OPENSSL_LESS_THAN_110
int X509_up_ref(X509 *x) {
return CRYPTO_add(&x->references, 1, CRYPTO_LOCK_X509);
}
const X509_ALGOR *X509_get0_tbs_sigalg(const X509 *x)
{
return x->cert_info->signature;
Expand Down