diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2017-05-26 00:58:19 -0500 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2017-05-26 01:58:19 -0400 |
| commit | d9787c4c4be6aaec984ffde94095824edecfaf03 (patch) | |
| tree | 1edf23165d7d0c596c782733f280176246992e44 /src/_cffi_src | |
| parent | 6c5a519f9b382a1746c1bda5f01aaeb2809250ef (diff) | |
| download | cryptography-d9787c4c4be6aaec984ffde94095824edecfaf03.tar.gz | |
various backports for 1.8.2 (#3615)
* Switch to jenkinsfile (#3525)
* [WIP] add a jenkinsfile
* various jenkinsfile fixes [ci skip]
* experiments
* escape the escaping
* can't do that with /usr/bin/env bash
* continue isolation
* bleh
* optimistically enable everything
* things
* add timeout, codecov
* derp
* sigh
* add credentials for codecov upload
* print the env
* nonsense
* checkout without jenkins because jenkins sucks
* maybe we're not allowed to shadow
* maybe if we actually pass the variable
* scope
* cd into a thing
* also here
* print the commit and run all the jobs again
* son of a
* add labels
* ch-ch-ch-changes
* damn it
* add docs, pep8, py3pep8
* try some downstreams
* make this maybe work
* this is probably what we need
* faster testing
* run this in docker duh
* delete me some dirs
* wtf
* god
* more things
* oh boy locales
* re-enable everything, remove the locales now that they're embedded
* refactor, this will probably break everything
* small test
* sigh
* actually bind some variables. also rename things to be camelCase
* oookay
* this is not gonna work
* test all the things
* add docs-linkcheck, remove libre 2.5.3 because it is bad
* syntax is for losers
* append a thing
* add yosemite, run this thing daily
* oops
* some finally cleanup
* twisted is dead to us for a brief moment
* add randomorder and setup.py test
* whatever
* re-enable twisted
* delete everything. eat arby's
* delete everything this time
* all is emptiness
* master builds should use the commit at the time it was merged (#3577)
* Fixes #3573 -- archive the built docs in that builder (#3580)
* Fixes #3573 -- archive the built docs in that builder
* syntax
* try it without this
* I am an idiot
* this is unused
* uhh, let's try this
* maybe this?
* eh, html is the only thing
* ffffuuuu
* Ignore doctree
* broader exclude
* This works now
* pin sphinx version to avoid test breakage (#3544)
* fix compilation on 1.1.0f (#3603)
Diffstat (limited to 'src/_cffi_src')
| -rw-r--r-- | src/_cffi_src/openssl/asn1.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/_cffi_src/openssl/asn1.py b/src/_cffi_src/openssl/asn1.py index 4afca3de6..507424876 100644 --- a/src/_cffi_src/openssl/asn1.py +++ b/src/_cffi_src/openssl/asn1.py @@ -77,8 +77,6 @@ int ASN1_INTEGER_set(ASN1_INTEGER *, long); /* ASN1 TIME */ ASN1_TIME *ASN1_TIME_new(void); void ASN1_TIME_free(ASN1_TIME *); -ASN1_GENERALIZEDTIME *ASN1_TIME_to_generalizedtime(ASN1_TIME *, - ASN1_GENERALIZEDTIME **); ASN1_TIME *ASN1_TIME_set(ASN1_TIME *, time_t); /* ASN1 UTCTIME */ @@ -112,6 +110,10 @@ int ASN1_STRING_to_UTF8(unsigned char **, ASN1_STRING *); long ASN1_ENUMERATED_get(ASN1_ENUMERATED *); int i2a_ASN1_INTEGER(BIO *, ASN1_INTEGER *); +/* This became const ASN1_TIME in 1.1.0f */ +ASN1_GENERALIZEDTIME *ASN1_TIME_to_generalizedtime(ASN1_TIME *, + ASN1_GENERALIZEDTIME **); + ASN1_UTF8STRING *ASN1_UTF8STRING_new(void); void ASN1_UTF8STRING_free(ASN1_UTF8STRING *); |