X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=mutt_ssl.c;h=020cd1da8bf1ba484ff8bd2e1e16ca8ffaaad264;hp=0cf05f7c4765c2bdc28ffc9ed94cf7d34f4b589d;hb=e3fcff4c503373a3f98676405783926e387f7139;hpb=814a01519c9605d479201b99eb16c97b0ad8635d

diff --git a/mutt_ssl.c b/mutt_ssl.c
index 0cf05f7..020cd1d 100644
--- a/mutt_ssl.c
+++ b/mutt_ssl.c
@@ -374,7 +374,7 @@ static char *x509_get_part (char *line, const char *ndx)
 
   c = strstr (line, ndx);
   if (c) {
-    c += safe_strlen (ndx);
+    c += mutt_strlen (ndx);
     c2 = strchr (c, '/');
     if (c2)
       *c2 = '\0';
@@ -590,7 +590,9 @@ static int ssl_check_certificate (sslsockdata * data)
   snprintf (menu->dialog[row++], SHORT_STRING, _("Fingerprint: %s"), buf);
 
   menu->title = _("SSL Certificate check");
-  if (SslCertFile) {
+
+  if (SslCertFile && X509_cmp_current_time (X509_get_notAfter (data->cert)) >= 0
+      && X509_cmp_current_time (X509_get_notBefore (data->cert)) < 0) {
     menu->prompt = _("(r)eject, accept (o)nce, (a)ccept always");
     menu->keys = _("roa");
   }