Changeset 7fec961 in mod_gnutls for src/gnutls_hooks.c

Timestamp:

Jul 2, 2010, 9:15:52 AM (9 years ago)

Author:

Nikos Mavrogiannopoulos <nmav@…>

Branches:

debian/master, debian/stretch-backports, jessie-backports, master, msva, upstream

Children:

368b574

Parents:

bca274d

Message:

Depend on libgnutls for the activation and expiration time checks.

File:

• src/gnutls_hooks.c (modified) (7 diffs)

src/gnutls_hooks.c

@@ -1044 +1044 @@
 {
     const gnutls_datum_t *cert_list;
-    unsigned int cert_list_size, status, expired;
+    unsigned int cert_list_size, status;
     int rv = GNUTLS_E_NO_CERTIFICATE_FOUND, ret;
     unsigned int ch_size = 0;
@@ -1051 +1051 @@
       gnutls_openpgp_crt_t pgp;
     } cert;
-    apr_time_t activation_time, expiration_time, cur_time;
+    apr_time_t expiration_time, cur_time;
 
     _gnutls_log(debug_log_fp, "%s: %d\n", __func__, __LINE__);
@@ -1117 +1117 @@
         apr_time_ansi_put(&expiration_time,
                       gnutls_x509_crt_get_expiration_time(cert.x509[0]));
-        apr_time_ansi_put(&activation_time,
-                      gnutls_x509_crt_get_activation_time(cert.x509[0]));
 
         ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
@@ -1128 +1126 @@
         apr_time_ansi_put(&expiration_time,
                       gnutls_openpgp_crt_get_expiration_time(cert.pgp));
-        apr_time_ansi_put(&activation_time,
-                      gnutls_openpgp_crt_get_creation_time(cert.pgp));
 
         rv = gnutls_openpgp_crt_verify_ring(cert.pgp, ctxt->sc->pgp_list,
@@ -1151 +1147 @@
     /* ret = gnutls_x509_crt_check_revocation(crt, crl_list, crl_list_size); */
 
-    expired = 0;
     cur_time = apr_time_now();
-    if (activation_time > cur_time) {
-        ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r,
-                      "GnuTLS: Failed to Verify Peer: "
-                      "Peer Certificate is not yet activated.");
-        expired = 1;
-    }
-
-    if (gnutls_certificate_type_get( ctxt->session) != GNUTLS_CRT_OPENPGP || expiration_time != 0) {
-        if (expiration_time < cur_time) {
-            ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r,
-                      "GnuTLS: Failed to Verify Peer: "
-                      "Peer Certificate is expired.");
-            expired = 1;
-        }
-    }
 
     if (status & GNUTLS_CERT_SIGNER_NOT_FOUND) {
@@ -1177 +1157 @@
         ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r,
                       "GnuTLS: Peer's Certificate signer is not a CA");
+    }
+
+    if (status & GNUTLS_CERT_INSECURE_ALGORITHM) {
+        ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r,
+                      "GnuTLS: Peer's Certificate is using insecure algorithms");
+    }
+
+    if (status & GNUTLS_CERT_EXPIRED || status & GNUTLS_CERT_NOT_ACTIVATED) {
+        ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r,
+                      "GnuTLS: Peer's Certificate signer is expired or not yet activated");
     }
 
@@ -1203 +1193 @@
     }
 
-    if (status == 0 && expired == 0) {
+    if (status == 0) {
         apr_table_setn(r->subprocess_env, "SSL_CLIENT_VERIFY", "SUCCESS");
         ret = OK;