altarch-user / rpms / httpd

Forked from rpms/httpd 2 years ago
Clone

Blame SOURCES/httpd-2.4.6-r1593002.patch

008793
--- a/modules/ssl/ssl_util_stapling.c  2014/05/07 12:51:38 1593001
008793
+++ b/modules/ssl/ssl_util_stapling.c  2014/05/07 12:52:13 1593002
008793
@@ -145,14 +145,15 @@
008793
     X509_digest(x, EVP_sha1(), cinf->idx, NULL);
008793
 
008793
     aia = X509_get1_ocsp(x);
008793
-    if (aia)
008793
+    if (aia) {
008793
         cinf->uri = sk_OPENSSL_STRING_pop(aia);
008793
+        X509_email_free(aia);
008793
+    }
008793
     if (!cinf->uri && !mctx->stapling_force_url) {
008793
         ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, APLOGNO(02218)
008793
                      "ssl_stapling_init_cert: no responder URL");
008793
+        return 0;
008793
     }
008793
-    if (aia)
008793
-        X509_email_free(aia);
008793
     return 1;
008793
 }
008793
 
008793
@@ -403,6 +404,13 @@
008793
     else
008793
         ocspuri = cinf->uri;
008793
 
008793
+    if (!ocspuri) {
008793
+        ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, APLOGNO(02621)
008793
+                     "stapling_renew_response: no uri for responder");
008793
+        rv = FALSE;
008793
+        goto done;
008793
+    }
008793
+
008793
     /* Create a temporary pool to constrain memory use */
008793
     apr_pool_create(&vpool, conn->pool);
008793