- Timestamp:
- Jan 11, 2020, 11:39:48 AM (13 months ago)
- Branches:
- asyncio, master, proxy-ticket
- Children:
- de9b100
- Parents:
- 98b37a1
- Location:
- src
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
src/gnutls_hooks.c
r98b37a1 rcf6f974 4 4 * Copyright 2011 Dash Shendy 5 5 * Copyright 2013-2014 Daniel Kahn Gillmor 6 * Copyright 2015-20 19Fiona Klute6 * Copyright 2015-2020 Fiona Klute 7 7 * 8 8 * Licensed under the Apache License, Version 2.0 (the "License"); … … 417 417 resp->exptime = 0; 418 418 419 int ret = mgs_get_ocsp_response(session, NULL, &resp->response); 419 int ret = mgs_get_ocsp_response(ctxt, ctxt->sc->ocsp, 420 &resp->response); 420 421 if (ret == GNUTLS_E_SUCCESS) 421 422 { -
src/gnutls_ocsp.c
r98b37a1 rcf6f974 1 1 /* 2 * Copyright 2016-20 18Fiona Klute2 * Copyright 2016-2020 Fiona Klute 3 3 * 4 4 * Licensed under the Apache License, Version 2.0 (the "License"); … … 808 808 809 809 810 int mgs_get_ocsp_response( gnutls_session_t session,811 void *ptr __attribute__((unused)),810 int mgs_get_ocsp_response(mgs_handle_t *ctxt, 811 struct mgs_ocsp_data *req_data, 812 812 gnutls_datum_t *ocsp_response) 813 813 { 814 mgs_handle_t *ctxt = gnutls_session_get_ptr(session);815 814 mgs_srvconf_rec *sc = ctxt->sc; 816 815 … … 827 826 apr_status_t rv = mgs_cache_fetch(sc->ocsp_cache, 828 827 ctxt->c->base_server, 829 sc->ocsp->fingerprint,828 req_data->fingerprint, 830 829 ocsp_response, 831 830 ctxt->c->pool); … … 864 863 rv = mgs_cache_fetch(sc->ocsp_cache, 865 864 ctxt->c->base_server, 866 sc->ocsp->fingerprint,865 req_data->fingerprint, 867 866 ocsp_response, 868 867 ctxt->c->pool); … … 888 887 } 889 888 890 rv = mgs_cache_ocsp_response(ctxt->c->base_server, sc->ocsp, NULL);889 rv = mgs_cache_ocsp_response(ctxt->c->base_server, req_data, NULL); 891 890 if (rv != APR_SUCCESS) 892 891 { … … 895 894 /* cache failure to rate limit retries */ 896 895 mgs_cache_ocsp_failure(ctxt->c->base_server, 897 sc->ocsp,896 req_data, 898 897 sc->ocsp_failure_timeout); 899 898 apr_global_mutex_unlock(sc->ocsp_mutex); … … 905 904 rv = mgs_cache_fetch(sc->ocsp_cache, 906 905 ctxt->c->base_server, 907 sc->ocsp->fingerprint,906 req_data->fingerprint, 908 907 ocsp_response, 909 908 ctxt->c->pool); -
src/gnutls_ocsp.h
r98b37a1 rcf6f974 1 1 /* 2 * Copyright 2016-20 18Fiona Klute2 * Copyright 2016-2020 Fiona Klute 3 3 * 4 4 * Licensed under the Apache License, Version 2.0 (the "License"); … … 18 18 #define __MOD_GNUTLS_OCSP_H__ 19 19 20 #include "gnutls/gnutls.h" 21 #include "gnutls/x509.h" 22 #include "httpd.h" 23 #include "http_config.h" 20 #include "mod_gnutls.h" 21 22 #include <gnutls/gnutls.h> 23 #include <gnutls/x509.h> 24 #include <httpd.h> 25 #include <http_config.h> 24 26 25 27 #define MGS_OCSP_MUTEX_NAME "gnutls-ocsp" … … 122 124 server_rec *server); 123 125 124 int mgs_get_ocsp_response(gnutls_session_t session, void *ptr, 126 int mgs_get_ocsp_response(mgs_handle_t *ctxt, 127 struct mgs_ocsp_data *req_data, 125 128 gnutls_datum_t *ocsp_response); 126 129
Note: See TracChangeset
for help on using the changeset viewer.