aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2017-04-21 09:27:24 -0400
committerPaul Kehrer <paul.l.kehrer@gmail.com>2017-04-21 21:27:24 +0800
commit346a5732bf9d3b9a951cd3084dfda0c9a24d455f (patch)
tree46b3e8e509b9a69af534236f939bd687d0c345f4
parentde569c58ff364ca0e31eba3933fae0d87029d7cf (diff)
downloadcryptography-346a5732bf9d3b9a951cd3084dfda0c9a24d455f.tar.gz
cryptography-346a5732bf9d3b9a951cd3084dfda0c9a24d455f.tar.bz2
cryptography-346a5732bf9d3b9a951cd3084dfda0c9a24d455f.zip
Additional SCT bindings (#3510)
* Additional SCT bindings * forgot to conditional these
-rw-r--r--src/_cffi_src/openssl/ct.py21
-rw-r--r--src/cryptography/hazmat/bindings/openssl/_conditional.py2
2 files changed, 23 insertions, 0 deletions
diff --git a/src/_cffi_src/openssl/ct.py b/src/_cffi_src/openssl/ct.py
index cdbaac03..e7550bc6 100644
--- a/src/_cffi_src/openssl/ct.py
+++ b/src/_cffi_src/openssl/ct.py
@@ -26,6 +26,13 @@ typedef enum {
CT_LOG_ENTRY_TYPE_PRECERT
} ct_log_entry_type_t;
+typedef enum {
+ SCT_SOURCE_UNKNOWN,
+ SCT_SOURCE_TLS_EXTENSION,
+ SCT_SOURCE_X509V3_EXTENSION,
+ SCT_SOURCE_OCSP_STAPLED_RESPONSE
+} sct_source_t;
+
typedef ... SCT;
typedef ... Cryptography_STACK_OF_SCT;
"""
@@ -42,8 +49,12 @@ size_t SCT_get0_log_id(const SCT *, unsigned char **);
uint64_t SCT_get_timestamp(const SCT *);
+int SCT_set_source(SCT *, sct_source_t);
+
int sk_SCT_num(const Cryptography_STACK_OF_SCT *);
SCT *sk_SCT_value(const Cryptography_STACK_OF_SCT *, int);
+
+void SCT_LIST_free(Cryptography_STACK_OF_SCT *);
"""
CUSTOMIZATIONS = """
@@ -61,6 +72,12 @@ typedef enum {
CT_LOG_ENTRY_TYPE_X509,
CT_LOG_ENTRY_TYPE_PRECERT
} ct_log_entry_type_t;
+typedef enum {
+ SCT_SOURCE_UNKNOWN,
+ SCT_SOURCE_TLS_EXTENSION,
+ SCT_SOURCE_X509V3_EXTENSION,
+ SCT_SOURCE_OCSP_STAPLED_RESPONSE
+} sct_source_t;
typedef void SCT;
typedef void Cryptography_STACK_OF_SCT;
@@ -69,7 +86,11 @@ ct_log_entry_type_t (*SCT_get_log_entry_type)(const SCT *) = NULL;
size_t (*SCT_get0_log_id)(const SCT *, unsigned char **) = NULL;
uint64_t (*SCT_get_timestamp)(const SCT *) = NULL;
+int (*SCT_set_source)(SCT *, sct_source_t) = NULL;
+
int (*sk_SCT_num)(const Cryptography_STACK_OF_SCT *) = NULL;
SCT *(*sk_SCT_value)(const Cryptography_STACK_OF_SCT *, int) = NULL;
+
+void (*SCT_LIST_free)(Cryptography_STACK_OF_SCT *) = NULL;
#endif
"""
diff --git a/src/cryptography/hazmat/bindings/openssl/_conditional.py b/src/cryptography/hazmat/bindings/openssl/_conditional.py
index 5f9bdc54..8605477d 100644
--- a/src/cryptography/hazmat/bindings/openssl/_conditional.py
+++ b/src/cryptography/hazmat/bindings/openssl/_conditional.py
@@ -161,7 +161,9 @@ CONDITIONAL_NAMES = {
"SCT_get_log_entry_type",
"SCT_get0_log_id",
"SCT_get_timestamp",
+ "SCT_set_source",
"sk_SCT_num",
"sk_SCT_value",
+ "SCT_LIST_free",
],
}