Changeset cf6f974 in mod_gnutls for src

Timestamp:

Jan 11, 2020, 11:39:48 AM (2 years ago)

Author:

Fiona Klute <fiona.klute@…>

Branches:

asyncio, master, proxy-ticket

Children:

de9b100

Parents:

98b37a1

Message:

mgs_get_ocsp_response: Accept request information from cert_retrieve_fn

With this the certificate retrieve function could request multiple
responses for stapling if it had the request information.

Location:

src

Files:

• gnutls_hooks.c (modified) (2 diffs)
• gnutls_ocsp.c (modified) (7 diffs)
• gnutls_ocsp.h (modified) (3 diffs)

src/gnutls_hooks.c

@@ -4 +4 @@
  *  Copyright 2011 Dash Shendy
  *  Copyright 2013-2014 Daniel Kahn Gillmor
- *  Copyright 2015-2019 Fiona Klute
+ *  Copyright 2015-2020 Fiona Klute
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
@@ -417 +417 @@
             resp->exptime = 0;
 
-            int ret = mgs_get_ocsp_response(session, NULL, &resp->response);
+            int ret = mgs_get_ocsp_response(ctxt, ctxt->sc->ocsp,
+                                            &resp->response);
             if (ret == GNUTLS_E_SUCCESS)
             {

src/gnutls_ocsp.c

@@ -1 +1 @@
 /*
- *  Copyright 2016-2018 Fiona Klute
+ *  Copyright 2016-2020 Fiona Klute
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
@@ -808 +808 @@
 
 
-int mgs_get_ocsp_response(gnutls_session_t session,
-                          void *ptr __attribute__((unused)),
+int mgs_get_ocsp_response(mgs_handle_t *ctxt,
+                          struct mgs_ocsp_data *req_data,
                           gnutls_datum_t *ocsp_response)
 {
-    mgs_handle_t *ctxt = gnutls_session_get_ptr(session);
     mgs_srvconf_rec *sc = ctxt->sc;
 
@@ -827 +826 @@
     apr_status_t rv = mgs_cache_fetch(sc->ocsp_cache,
                                       ctxt->c->base_server,
-                                      sc->ocsp->fingerprint,
+                                      req_data->fingerprint,
                                       ocsp_response,
                                       ctxt->c->pool);
@@ -864 +863 @@
         rv = mgs_cache_fetch(sc->ocsp_cache,
                              ctxt->c->base_server,
-                             sc->ocsp->fingerprint,
+                             req_data->fingerprint,
                              ocsp_response,
                              ctxt->c->pool);
@@ -888 +887 @@
     }
 
-    rv = mgs_cache_ocsp_response(ctxt->c->base_server, sc->ocsp, NULL);
+    rv = mgs_cache_ocsp_response(ctxt->c->base_server, req_data, NULL);
     if (rv != APR_SUCCESS)
     {
@@ -895 +894 @@
         /* cache failure to rate limit retries */
         mgs_cache_ocsp_failure(ctxt->c->base_server,
-                               sc->ocsp,
+                               req_data,
                                sc->ocsp_failure_timeout);
         apr_global_mutex_unlock(sc->ocsp_mutex);
@@ -905 +904 @@
     rv = mgs_cache_fetch(sc->ocsp_cache,
                          ctxt->c->base_server,
-                         sc->ocsp->fingerprint,
+                         req_data->fingerprint,
                          ocsp_response,
                          ctxt->c->pool);

src/gnutls_ocsp.h

@@ -1 +1 @@
 /*
- *  Copyright 2016-2018 Fiona Klute
+ *  Copyright 2016-2020 Fiona Klute
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
@@ -18 +18 @@
 #define __MOD_GNUTLS_OCSP_H__
 
-#include "gnutls/gnutls.h"
-#include "gnutls/x509.h"
-#include "httpd.h"
-#include "http_config.h"
+#include "mod_gnutls.h"
+
+#include <gnutls/gnutls.h>
+#include <gnutls/x509.h>
+#include <httpd.h>
+#include <http_config.h>
 
 #define MGS_OCSP_MUTEX_NAME "gnutls-ocsp"
@@ -122 +124 @@
                              server_rec *server);
 
-int mgs_get_ocsp_response(gnutls_session_t session, void *ptr,
+int mgs_get_ocsp_response(mgs_handle_t *ctxt,
+                          struct mgs_ocsp_data *req_data,
                           gnutls_datum_t *ocsp_response);