diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2013-12-28 15:56:44 -0800 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2013-12-28 15:56:44 -0800 |
| commit | b443931168ce7b7d09eecb56f310db2ff759a354 (patch) | |
| tree | 9d6ccbc8dc614b11fbe7c8d54826ab6e41886609 | |
| parent | 79615c17e98f2eab976b318e169d3997ffdb8213 (diff) | |
| parent | dec26e5aae31e645533ef9920c9f7d638745ee9a (diff) | |
| download | cryptography-b443931168ce7b7d09eecb56f310db2ff759a354.tar.gz cryptography-b443931168ce7b7d09eecb56f310db2ff759a354.tar.bz2 cryptography-b443931168ce7b7d09eecb56f310db2ff759a354.zip | |
Merge pull request #367 from alex/x509-revoked-stack
Port the STACK_OF(X509_REVOKED) stuff to use the same pattern @exarkun figured out for X509
| -rw-r--r-- | cryptography/hazmat/backends/openssl/x509.py | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/cryptography/hazmat/backends/openssl/x509.py b/cryptography/hazmat/backends/openssl/x509.py index f0061a70..2e7505a0 100644 --- a/cryptography/hazmat/backends/openssl/x509.py +++ b/cryptography/hazmat/backends/openssl/x509.py @@ -22,9 +22,13 @@ INCLUDES = """ * Note that the result is an opaque type. */ typedef STACK_OF(X509) Cryptography_STACK_OF_X509; +typedef STACK_OF(X509_REVOKED) Cryptography_STACK_OF_X509_REVOKED; """ TYPES = """ +typedef ... Cryptography_STACK_OF_X509; +typedef ... Cryptography_STACK_OF_X509_REVOKED; + typedef struct { ASN1_OBJECT *algorithm; ...; @@ -45,8 +49,6 @@ typedef ... X509_EXTENSIONS; typedef ... X509_REQ; -typedef ... x509_revoked_st; - typedef struct { ASN1_INTEGER *serialNumber; ASN1_TIME *revocationDate; @@ -56,7 +58,7 @@ typedef struct { } X509_REVOKED; typedef struct { - struct stack_st_X509_REVOKED *revoked; + Cryptography_STACK_OF_X509_REVOKED *revoked; ...; } X509_CRL_INFO; @@ -72,7 +74,6 @@ typedef struct { typedef ... X509_STORE; typedef ... NETSCAPE_SPKI; -typedef ... Cryptography_STACK_OF_X509; """ FUNCTIONS = """ @@ -188,8 +189,8 @@ int sk_X509_EXTENSION_push(X509_EXTENSIONS *, X509_EXTENSION *); X509_EXTENSION *sk_X509_EXTENSION_delete(X509_EXTENSIONS *, int); void sk_X509_EXTENSION_free(X509_EXTENSIONS *); -int sk_X509_REVOKED_num(struct stack_st_X509_REVOKED *); -X509_REVOKED *sk_X509_REVOKED_value(struct stack_st_X509_REVOKED *, int); +int sk_X509_REVOKED_num(Cryptography_STACK_OF_X509_REVOKED *); +X509_REVOKED *sk_X509_REVOKED_value(Cryptography_STACK_OF_X509_REVOKED *, int); /* These aren't macros these arguments are all const X on openssl > 1.0.x */ int X509_CRL_set_lastUpdate(X509_CRL *, const ASN1_TIME *); |