diff options
| author | David Reid <dreid@dreid.org> | 2013-10-18 14:18:36 -0700 |
|---|---|---|
| committer | David Reid <dreid@dreid.org> | 2013-10-18 14:18:36 -0700 |
| commit | b3fcc9b732282588c25f76aac2182e46704ca656 (patch) | |
| tree | 63dc4d6c290125368e8461a934de5885ab52d7d5 | |
| parent | 64eacda62e6d24e14be9fd37fbee6e1f0125f362 (diff) | |
| download | cryptography-b3fcc9b732282588c25f76aac2182e46704ca656.tar.gz cryptography-b3fcc9b732282588c25f76aac2182e46704ca656.tar.bz2 cryptography-b3fcc9b732282588c25f76aac2182e46704ca656.zip | |
Move some stuff that doesn't pass verification because reasons to the MACROS section.
| -rw-r--r-- | cryptography/bindings/openssl/asn1.py | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/cryptography/bindings/openssl/asn1.py b/cryptography/bindings/openssl/asn1.py index fad13ee4..4bc56882 100644 --- a/cryptography/bindings/openssl/asn1.py +++ b/cryptography/bindings/openssl/asn1.py @@ -61,10 +61,7 @@ int i2d_ASN1_OBJECT(ASN1_OBJECT *, unsigned char **); ASN1_STRING *ASN1_STRING_new(); ASN1_STRING *ASN1_STRING_type_new(int); void ASN1_STRING_free(ASN1_STRING *); -int ASN1_STRING_length(ASN1_STRING *); unsigned char *ASN1_STRING_data(ASN1_STRING *); -ASN1_STRING *ASN1_STRING_dup(ASN1_STRING *); -int ASN1_STRING_cmp(ASN1_STRING *, ASN1_STRING *); int ASN1_STRING_set(ASN1_STRING *, const void *, int); int ASN1_STRING_type(ASN1_STRING *); int ASN1_STRING_to_UTF8(unsigned char **, ASN1_STRING *); @@ -72,18 +69,12 @@ int ASN1_STRING_to_UTF8(unsigned char **, ASN1_STRING *); /* ASN1 OCTET STRING */ ASN1_OCTET_STRING *ASN1_OCTET_STRING_new(); void ASN1_OCTET_STRING_free(ASN1_OCTET_STRING *); -ASN1_OCTET_STRING *ASN1_OCTET_STRING_dup(ASN1_OCTET_STRING *); -int ASN1_OCTET_STRING_cmp(ASN1_OCTET_STRING *, ASN1_OCTET_STRING *); int ASN1_OCTET_STRING_set(ASN1_OCTET_STRING *, const unsigned char *, int); /* ASN1 INTEGER */ ASN1_INTEGER *ASN1_INTEGER_new(); void ASN1_INTEGER_free(ASN1_INTEGER *); -ASN1_INTEGER *ASN1_INTEGER_dup(ASN1_INTEGER *); -int ASN1_INTEGER_cmp(ASN1_INTEGER *, ASN1_INTEGER *); int ASN1_INTEGER_set(ASN1_INTEGER *, long); -long ASN1_INTEGER_get(ASN1_INTEGER *); -BIGNUM *ASN1_INTEGER_to_BN(ASN1_INTEGER *,BIGNUM *); int i2a_ASN1_INTEGER(BIO *, ASN1_INTEGER *); /* ASN1 TIME */ @@ -111,4 +102,19 @@ ASN1_VALUE *ASN1_item_d2i(ASN1_VALUE **, const unsigned char **, long, MACROS = """ ASN1_TIME *M_ASN1_TIME_dup(void *); ASN1_ITEM *ASN1_ITEM_ptr(ASN1_ITEM *); + +/* These aren't macros these arguments are all const X on openssl > 1.0.x */ + +int ASN1_STRING_length(ASN1_STRING *); +ASN1_STRING *ASN1_STRING_dup(ASN1_STRING *); +int ASN1_STRING_cmp(ASN1_STRING *, ASN1_STRING *); + +ASN1_OCTET_STRING *ASN1_OCTET_STRING_dup(ASN1_OCTET_STRING *); +int ASN1_OCTET_STRING_cmp(ASN1_OCTET_STRING *, ASN1_OCTET_STRING *); + +ASN1_INTEGER *ASN1_INTEGER_dup(ASN1_INTEGER *); +int ASN1_INTEGER_cmp(ASN1_INTEGER *, ASN1_INTEGER *); +long ASN1_INTEGER_get(ASN1_INTEGER *); + +BIGNUM *ASN1_INTEGER_to_BN(ASN1_INTEGER *,BIGNUM *); """ |