diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-13 12:19:41 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-13 12:19:41 +0000 |
| commit | 38e50ba7714674bd75f8cff1ff428e8e47d20d08 (patch) | |
| tree | 450b96fe88476549cc8779243daab748777e1754 /include | |
| parent | Adding debian version 2.9.5-1. (diff) | |
| download | haproxy-38e50ba7714674bd75f8cff1ff428e8e47d20d08.tar.xz haproxy-38e50ba7714674bd75f8cff1ff428e8e47d20d08.zip | |
Merging upstream version 2.9.6.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/haproxy/ssl_ocsp-t.h | 6 | ||||
| -rw-r--r-- | include/haproxy/ssl_ocsp.h | 1 |
2 files changed, 2 insertions, 5 deletions
diff --git a/include/haproxy/ssl_ocsp-t.h b/include/haproxy/ssl_ocsp-t.h index fc2750b..028d6fa 100644 --- a/include/haproxy/ssl_ocsp-t.h +++ b/include/haproxy/ssl_ocsp-t.h @@ -47,8 +47,7 @@ struct certificate_ocsp { struct ebmb_node key; unsigned char key_data[OCSP_MAX_CERTID_ASN1_LENGTH]; unsigned int key_length; - int refcount_store; /* Number of ckch_store that reference this certificate_ocsp */ - int refcount_instance; /* Number of ckch_inst that reference this certificate_ocsp */ + int refcount; struct buffer response; long expire; X509 *issuer; @@ -61,9 +60,8 @@ struct certificate_ocsp { unsigned int last_update_status;/* Status of the last OCSP update */ unsigned int num_success; /* Number of successful updates */ unsigned int num_failure; /* Number of failed updates */ - unsigned int fail_count:30; /* Number of successive failures */ + unsigned int fail_count:31; /* Number of successive failures */ unsigned int update_once:1; /* Set if an entry should not be reinserted into te tree after update */ - unsigned int updating:1; /* Set if an entry is already being updated */ char path[VAR_ARRAY]; }; diff --git a/include/haproxy/ssl_ocsp.h b/include/haproxy/ssl_ocsp.h index 8a4197c..54a1b88 100644 --- a/include/haproxy/ssl_ocsp.h +++ b/include/haproxy/ssl_ocsp.h @@ -36,7 +36,6 @@ int ssl_sock_get_ocsp_arg_kt_index(int evp_keytype); int ssl_sock_ocsp_stapling_cbk(SSL *ssl, void *arg); void ssl_sock_free_ocsp(struct certificate_ocsp *ocsp); -void ssl_sock_free_ocsp_instance(struct certificate_ocsp *ocsp); int ssl_sock_load_ocsp_response(struct buffer *ocsp_response, struct certificate_ocsp *ocsp, |